Fix open diff in right click menu

2025-03-07 11:53:12 -07:00
124 changed files with 1947 additions and 3321 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,7 +84,7 @@ dependencies = [
 [[package]]
 name = "alacritty_terminal"
 version = "0.25.1-dev"
-source = "git+https://github.com/zed-industries/alacritty.git?branch=add-hush-login-flag#828457c9ff1f7ea0a0469337cc8a37ee3a1b0590"
+source = "git+https://github.com/zed-industries/alacritty.git?rev=03c2907b44b4189aac5fdeaea331f5aab5c7072e#03c2907b44b4189aac5fdeaea331f5aab5c7072e"
 dependencies = [
 "base64 0.22.1",
 "bitflags 2.8.0",
@@ -450,7 +450,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "assistant_context_editor",
- "assistant_scripting",
 "assistant_settings",
 "assistant_slash_command",
 "assistant_tool",
@@ -564,26 +563,6 @@ dependencies = [
 "workspace",
 ]

-[[package]]
-name = "assistant_scripting"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "futures 0.3.31",
- "gpui",
- "log",
- "mlua",
- "parking_lot",
- "project",
- "rand 0.8.5",
- "regex",
- "serde",
- "serde_json",
- "settings",
- "util",
-]
-
 [[package]]
 name = "assistant_settings"
 version = "0.1.0"
@@ -679,9 +658,9 @@ dependencies = [
 "derive_more",
 "gpui",
 "parking_lot",
- "project",
 "serde",
 "serde_json",
+ "workspace",
 ]

 [[package]]
@@ -696,6 +675,7 @@ dependencies = [
 "schemars",
 "serde",
 "serde_json",
+ "workspace",
 ]

 [[package]]
@@ -3067,7 +3047,6 @@ name = "component_preview"
 version = "0.1.0"
 dependencies = [
 "client",
- "collections",
 "component",
 "gpui",
 "languages",
@@ -3160,6 +3139,7 @@ dependencies = [
 "smol",
 "url",
 "util",
+ "workspace",
 ]

 [[package]]
@@ -4556,7 +4536,6 @@ dependencies = [
 "async-tar",
 "async-trait",
 "collections",
- "convert_case 0.8.0",
 "fs",
 "futures 0.3.31",
 "gpui",
@@ -11931,6 +11910,27 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"

+[[package]]
+name = "scripting_tool"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assistant_tool",
+ "collections",
+ "futures 0.3.31",
+ "gpui",
+ "mlua",
+ "parking_lot",
+ "project",
+ "regex",
+ "schemars",
+ "serde",
+ "serde_json",
+ "settings",
+ "util",
+ "workspace",
+]
+
 [[package]]
 name = "scrypt"
 version = "0.11.0"
@@ -16985,6 +16985,7 @@ dependencies = [
 "repl",
 "reqwest_client",
 "rope",
+ "scripting_tool",
 "search",
 "serde",
 "serde_json",
@@ -17069,6 +17070,13 @@ dependencies = [
 "zed_extension_api 0.1.0",
 ]

+[[package]]
+name = "zed_haskell"
+version = "0.1.3"
+dependencies = [
+ "zed_extension_api 0.1.0",
+]
+
 [[package]]
 name = "zed_html"
 version = "0.1.6"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,7 +118,7 @@ members = [
    "crates/rope",
    "crates/rpc",
    "crates/schema_generator",
-    "crates/assistant_scripting",
+    "crates/scripting_tool",
    "crates/search",
    "crates/semantic_index",
    "crates/semantic_version",
@@ -171,6 +171,7 @@ members = [

    "extensions/emmet",
    "extensions/glsl",
+    "extensions/haskell",
    "extensions/html",
    "extensions/perplexity",
    "extensions/proto",
@@ -318,7 +319,7 @@ reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
-assistant_scripting = { path = "crates/assistant_scripting" }
+scripting_tool = { path = "crates/scripting_tool" }
 search = { path = "crates/search" }
 semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
@@ -370,7 +371,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
--- a/assets/icons/file_icons/luau.svg
+++ b/assets/icons/file_icons/luau.svg
@@ -1,3 +0,0 @@
-<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.36197 1.67985C5.3748 1.41534 4.36011 2.00117 4.0956 2.98834L2.17985 10.138C1.91534 11.1252 2.50117 12.1399 3.48833 12.4044L10.638 14.3202C11.6252 14.5847 12.6399 13.9988 12.9044 13.0117L14.8202 5.86197C15.0847 4.8748 14.4988 3.86012 13.5117 3.59561L6.36197 1.67985ZM10.0457 4.58266C9.77896 4.51119 9.50479 4.66948 9.43332 4.93621L8.76235 7.44028C8.69088 7.70701 8.84917 7.98118 9.11591 8.05265L11.62 8.72362C11.8867 8.79509 12.1609 8.6368 12.2324 8.37006L12.9033 5.86599C12.9748 5.59926 12.8165 5.32509 12.5498 5.25362L10.0457 4.58266Z" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/wgsl.svg
+++ b/assets/icons/file_icons/wgsl.svg
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 13L1.5 5H11.5L6.5 13Z" fill="black"/>
-<path d="M14 9H9L11.5 5L14 9Z" fill="black" fill-opacity="0.75"/>
-<path d="M9 9L14 9L11.5 13L9 9Z" fill="black" fill-opacity="0.65"/>
-<path d="M14 5L15.25 7L12.75 7L14 5Z" fill="black" fill-opacity="0.5"/>
-<path d="M14 9L12.75 7H15.25L14 9Z" fill="black" fill-opacity="0.55"/>
-</svg>
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -108,8 +108,8 @@
      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "cmd-up": "editor::MoveToBeginning",
-      "cmd-down": "editor::MoveToEnd",
+      "cmd-up": "editor::MoveToStartOfExcerpt",
+      "cmd-down": "editor::MoveToEndOfExcerpt",
      "cmd-home": "editor::MoveToBeginning", // Typed via `cmd-fn-left`
      "cmd-end": "editor::MoveToEnd", // Typed via `cmd-fn-right`
      "shift-up": "editor::SelectUp",
@@ -124,8 +124,8 @@
      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToBeginning",
-      "cmd-shift-down": "editor::SelectToEnd",
+      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
+      "cmd-shift-down": "editor::SelectToEndOfExcerpt",
      "cmd-a": "editor::SelectAll",
      "cmd-l": "editor::SelectLine",
      "cmd-shift-i": "editor::Format",
@@ -172,16 +172,6 @@
      "alt-enter": "editor::OpenSelectionsInMultibuffer"
    }
  },
-  {
-    "context": "Editor && multibuffer",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-up": "editor::MoveToStartOfExcerpt",
-      "cmd-down": "editor::MoveToStartOfNextExcerpt",
-      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
-      "cmd-shift-down": "editor::SelectToStartOfNextExcerpt"
-    }
-  },
  {
    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -845,7 +845,7 @@
    //    "hunk_style": "transparent"
    // 2. Show unstaged hunks with a pattern background:
    //    "hunk_style": "pattern"
-    "hunk_style": "staged_border"
+    "hunk_style": "transparent"
  },
  // Configuration for how direnv configuration should be loaded. May take 2 values:
  // 1. Load direnv configuration using `direnv export json` directly.
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -38,7 +38,7 @@ use language_model::{
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::{CodeAction, LspAction, ProjectTransaction};
+use project::{ActionVariant, CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use rope::Rope;
 use settings::{update_settings_file, Settings, SettingsStore};
@@ -3569,7 +3569,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
+                lsp_action: ActionVariant::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
                })),
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -63,7 +63,6 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
-assistant_scripting.workspace = true
 streaming_diff.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

-use assistant_scripting::{ScriptId, ScriptState};
-use collections::{HashMap, HashSet};
+use assistant_tool::ToolWorkingSet;
+use collections::HashMap;
 use editor::{Editor, MultiBuffer};
 use gpui::{
    list, AbsoluteLength, AnyElement, App, ClickEvent, DefiniteLength, EdgesRefinement, Empty,
@@ -25,6 +25,7 @@ use crate::ui::ContextPill;
 pub struct ActiveThread {
    workspace: WeakEntity<Workspace>,
    language_registry: Arc<LanguageRegistry>,
+    tools: Arc<ToolWorkingSet>,
    thread_store: Entity<ThreadStore>,
    thread: Entity<Thread>,
    save_thread_task: Option<Task<()>>,
@@ -33,7 +34,6 @@ pub struct ActiveThread {
    rendered_messages_by_id: HashMap<MessageId, Entity<Markdown>>,
    editing_message: Option<(MessageId, EditMessageState)>,
    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
-    expanded_scripts: HashSet<ScriptId>,
    last_error: Option<ThreadError>,
    _subscriptions: Vec<Subscription>,
 }
@@ -44,10 +44,11 @@ struct EditMessageState {

 impl ActiveThread {
    pub fn new(
-        workspace: WeakEntity<Workspace>,
        thread: Entity<Thread>,
        thread_store: Entity<ThreadStore>,
+        workspace: WeakEntity<Workspace>,
        language_registry: Arc<LanguageRegistry>,
+        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -59,13 +60,13 @@ impl ActiveThread {
        let mut this = Self {
            workspace,
            language_registry,
+            tools,
            thread_store,
            thread: thread.clone(),
            save_thread_task: None,
            messages: Vec::new(),
            rendered_messages_by_id: HashMap::default(),
            expanded_tool_uses: HashMap::default(),
-            expanded_scripts: HashSet::default(),
            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
                let this = cx.entity().downgrade();
                move |ix, window: &mut Window, cx: &mut App| {
@@ -248,7 +249,7 @@ impl ActiveThread {

    fn handle_thread_event(
        &mut self,
-        _thread: &Entity<Thread>,
+        _: &Entity<Thread>,
        event: &ThreadEvent,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -299,26 +300,48 @@ impl ActiveThread {
                cx.notify();
            }
            ThreadEvent::UsePendingTools => {
-                self.thread.update(cx, |thread, cx| {
-                    thread.use_pending_tools(cx);
-                });
-            }
-            ThreadEvent::ToolFinished { .. } => {
-                if self.thread.read(cx).all_tools_finished() {
-                    let model_registry = LanguageModelRegistry::read_global(cx);
-                    if let Some(model) = model_registry.active_model() {
+                let pending_tool_uses = self
+                    .thread
+                    .read(cx)
+                    .pending_tool_uses()
+                    .into_iter()
+                    .filter(|tool_use| tool_use.status.is_idle())
+                    .cloned()
+                    .collect::<Vec<_>>();
+
+                for tool_use in pending_tool_uses {
+                    if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
+                        let task = tool.run(tool_use.input, self.workspace.clone(), window, cx);
+
                        self.thread.update(cx, |thread, cx| {
-                            thread.send_tool_results_to_model(model, cx);
+                            thread.insert_tool_output(tool_use.id.clone(), task, cx);
                        });
                    }
                }
            }
-            ThreadEvent::ScriptFinished => {
-                let model_registry = LanguageModelRegistry::read_global(cx);
-                if let Some(model) = model_registry.active_model() {
-                    self.thread.update(cx, |thread, cx| {
-                        thread.send_to_model(model, RequestKind::Chat, false, cx);
-                    });
+            ThreadEvent::ToolFinished { .. } => {
+                let all_tools_finished = self
+                    .thread
+                    .read(cx)
+                    .pending_tool_uses()
+                    .into_iter()
+                    .all(|tool_use| tool_use.status.is_error());
+                if all_tools_finished {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(model) = model_registry.active_model() {
+                        self.thread.update(cx, |thread, cx| {
+                            // Insert a user message to contain the tool results.
+                            thread.insert_user_message(
+                                // TODO: Sending up a user message without any content results in the model sending back
+                                // responses that also don't have any content. We currently don't handle this case well,
+                                // so for now we provide some text to keep the model on track.
+                                "Here are the tool results.",
+                                Vec::new(),
+                                cx,
+                            );
+                            thread.send_to_model(model, RequestKind::Chat, true, cx);
+                        });
+                    }
                }
            }
        }
@@ -460,16 +483,12 @@ impl ActiveThread {
            return Empty.into_any();
        };

-        let thread = self.thread.read(cx);
-
-        let context = thread.context_for_message(message_id);
-        let tool_uses = thread.tool_uses_for_message(message_id);
+        let context = self.thread.read(cx).context_for_message(message_id);
+        let tool_uses = self.thread.read(cx).tool_uses_for_message(message_id);
+        let colors = cx.theme().colors();

        // Don't render user messages that are just there for returning tool results.
-        if message.role == Role::User
-            && (thread.message_has_tool_results(message_id)
-                || thread.message_has_script_output(message_id))
-        {
+        if message.role == Role::User && self.thread.read(cx).message_has_tool_results(message_id) {
            return Empty.into_any();
        }

@@ -482,8 +501,6 @@ impl ActiveThread {
            .filter(|(id, _)| *id == message_id)
            .map(|(_, state)| state.editor.clone());

-        let colors = cx.theme().colors();
-
        let message_content = v_flex()
            .child(
                if let Some(edit_message_editor) = edit_message_editor.clone() {
@@ -618,7 +635,6 @@ impl ActiveThread {
            Role::Assistant => div()
                .id(("message-container", ix))
                .child(message_content)
-                .children(self.render_script(message_id, cx))
                .map(|parent| {
                    if tool_uses.is_empty() {
                        return parent;
@@ -738,139 +754,6 @@ impl ActiveThread {
                }),
        )
    }
-
-    fn render_script(&self, message_id: MessageId, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let script = self.thread.read(cx).script_for_message(message_id, cx)?;
-
-        let is_open = self.expanded_scripts.contains(&script.id);
-        let colors = cx.theme().colors();
-
-        let element = div().px_2p5().child(
-            v_flex()
-                .gap_1()
-                .rounded_lg()
-                .border_1()
-                .border_color(colors.border)
-                .child(
-                    h_flex()
-                        .justify_between()
-                        .py_0p5()
-                        .pl_1()
-                        .pr_2()
-                        .bg(colors.editor_foreground.opacity(0.02))
-                        .when(is_open, |element| element.border_b_1().rounded_t(px(6.)))
-                        .when(!is_open, |element| element.rounded_md())
-                        .border_color(colors.border)
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(Disclosure::new("script-disclosure", is_open).on_click(
-                                    cx.listener({
-                                        let script_id = script.id;
-                                        move |this, _event, _window, _cx| {
-                                            if this.expanded_scripts.contains(&script_id) {
-                                                this.expanded_scripts.remove(&script_id);
-                                            } else {
-                                                this.expanded_scripts.insert(script_id);
-                                            }
-                                        }
-                                    }),
-                                ))
-                                // TODO: Generate script description
-                                .child(Label::new("Script")),
-                        )
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Label::new(match script.state {
-                                        ScriptState::Generating => "Generating",
-                                        ScriptState::Running { .. } => "Running",
-                                        ScriptState::Succeeded { .. } => "Finished",
-                                        ScriptState::Failed { .. } => "Error",
-                                    })
-                                    .size(LabelSize::XSmall)
-                                    .buffer_font(cx),
-                                )
-                                .child(
-                                    IconButton::new("view-source", IconName::Eye)
-                                        .icon_color(Color::Muted)
-                                        .disabled(matches!(script.state, ScriptState::Generating))
-                                        .on_click(cx.listener({
-                                            let source = script.source.clone();
-                                            move |this, _event, window, cx| {
-                                                this.open_script_source(source.clone(), window, cx);
-                                            }
-                                        })),
-                                ),
-                        ),
-                )
-                .when(is_open, |parent| {
-                    let stdout = script.stdout_snapshot();
-                    let error = script.error();
-
-                    parent.child(
-                        v_flex()
-                            .p_2()
-                            .bg(colors.editor_background)
-                            .gap_2()
-                            .child(if stdout.is_empty() && error.is_none() {
-                                Label::new("No output yet")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                            } else {
-                                Label::new(stdout).size(LabelSize::Small).buffer_font(cx)
-                            })
-                            .children(script.error().map(|err| {
-                                Label::new(err.to_string())
-                                    .size(LabelSize::Small)
-                                    .color(Color::Error)
-                            })),
-                    )
-                }),
-        );
-
-        Some(element.into_any())
-    }
-
-    fn open_script_source(
-        &mut self,
-        source: SharedString,
-        window: &mut Window,
-        cx: &mut Context<'_, ActiveThread>,
-    ) {
-        let language_registry = self.language_registry.clone();
-        let workspace = self.workspace.clone();
-        let source = source.clone();
-
-        cx.spawn_in(window, |_, mut cx| async move {
-            let lua = language_registry.language_for_name("Lua").await.log_err();
-
-            workspace.update_in(&mut cx, |workspace, window, cx| {
-                let project = workspace.project().clone();
-
-                let buffer = project.update(cx, |project, cx| {
-                    project.create_local_buffer(&source.trim(), lua, cx)
-                });
-
-                let buffer = cx.new(|cx| {
-                    MultiBuffer::singleton(buffer, cx)
-                        // TODO: Generate script description
-                        .with_title("Assistant script".into())
-                });
-
-                let editor = cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(buffer, Some(project), true, window, cx);
-                    editor.set_read_only(true);
-                    editor
-                });
-
-                workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
-            })
-        })
-        .detach_and_log_err(cx);
-    }
 }

 impl Render for ActiveThread {
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -92,6 +92,7 @@ pub struct AssistantPanel {
    context_editor: Option<Entity<ContextEditor>>,
    configuration: Option<Entity<AssistantConfiguration>>,
    configuration_subscription: Option<Subscription>,
+    tools: Arc<ToolWorkingSet>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
    history_store: Entity<HistoryStore>,
@@ -132,7 +133,7 @@ impl AssistantPanel {
            log::info!("[assistant2-debug] finished initializing ContextStore");

            workspace.update_in(&mut cx, |workspace, window, cx| {
-                cx.new(|cx| Self::new(workspace, thread_store, context_store, window, cx))
+                cx.new(|cx| Self::new(workspace, thread_store, context_store, tools, window, cx))
            })
        })
    }
@@ -141,6 +142,7 @@ impl AssistantPanel {
        workspace: &Workspace,
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
+        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -166,30 +168,30 @@ impl AssistantPanel {
        let history_store =
            cx.new(|cx| HistoryStore::new(thread_store.clone(), context_store.clone(), cx));

-        let thread = cx.new(|cx| {
-            ActiveThread::new(
-                workspace.clone(),
-                thread.clone(),
-                thread_store.clone(),
-                language_registry.clone(),
-                window,
-                cx,
-            )
-        });
-
        Self {
            active_view: ActiveView::Thread,
-            workspace,
-            project: project.clone(),
+            workspace: workspace.clone(),
+            project,
            fs: fs.clone(),
-            language_registry,
+            language_registry: language_registry.clone(),
            thread_store: thread_store.clone(),
-            thread,
+            thread: cx.new(|cx| {
+                ActiveThread::new(
+                    thread.clone(),
+                    thread_store.clone(),
+                    workspace,
+                    language_registry,
+                    tools.clone(),
+                    window,
+                    cx,
+                )
+            }),
            message_editor,
            context_store,
            context_editor: None,
            configuration: None,
            configuration_subscription: None,
+            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
            )
@@ -242,10 +244,11 @@ impl AssistantPanel {
        self.active_view = ActiveView::Thread;
        self.thread = cx.new(|cx| {
            ActiveThread::new(
-                self.workspace.clone(),
                thread.clone(),
                self.thread_store.clone(),
+                self.workspace.clone(),
                self.language_registry.clone(),
+                self.tools.clone(),
                window,
                cx,
            )
@@ -376,10 +379,11 @@ impl AssistantPanel {
                this.active_view = ActiveView::Thread;
                this.thread = cx.new(|cx| {
                    ActiveThread::new(
-                        this.workspace.clone(),
                        thread.clone(),
                        this.thread_store.clone(),
+                        this.workspace.clone(),
                        this.language_registry.clone(),
+                        this.tools.clone(),
                        window,
                        cx,
                    )
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -27,7 +27,7 @@ use language::{Buffer, Point, Selection, TransactionId};
 use language_model::{report_assistant_event, LanguageModelRegistry};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::LspAction;
+use project::ActionVariant;
 use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
@@ -1728,7 +1728,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
+                lsp_action: ActionVariant::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
                })),
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -1,21 +1,17 @@
 use std::sync::Arc;

 use anyhow::Result;
-use assistant_scripting::{
-    Script, ScriptEvent, ScriptId, ScriptSession, ScriptTagParser, SCRIPTING_PROMPT,
-};
 use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::StreamExt as _;
-use gpui::{App, AppContext, Context, Entity, EventEmitter, SharedString, Subscription, Task};
+use gpui::{App, Context, EventEmitter, SharedString, Task};
 use language_model::{
    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
    Role, StopReason,
 };
-use project::Project;
 use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;
@@ -75,24 +71,12 @@ pub struct Thread {
    context_by_message: HashMap<MessageId, Vec<ContextId>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
-    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    tool_use: ToolUseState,
-    scripts_by_assistant_message: HashMap<MessageId, ScriptId>,
-    script_output_messages: HashSet<MessageId>,
-    script_session: Entity<ScriptSession>,
-    _script_session_subscription: Subscription,
 }

 impl Thread {
-    pub fn new(
-        project: Entity<Project>,
-        tools: Arc<ToolWorkingSet>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let script_session = cx.new(|cx| ScriptSession::new(project.clone(), cx));
-        let script_session_subscription = cx.subscribe(&script_session, Self::handle_script_event);
-
+    pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut Context<Self>) -> Self {
        Self {
            id: ThreadId::new(),
            updated_at: Utc::now(),
@@ -104,22 +88,16 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
-            project,
            tools,
            tool_use: ToolUseState::new(),
-            scripts_by_assistant_message: HashMap::default(),
-            script_output_messages: HashSet::default(),
-            script_session,
-            _script_session_subscription: script_session_subscription,
        }
    }

    pub fn from_saved(
        id: ThreadId,
        saved: SavedThread,
-        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
-        cx: &mut Context<Self>,
+        _cx: &mut Context<Self>,
    ) -> Self {
        let next_message_id = MessageId(
            saved
@@ -129,8 +107,6 @@ impl Thread {
                .unwrap_or(0),
        );
        let tool_use = ToolUseState::from_saved_messages(&saved.messages);
-        let script_session = cx.new(|cx| ScriptSession::new(project.clone(), cx));
-        let script_session_subscription = cx.subscribe(&script_session, Self::handle_script_event);

        Self {
            id,
@@ -151,13 +127,8 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
-            project,
            tools,
            tool_use,
-            scripts_by_assistant_message: HashMap::default(),
-            script_output_messages: HashSet::default(),
-            script_session,
-            _script_session_subscription: script_session_subscription,
        }
    }

@@ -222,15 +193,6 @@ impl Thread {
        self.tool_use.pending_tool_uses()
    }

-    /// Returns whether all of the tool uses have finished running.
-    pub fn all_tools_finished(&self) -> bool {
-        // If the only pending tool uses left are the ones with errors, then that means that we've finished running all
-        // of the pending tools.
-        self.pending_tool_uses()
-            .into_iter()
-            .all(|tool_use| tool_use.status.is_error())
-    }
-
    pub fn tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
        self.tool_use.tool_uses_for_message(id)
    }
@@ -243,22 +205,17 @@ impl Thread {
        self.tool_use.message_has_tool_results(message_id)
    }

-    pub fn message_has_script_output(&self, message_id: MessageId) -> bool {
-        self.script_output_messages.contains(&message_id)
-    }
-
    pub fn insert_user_message(
        &mut self,
        text: impl Into<String>,
        context: Vec<ContextSnapshot>,
        cx: &mut Context<Self>,
-    ) -> MessageId {
+    ) {
        let message_id = self.insert_message(Role::User, text, cx);
        let context_ids = context.iter().map(|context| context.id).collect::<Vec<_>>();
        self.context
            .extend(context.into_iter().map(|context| (context.id, context)));
        self.context_by_message.insert(message_id, context_ids);
-        message_id
    }

    pub fn insert_message(
@@ -327,39 +284,6 @@ impl Thread {
        text
    }

-    pub fn script_for_message<'a>(
-        &'a self,
-        message_id: MessageId,
-        cx: &'a App,
-    ) -> Option<&'a Script> {
-        self.scripts_by_assistant_message
-            .get(&message_id)
-            .map(|script_id| self.script_session.read(cx).get(*script_id))
-    }
-
-    fn handle_script_event(
-        &mut self,
-        _script_session: Entity<ScriptSession>,
-        event: &ScriptEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ScriptEvent::Spawned(_) => {}
-            ScriptEvent::Exited(script_id) => {
-                if let Some(output_message) = self
-                    .script_session
-                    .read(cx)
-                    .get(*script_id)
-                    .output_message_for_llm()
-                {
-                    let message_id = self.insert_user_message(output_message, vec![], cx);
-                    self.script_output_messages.insert(message_id);
-                    cx.emit(ThreadEvent::ScriptFinished)
-                }
-            }
-        }
-    }
-
    pub fn send_to_model(
        &mut self,
        model: Arc<dyn LanguageModel>,
@@ -388,7 +312,7 @@ impl Thread {
    pub fn to_completion_request(
        &self,
        request_kind: RequestKind,
-        cx: &App,
+        _cx: &App,
    ) -> LanguageModelRequest {
        let mut request = LanguageModelRequest {
            messages: vec![],
@@ -397,12 +321,6 @@ impl Thread {
            temperature: None,
        };

-        request.messages.push(LanguageModelRequestMessage {
-            role: Role::System,
-            content: vec![SCRIPTING_PROMPT.to_string().into()],
-            cache: true,
-        });
-
        let mut referenced_context_ids = HashSet::default();

        for message in &self.messages {
@@ -415,7 +333,6 @@ impl Thread {
                content: Vec::new(),
                cache: false,
            };
-
            match request_kind {
                RequestKind::Chat => {
                    self.tool_use
@@ -436,20 +353,11 @@ impl Thread {
                RequestKind::Chat => {
                    self.tool_use
                        .attach_tool_uses(message.id, &mut request_message);
-
-                    if matches!(message.role, Role::Assistant) {
-                        if let Some(script_id) = self.scripts_by_assistant_message.get(&message.id)
-                        {
-                            let script = self.script_session.read(cx).get(*script_id);
-
-                            request_message.content.push(script.source_tag().into());
-                        }
-                    }
                }
                RequestKind::Summarize => {
                    // We don't care about tool use during summarization.
                }
-            };
+            }

            request.messages.push(request_message);
        }
@@ -486,8 +394,6 @@ impl Thread {
            let stream_completion = async {
                let mut events = stream.await?;
                let mut stop_reason = StopReason::EndTurn;
-                let mut script_tag_parser = ScriptTagParser::new();
-                let mut script_id = None;

                while let Some(event) = events.next().await {
                    let event = event?;
@@ -502,43 +408,19 @@ impl Thread {
                            }
                            LanguageModelCompletionEvent::Text(chunk) => {
                                if let Some(last_message) = thread.messages.last_mut() {
-                                    let chunk = script_tag_parser.parse_chunk(&chunk);
-
-                                    let message_id = if last_message.role == Role::Assistant {
-                                        last_message.text.push_str(&chunk.content);
+                                    if last_message.role == Role::Assistant {
+                                        last_message.text.push_str(&chunk);
                                        cx.emit(ThreadEvent::StreamedAssistantText(
                                            last_message.id,
-                                            chunk.content,
+                                            chunk,
                                        ));
-                                        last_message.id
                                    } else {
                                        // If we won't have an Assistant message yet, assume this chunk marks the beginning
                                        // of a new Assistant response.
                                        //
                                        // Importantly: We do *not* want to emit a `StreamedAssistantText` event here, as it
                                        // will result in duplicating the text of the chunk in the rendered Markdown.
-                                        thread.insert_message(Role::Assistant, chunk.content, cx)
-                                    };
-
-                                    if script_id.is_none() && script_tag_parser.found_script() {
-                                        let id = thread
-                                            .script_session
-                                            .update(cx, |session, _cx| session.new_script());
-                                        thread.scripts_by_assistant_message.insert(message_id, id);
-
-                                        script_id = Some(id);
-                                    }
-
-                                    if let (Some(script_source), Some(script_id)) =
-                                        (chunk.script_source, script_id)
-                                    {
-                                        // TODO: move buffer to script and run as it streams
-                                        thread
-                                            .script_session
-                                            .update(cx, |this, cx| {
-                                                this.run_script(script_id, script_source, cx)
-                                            })
-                                            .detach_and_log_err(cx);
+                                        thread.insert_message(Role::Assistant, chunk, cx);
                                    }
                                }
                            }
@@ -668,23 +550,6 @@ impl Thread {
        });
    }

-    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) {
-        let pending_tool_uses = self
-            .pending_tool_uses()
-            .into_iter()
-            .filter(|tool_use| tool_use.status.is_idle())
-            .cloned()
-            .collect::<Vec<_>>();
-
-        for tool_use in pending_tool_uses {
-            if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
-                let task = tool.run(tool_use.input, self.project.clone(), cx);
-
-                self.insert_tool_output(tool_use.id.clone(), task, cx);
-            }
-        }
-    }
-
    pub fn insert_tool_output(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
@@ -711,23 +576,6 @@ impl Thread {
            .run_pending_tool(tool_use_id, insert_output_task);
    }

-    pub fn send_tool_results_to_model(
-        &mut self,
-        model: Arc<dyn LanguageModel>,
-        cx: &mut Context<Self>,
-    ) {
-        // Insert a user message to contain the tool results.
-        self.insert_user_message(
-            // TODO: Sending up a user message without any content results in the model sending back
-            // responses that also don't have any content. We currently don't handle this case well,
-            // so for now we provide some text to keep the model on track.
-            "Here are the tool results.",
-            Vec::new(),
-            cx,
-        );
-        self.send_to_model(model, RequestKind::Chat, true, cx);
-    }
-
    /// Cancels the last pending completion, if there are any pending.
    ///
    /// Returns whether a completion was canceled.
@@ -761,7 +609,6 @@ pub enum ThreadEvent {
        #[allow(unused)]
        tool_use_id: LanguageModelToolUseId,
    },
-    ScriptFinished,
 }

 impl EventEmitter<ThreadEvent> for Thread {}
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -26,6 +26,7 @@ pub fn init(cx: &mut App) {
 }

 pub struct ThreadStore {
+    #[allow(unused)]
    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    context_server_manager: Entity<ContextServerManager>,
@@ -77,7 +78,7 @@ impl ThreadStore {
    }

    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
-        cx.new(|cx| Thread::new(self.project.clone(), self.tools.clone(), cx))
+        cx.new(|cx| Thread::new(self.tools.clone(), cx))
    }

    pub fn open_thread(
@@ -95,15 +96,7 @@ impl ThreadStore {
                .ok_or_else(|| anyhow!("no thread found with ID: {id:?}"))?;

            this.update(&mut cx, |this, cx| {
-                cx.new(|cx| {
-                    Thread::from_saved(
-                        id.clone(),
-                        thread,
-                        this.project.clone(),
-                        this.tools.clone(),
-                        cx,
-                    )
-                })
+                cx.new(|cx| Thread::from_saved(id.clone(), thread, this.tools.clone(), cx))
            })
        })
    }
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -5,9 +5,9 @@ use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWor
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, ToPoint};
+use language::{Anchor, Buffer, LanguageServerId, ToPoint};
 use parking_lot::Mutex;
-use project::{lsp_store::CompletionDocumentation, CompletionIntent, CompletionSource};
+use project::{lsp_store::CompletionDocumentation, CompletionIntent};
 use rope::Point;
 use std::{
    cell::RefCell,
@@ -125,8 +125,10 @@ impl SlashCommandCompletionProvider {
                            )),
                            new_text,
                            label: command.label(cx),
+                            server_id: LanguageServerId(0),
+                            lsp_completion: Default::default(),
                            confirm,
-                            source: CompletionSource::Custom,
+                            resolved: true,
                        })
                    })
                    .collect()
@@ -223,8 +225,10 @@ impl SlashCommandCompletionProvider {
                            label: new_argument.label,
                            new_text,
                            documentation: None,
+                            server_id: LanguageServerId(0),
+                            lsp_completion: Default::default(),
                            confirm,
-                            source: CompletionSource::Custom,
+                            resolved: true,
                        }
                    })
                    .collect())
--- a/crates/assistant_scripting/src/assistant_scripting.rs
+++ b/crates/assistant_scripting/src/assistant_scripting.rs
@@ -1,7 +0,0 @@
-mod session;
-mod tag;
-
-pub use session::*;
-pub use tag::*;
-
-pub const SCRIPTING_PROMPT: &str = include_str!("./system_prompt.txt");
--- a/crates/assistant_scripting/src/tag.rs
+++ b/crates/assistant_scripting/src/tag.rs
@@ -1,260 +0,0 @@
-pub const SCRIPT_START_TAG: &str = "<eval type=\"lua\">";
-pub const SCRIPT_END_TAG: &str = "</eval>";
-
-const START_TAG: &[u8] = SCRIPT_START_TAG.as_bytes();
-const END_TAG: &[u8] = SCRIPT_END_TAG.as_bytes();
-
-/// Parses a script tag in an assistant message as it is being streamed.
-pub struct ScriptTagParser {
-    state: State,
-    buffer: Vec<u8>,
-    tag_match_ix: usize,
-}
-
-enum State {
-    Unstarted,
-    Streaming,
-    Ended,
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ChunkOutput {
-    /// The chunk with script tags removed.
-    pub content: String,
-    /// The full script tag content. `None` until closed.
-    pub script_source: Option<String>,
-}
-
-impl ScriptTagParser {
-    /// Create a new script tag parser.
-    pub fn new() -> Self {
-        Self {
-            state: State::Unstarted,
-            buffer: Vec::new(),
-            tag_match_ix: 0,
-        }
-    }
-
-    /// Returns true if the parser has found a script tag.
-    pub fn found_script(&self) -> bool {
-        match self.state {
-            State::Unstarted => false,
-            State::Streaming | State::Ended => true,
-        }
-    }
-
-    /// Process a new chunk of input, splitting it into surrounding content and script source.
-    pub fn parse_chunk(&mut self, input: &str) -> ChunkOutput {
-        let mut content = Vec::with_capacity(input.len());
-
-        for byte in input.bytes() {
-            match self.state {
-                State::Unstarted => {
-                    if collect_until_tag(byte, START_TAG, &mut self.tag_match_ix, &mut content) {
-                        self.state = State::Streaming;
-                        self.buffer = Vec::with_capacity(1024);
-                        self.tag_match_ix = 0;
-                    }
-                }
-                State::Streaming => {
-                    if collect_until_tag(byte, END_TAG, &mut self.tag_match_ix, &mut self.buffer) {
-                        self.state = State::Ended;
-                    }
-                }
-                State::Ended => content.push(byte),
-            }
-        }
-
-        let content = unsafe { String::from_utf8_unchecked(content) };
-
-        let script_source = if matches!(self.state, State::Ended) && !self.buffer.is_empty() {
-            let source = unsafe { String::from_utf8_unchecked(std::mem::take(&mut self.buffer)) };
-
-            Some(source)
-        } else {
-            None
-        };
-
-        ChunkOutput {
-            content,
-            script_source,
-        }
-    }
-}
-
-fn collect_until_tag(byte: u8, tag: &[u8], tag_match_ix: &mut usize, buffer: &mut Vec<u8>) -> bool {
-    // this can't be a method because it'd require a mutable borrow on both self and self.buffer
-
-    if match_tag_byte(byte, tag, tag_match_ix) {
-        *tag_match_ix >= tag.len()
-    } else {
-        if *tag_match_ix > 0 {
-            // push the partially matched tag to the buffer
-            buffer.extend_from_slice(&tag[..*tag_match_ix]);
-            *tag_match_ix = 0;
-
-            // the tag might start to match again
-            if match_tag_byte(byte, tag, tag_match_ix) {
-                return *tag_match_ix >= tag.len();
-            }
-        }
-
-        buffer.push(byte);
-
-        false
-    }
-}
-
-fn match_tag_byte(byte: u8, tag: &[u8], tag_match_ix: &mut usize) -> bool {
-    if byte == tag[*tag_match_ix] {
-        *tag_match_ix += 1;
-        true
-    } else {
-        false
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_complete_tag() {
-        let mut parser = ScriptTagParser::new();
-        let input = "<eval type=\"lua\">print(\"Hello, World!\")</eval>";
-        let result = parser.parse_chunk(input);
-        assert_eq!(result.content, "");
-        assert_eq!(
-            result.script_source,
-            Some("print(\"Hello, World!\")".to_string())
-        );
-    }
-
-    #[test]
-    fn test_no_tag() {
-        let mut parser = ScriptTagParser::new();
-        let input = "No tags here, just plain text";
-        let result = parser.parse_chunk(input);
-        assert_eq!(result.content, "No tags here, just plain text");
-        assert_eq!(result.script_source, None);
-    }
-
-    #[test]
-    fn test_partial_end_tag() {
-        let mut parser = ScriptTagParser::new();
-
-        // Start the tag
-        let result = parser.parse_chunk("<eval type=\"lua\">let x = '</e");
-        assert_eq!(result.content, "");
-        assert_eq!(result.script_source, None);
-
-        // Finish with the rest
-        let result = parser.parse_chunk("val' + 'not the end';</eval>");
-        assert_eq!(result.content, "");
-        assert_eq!(
-            result.script_source,
-            Some("let x = '</eval' + 'not the end';".to_string())
-        );
-    }
-
-    #[test]
-    fn test_text_before_and_after_tag() {
-        let mut parser = ScriptTagParser::new();
-        let input = "Before tag <eval type=\"lua\">print(\"Hello\")</eval> After tag";
-        let result = parser.parse_chunk(input);
-        assert_eq!(result.content, "Before tag  After tag");
-        assert_eq!(result.script_source, Some("print(\"Hello\")".to_string()));
-    }
-
-    #[test]
-    fn test_multiple_chunks_with_surrounding_text() {
-        let mut parser = ScriptTagParser::new();
-
-        // First chunk with text before
-        let result = parser.parse_chunk("Before script <eval type=\"lua\">local x = 10");
-        assert_eq!(result.content, "Before script ");
-        assert_eq!(result.script_source, None);
-
-        // Second chunk with script content
-        let result = parser.parse_chunk("\nlocal y = 20");
-        assert_eq!(result.content, "");
-        assert_eq!(result.script_source, None);
-
-        // Last chunk with text after
-        let result = parser.parse_chunk("\nprint(x + y)</eval> After script");
-        assert_eq!(result.content, " After script");
-        assert_eq!(
-            result.script_source,
-            Some("local x = 10\nlocal y = 20\nprint(x + y)".to_string())
-        );
-
-        let result = parser.parse_chunk(" there's more text");
-        assert_eq!(result.content, " there's more text");
-        assert_eq!(result.script_source, None);
-    }
-
-    #[test]
-    fn test_partial_start_tag_matching() {
-        let mut parser = ScriptTagParser::new();
-
-        // partial match of start tag...
-        let result = parser.parse_chunk("<ev");
-        assert_eq!(result.content, "");
-
-        // ...that's abandandoned when the < of a real tag is encountered
-        let result = parser.parse_chunk("<eval type=\"lua\">script content</eval>");
-        // ...so it gets pushed to content
-        assert_eq!(result.content, "<ev");
-        // ...and the real tag is parsed correctly
-        assert_eq!(result.script_source, Some("script content".to_string()));
-    }
-
-    #[test]
-    fn test_random_chunked_parsing() {
-        use rand::rngs::StdRng;
-        use rand::{Rng, SeedableRng};
-        use std::time::{SystemTime, UNIX_EPOCH};
-
-        let test_inputs = [
-            "Before <eval type=\"lua\">print(\"Hello\")</eval> After",
-            "No tags here at all",
-            "<eval type=\"lua\">local x = 10\nlocal y = 20\nprint(x + y)</eval>",
-            "Text <eval type=\"lua\">if true then\nprint(\"nested </e\")\nend</eval> more",
-        ];
-
-        let seed = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_secs();
-
-        eprintln!("Using random seed: {}", seed);
-        let mut rng = StdRng::seed_from_u64(seed);
-
-        for test_input in &test_inputs {
-            let mut reference_parser = ScriptTagParser::new();
-            let expected = reference_parser.parse_chunk(test_input);
-
-            let mut chunked_parser = ScriptTagParser::new();
-            let mut remaining = test_input.as_bytes();
-            let mut actual_content = String::new();
-            let mut actual_script = None;
-
-            while !remaining.is_empty() {
-                let chunk_size = rng.gen_range(1..=remaining.len().min(5));
-                let (chunk, rest) = remaining.split_at(chunk_size);
-                remaining = rest;
-
-                let chunk_str = std::str::from_utf8(chunk).unwrap();
-                let result = chunked_parser.parse_chunk(chunk_str);
-
-                actual_content.push_str(&result.content);
-                if result.script_source.is_some() {
-                    actual_script = result.script_source;
-                }
-            }
-
-            assert_eq!(actual_content, expected.content);
-            assert_eq!(actual_script, expected.script_source);
-        }
-    }
-}
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -17,6 +17,6 @@ collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
-project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+workspace.workspace = true
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -4,8 +4,8 @@ mod tool_working_set;
 use std::sync::Arc;

 use anyhow::Result;
-use gpui::{App, Entity, Task};
-use project::Project;
+use gpui::{App, Task, WeakEntity, Window};
+use workspace::Workspace;

 pub use crate::tool_registry::*;
 pub use crate::tool_working_set::*;
@@ -31,7 +31,8 @@ pub trait Tool: 'static + Send + Sync {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        window: &mut Window,
        cx: &mut App,
    ) -> Task<Result<String>>;
 }
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -20,3 +20,4 @@ project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+workspace.workspace = true
--- a/crates/assistant_tools/src/list_worktrees_tool.rs
+++ b/crates/assistant_tools/src/list_worktrees_tool.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;

-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use project::Project;
+use gpui::{App, Task, WeakEntity, Window};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use workspace::Workspace;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ListWorktreesToolInput {}
@@ -34,9 +34,16 @@ impl Tool for ListWorktreesTool {
    fn run(
        self: Arc<Self>,
        _input: serde_json::Value,
-        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        _window: &mut Window,
        cx: &mut App,
    ) -> Task<Result<String>> {
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow!("workspace dropped")));
+        };
+
+        let project = workspace.read(cx).project().clone();
+
        cx.spawn(|cx| async move {
            cx.update(|cx| {
                #[derive(Debug, Serialize)]
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -3,8 +3,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
 use chrono::{Local, Utc};
-use gpui::{App, Entity, Task};
-use project::Project;
+use gpui::{App, Task, WeakEntity, Window};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

@@ -42,7 +41,8 @@ impl Tool for NowTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _project: Entity<Project>,
+        _workspace: WeakEntity<workspace::Workspace>,
+        _window: &mut Window,
        _cx: &mut App,
    ) -> Task<Result<String>> {
        let input: NowToolInput = match serde_json::from_value(input) {
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -3,10 +3,11 @@ use std::sync::Arc;

 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use project::{Project, ProjectPath, WorktreeId};
+use gpui::{App, Task, WeakEntity, Window};
+use project::{ProjectPath, WorktreeId};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use workspace::Workspace;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ReadFileToolInput {
@@ -37,14 +38,20 @@ impl Tool for ReadFileTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        _window: &mut Window,
        cx: &mut App,
    ) -> Task<Result<String>> {
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow!("workspace dropped")));
+        };
+
        let input = match serde_json::from_value::<ReadFileToolInput>(input) {
            Ok(input) => input,
            Err(err) => return Task::ready(Err(anyhow!(err))),
        };

+        let project = workspace.read(cx).project().clone();
        let project_path = ProjectPath {
            worktree_id: WorktreeId::from_usize(input.worktree_id),
            path: input.path,
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -10,9 +10,9 @@ use gpui::{
 };
 use language::{
    language_settings::SoftWrap, Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry,
-    ToOffset,
+    LanguageServerId, ToOffset,
 };
-use project::{search::SearchQuery, Completion, CompletionSource};
+use project::{search::SearchQuery, Completion};
 use settings::Settings;
 use std::{
    cell::RefCell,
@@ -309,9 +309,11 @@ impl MessageEditor {
                    old_range: range.clone(),
                    new_text,
                    label,
-                    confirm: None,
                    documentation: None,
-                    source: CompletionSource::Custom,
+                    server_id: LanguageServerId(0), // TODO: Make this optional or something?
+                    lsp_completion: Default::default(), // TODO: Make this optional or something?
+                    confirm: None,
+                    resolved: true,
                }
            })
            .collect()
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -78,7 +78,6 @@ pub struct ComponentId(pub &'static str);

 #[derive(Clone)]
 pub struct ComponentMetadata {
-    id: ComponentId,
    name: SharedString,
    scope: Option<ComponentScope>,
    description: Option<SharedString>,
@@ -86,10 +85,6 @@ pub struct ComponentMetadata {
 }

 impl ComponentMetadata {
-    pub fn id(&self) -> ComponentId {
-        self.id.clone()
-    }
-
    pub fn name(&self) -> SharedString {
        self.name.clone()
    }
@@ -161,11 +156,9 @@ pub fn components() -> AllComponents {
    for (ref scope, name, description) in &data.components {
        let preview = data.previews.get(name).cloned();
        let component_name = SharedString::new_static(name);
-        let id = ComponentId(name);
        all_components.insert(
-            id.clone(),
+            ComponentId(name),
            ComponentMetadata {
-                id,
                name: component_name,
                scope: scope.clone(),
                description: description.map(Into::into),
--- a/crates/component_preview/Cargo.toml
+++ b/crates/component_preview/Cargo.toml
@@ -23,4 +23,3 @@ project.workspace = true
 ui.workspace = true
 workspace.workspace = true
 notifications.workspace = true
-collections.workspace = true
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
@@ -6,14 +6,12 @@ use std::iter::Iterator;
 use std::sync::Arc;

 use client::UserStore;
-use component::{components, ComponentId, ComponentMetadata};
+use component::{components, ComponentMetadata};
 use gpui::{
    list, prelude::*, uniform_list, App, Entity, EventEmitter, FocusHandle, Focusable, Task,
    WeakEntity, Window,
 };

-use collections::HashMap;
-
 use gpui::{ListState, ScrollHandle, UniformListScrollHandle};
 use languages::LanguageRegistry;
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -61,8 +59,6 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
 }

 enum PreviewEntry {
-    AllComponents,
-    Separator,
    Component(ComponentMetadata),
    SectionHeader(SharedString),
 }
@@ -79,22 +75,13 @@ impl From<SharedString> for PreviewEntry {
    }
 }

-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-enum PreviewPage {
-    #[default]
-    AllComponents,
-    Component(ComponentId),
-}
-
 struct ComponentPreview {
    focus_handle: FocusHandle,
    _view_scroll_handle: ScrollHandle,
    nav_scroll_handle: UniformListScrollHandle,
-    component_map: HashMap<ComponentId, ComponentMetadata>,
-    active_page: PreviewPage,
    components: Vec<ComponentMetadata>,
    component_list: ListState,
-    cursor_index: usize,
+    selected_index: usize,
    language_registry: Arc<LanguageRegistry>,
    workspace: WeakEntity<Workspace>,
    user_store: Entity<UserStore>,
@@ -108,25 +95,22 @@ impl ComponentPreview {
        selected_index: impl Into<Option<usize>>,
        cx: &mut Context<Self>,
    ) -> Self {
-        let sorted_components = components().all_sorted();
+        let components = components().all_sorted();
+        let initial_length = components.len();
        let selected_index = selected_index.into().unwrap_or(0);

-        let component_list = ListState::new(
-            sorted_components.len(),
-            gpui::ListAlignment::Top,
-            px(1500.0),
-            {
+        let component_list =
+            ListState::new(initial_length, gpui::ListAlignment::Top, px(1500.0), {
                let this = cx.entity().downgrade();
                move |ix, window: &mut Window, cx: &mut App| {
                    this.update(cx, |this, cx| {
                        let component = this.get_component(ix);
-                        this.render_preview(&component, window, cx)
+                        this.render_preview(ix, &component, window, cx)
                            .into_any_element()
                    })
                    .unwrap()
                }
-            },
-        );
+            });

        let mut component_preview = Self {
            focus_handle: cx.focus_handle(),
@@ -135,15 +119,13 @@ impl ComponentPreview {
            language_registry,
            user_store,
            workspace,
-            active_page: PreviewPage::AllComponents,
-            component_map: components().0,
-            components: sorted_components,
+            components,
            component_list,
-            cursor_index: selected_index,
+            selected_index,
        };

-        if component_preview.cursor_index > 0 {
-            component_preview.scroll_to_preview(component_preview.cursor_index, cx);
+        if component_preview.selected_index > 0 {
+            component_preview.scroll_to_preview(component_preview.selected_index, cx);
        }

        component_preview.update_component_list(cx);
@@ -153,12 +135,7 @@ impl ComponentPreview {

    fn scroll_to_preview(&mut self, ix: usize, cx: &mut Context<Self>) {
        self.component_list.scroll_to_reveal_item(ix);
-        self.cursor_index = ix;
-        cx.notify();
-    }
-
-    fn set_active_page(&mut self, page: PreviewPage, cx: &mut Context<Self>) {
-        self.active_page = page;
+        self.selected_index = ix;
        cx.notify();
    }

@@ -169,6 +146,7 @@ impl ComponentPreview {
    fn scope_ordered_entries(&self) -> Vec<PreviewEntry> {
        use std::collections::HashMap;

+        // Group components by scope
        let mut scope_groups: HashMap<Option<ComponentScope>, Vec<ComponentMetadata>> =
            HashMap::default();

@@ -179,12 +157,15 @@ impl ComponentPreview {
                .push(component.clone());
        }

+        // Sort components within each scope by name
        for components in scope_groups.values_mut() {
            components.sort_by_key(|c| c.name().to_lowercase());
        }

+        // Build entries with scopes in a defined order
        let mut entries = Vec::new();

+        // Define scope order (we want Unknown at the end)
        let known_scopes = [
            ComponentScope::Layout,
            ComponentScope::Input,
@@ -194,16 +175,15 @@ impl ComponentPreview {
            ComponentScope::VersionControl,
        ];

-        // Always show all components first
-        entries.push(PreviewEntry::AllComponents);
-        entries.push(PreviewEntry::Separator);
-
+        // First add components with known scopes
        for scope in known_scopes.iter() {
            let scope_key = Some(scope.clone());
            if let Some(components) = scope_groups.remove(&scope_key) {
                if !components.is_empty() {
+                    // Add section header
                    entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));

+                    // Add all components under this scope
                    for component in components {
                        entries.push(PreviewEntry::Component(component));
                    }
@@ -211,13 +191,16 @@ impl ComponentPreview {
            }
        }

+        // Handle components with Unknown scope
        for (scope, components) in &scope_groups {
            if let Some(ComponentScope::Unknown(_)) = scope {
                if !components.is_empty() {
+                    // Add the unknown scope header
                    if let Some(scope_value) = scope {
                        entries.push(PreviewEntry::SectionHeader(scope_value.to_string().into()));
                    }

+                    // Add all components under this unknown scope
                    for component in components {
                        entries.push(PreviewEntry::Component(component.clone()));
                    }
@@ -225,9 +208,9 @@ impl ComponentPreview {
            }
        }

+        // Handle components with no scope
        if let Some(components) = scope_groups.get(&None) {
            if !components.is_empty() {
-                entries.push(PreviewEntry::Separator);
                entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));

                for component in components {
@@ -243,42 +226,22 @@ impl ComponentPreview {
        &self,
        ix: usize,
        entry: &PreviewEntry,
+        selected: bool,
        cx: &Context<Self>,
    ) -> impl IntoElement {
        match entry {
-            PreviewEntry::Component(component_metadata) => {
-                let id = component_metadata.id();
-                let selected = self.active_page == PreviewPage::Component(id.clone());
-                ListItem::new(ix)
-                    .child(Label::new(component_metadata.name().clone()).color(Color::Default))
-                    .selectable(true)
-                    .toggle_state(selected)
-                    .inset(true)
-                    .on_click(cx.listener(move |this, _, _, cx| {
-                        let id = id.clone();
-                        this.set_active_page(PreviewPage::Component(id), cx);
-                    }))
-                    .into_any_element()
-            }
+            PreviewEntry::Component(component_metadata) => ListItem::new(ix)
+                .child(Label::new(component_metadata.name().clone()).color(Color::Default))
+                .selectable(true)
+                .toggle_state(selected)
+                .inset(true)
+                .on_click(cx.listener(move |this, _, _, cx| {
+                    this.scroll_to_preview(ix, cx);
+                }))
+                .into_any_element(),
            PreviewEntry::SectionHeader(shared_string) => ListSubHeader::new(shared_string)
                .inset(true)
                .into_any_element(),
-            PreviewEntry::AllComponents => {
-                let selected = self.active_page == PreviewPage::AllComponents;
-
-                ListItem::new(ix)
-                    .child(Label::new("All Components").color(Color::Default))
-                    .selectable(true)
-                    .toggle_state(selected)
-                    .inset(true)
-                    .on_click(cx.listener(move |this, _, _, cx| {
-                        this.set_active_page(PreviewPage::AllComponents, cx);
-                    }))
-                    .into_any_element()
-            }
-            PreviewEntry::Separator => ListItem::new(ix)
-                .child(h_flex().pt_3().child(Divider::horizontal_dashed()))
-                .into_any_element(),
        }
    }

@@ -297,13 +260,11 @@ impl ComponentPreview {
                weak_entity
                    .update(cx, |this, cx| match entry {
                        PreviewEntry::Component(component) => this
-                            .render_preview(component, window, cx)
+                            .render_preview(ix, component, window, cx)
                            .into_any_element(),
                        PreviewEntry::SectionHeader(shared_string) => this
                            .render_scope_header(ix, shared_string.clone(), window, cx)
                            .into_any_element(),
-                        PreviewEntry::AllComponents => div().w_full().h_0().into_any_element(),
-                        PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
                    })
                    .unwrap()
            },
@@ -329,6 +290,7 @@ impl ComponentPreview {

    fn render_preview(
        &self,
+        _ix: usize,
        component: &ComponentMetadata,
        window: &mut Window,
        cx: &mut App,
@@ -379,44 +341,6 @@ impl ComponentPreview {
            .into_any_element()
    }

-    fn render_all_components(&self) -> impl IntoElement {
-        v_flex()
-            .id("component-list")
-            .px_8()
-            .pt_4()
-            .size_full()
-            .child(
-                list(self.component_list.clone())
-                    .flex_grow()
-                    .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
-            )
-    }
-
-    fn render_component_page(
-        &mut self,
-        component_id: &ComponentId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let component = self.component_map.get(&component_id);
-
-        if let Some(component) = component {
-            v_flex()
-                .w_full()
-                .flex_initial()
-                .min_h_full()
-                .child(self.render_preview(component, window, cx))
-                .into_any_element()
-        } else {
-            v_flex()
-                .size_full()
-                .items_center()
-                .justify_center()
-                .child("Component not found")
-                .into_any_element()
-        }
-    }
-
    fn test_status_toast(&self, window: &mut Window, cx: &mut Context<Self>) {
        if let Some(workspace) = self.workspace.upgrade() {
            workspace.update(cx, |workspace, cx| {
@@ -439,9 +363,8 @@ impl ComponentPreview {
 }

 impl Render for ComponentPreview {
-    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 {
        let sidebar_entries = self.scope_ordered_entries();
-        let active_page = self.active_page.clone();

        h_flex()
            .id("component-preview")
@@ -463,7 +386,12 @@ impl Render for ComponentPreview {
                            move |this, range, _window, cx| {
                                range
                                    .map(|ix| {
-                                        this.render_sidebar_entry(ix, &sidebar_entries[ix], cx)
+                                        this.render_sidebar_entry(
+                                            ix,
+                                            &sidebar_entries[ix],
+                                            ix == this.selected_index,
+                                            cx,
+                                        )
                                    })
                                    .collect()
                            },
@@ -487,12 +415,18 @@ impl Render for ComponentPreview {
                        ),
                    ),
            )
-            .child(match active_page {
-                PreviewPage::AllComponents => self.render_all_components().into_any_element(),
-                PreviewPage::Component(id) => self
-                    .render_component_page(&id, window, cx)
-                    .into_any_element(),
-            })
+            .child(
+                v_flex()
+                    .id("component-list")
+                    .px_8()
+                    .pt_4()
+                    .size_full()
+                    .child(
+                        list(self.component_list.clone())
+                            .flex_grow()
+                            .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
+                    ),
+            )
    }
 }

@@ -531,7 +465,7 @@ impl Item for ComponentPreview {
        let language_registry = self.language_registry.clone();
        let user_store = self.user_store.clone();
        let weak_workspace = self.workspace.clone();
-        let selected_index = self.cursor_index;
+        let selected_index = self.selected_index;

        Some(cx.new(|cx| {
            Self::new(
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -31,3 +31,4 @@ settings.workspace = true
 smol.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
+workspace.workspace = true
--- a/crates/context_server/src/context_server_tool.rs
+++ b/crates/context_server/src/context_server_tool.rs
@@ -1,9 +1,8 @@
 use std::sync::Arc;

-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, bail};
 use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use project::Project;
+use gpui::{App, Entity, Task, Window};

 use crate::manager::ContextServerManager;
 use crate::types;
@@ -50,11 +49,12 @@ impl Tool for ContextServerTool {
    }

    fn run(
-        self: Arc<Self>,
+        self: std::sync::Arc<Self>,
        input: serde_json::Value,
-        _project: Entity<Project>,
+        _workspace: gpui::WeakEntity<workspace::Workspace>,
+        _: &mut Window,
        cx: &mut App,
-    ) -> Task<Result<String>> {
+    ) -> gpui::Task<gpui::Result<String>> {
        if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
            cx.foreground_executor().spawn({
                let tool_name = self.tool.name.clone();
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -623,21 +623,16 @@ impl Copilot {

    pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
-        match &self.server {
-            CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
-                let server = server.clone();
-                cx.background_spawn(async move {
-                    server
-                        .request::<request::SignOut>(request::SignOutParams {})
-                        .await?;
-                    anyhow::Ok(())
-                })
-            }
-            CopilotServer::Disabled => cx.background_spawn(async move {
-                clear_copilot_config_dir().await;
+        if let CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) = &self.server {
+            let server = server.clone();
+            cx.background_spawn(async move {
+                server
+                    .request::<request::SignOut>(request::SignOutParams {})
+                    .await?;
                anyhow::Ok(())
-            }),
-            _ => Task::ready(Err(anyhow!("copilot hasn't started yet"))),
+            })
+        } else {
+            Task::ready(Err(anyhow!("copilot hasn't started yet")))
        }
    }

@@ -1021,10 +1016,6 @@ async fn clear_copilot_dir() {
    remove_matching(paths::copilot_dir(), |_| true).await
 }

-async fn clear_copilot_config_dir() {
-    remove_matching(copilot_chat::copilot_chat_config_dir(), |_| true).await
-}
-
 async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
    const SERVER_PATH: &str = "dist/language-server.js";

--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -4,14 +4,13 @@ use std::sync::OnceLock;

 use anyhow::{anyhow, Result};
 use chrono::DateTime;
-use collections::HashSet;
 use fs::Fs;
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
 use gpui::{prelude::*, App, AsyncApp, Global};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use paths::home_dir;
 use serde::{Deserialize, Serialize};
-use settings::watch_config_dir;
+use settings::watch_config_file;
 use strum::EnumIter;

 pub const COPILOT_CHAT_COMPLETION_URL: &str = "https://api.githubcopilot.com/chat/completions";
@@ -213,7 +212,7 @@ pub fn init(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &mut App) {
    cx.set_global(GlobalCopilotChat(copilot_chat));
 }

-pub fn copilot_chat_config_dir() -> &'static PathBuf {
+fn copilot_chat_config_dir() -> &'static PathBuf {
    static COPILOT_CHAT_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();

    COPILOT_CHAT_CONFIG_DIR.get_or_init(|| {
@@ -238,18 +237,27 @@ impl CopilotChat {
    }

    pub fn new(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &App) -> Self {
-        let config_paths: HashSet<PathBuf> = copilot_chat_config_paths().into_iter().collect();
-        let dir_path = copilot_chat_config_dir();
+        let config_paths = copilot_chat_config_paths();
+
+        let resolve_config_path = {
+            let fs = fs.clone();
+            async move {
+                for config_path in config_paths.iter() {
+                    if fs.metadata(config_path).await.is_ok_and(|v| v.is_some()) {
+                        return config_path.clone();
+                    }
+                }
+                config_paths[0].clone()
+            }
+        };

        cx.spawn(|cx| async move {
-            let mut parent_watch_rx = watch_config_dir(
-                cx.background_executor(),
-                fs.clone(),
-                dir_path.clone(),
-                config_paths,
-            );
-            while let Some(contents) = parent_watch_rx.next().await {
+            let config_file = resolve_config_path.await;
+            let mut config_file_rx = watch_config_file(cx.background_executor(), fs, config_file);
+
+            while let Some(contents) = config_file_rx.next().await {
                let oauth_token = extract_oauth_token(contents);
+
                cx.update(|cx| {
                    if let Some(this) = Self::global(cx).as_ref() {
                        this.update(cx, |this, cx| {
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -311,10 +311,7 @@ impl ProjectDiagnosticsEditor {
        cx: &mut Context<Workspace>,
    ) {
        if let Some(existing) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
-            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);
+            workspace.activate_item(&existing, true, true, window, cx);
        } else {
            let workspace_handle = cx.entity().downgrade();

--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -340,9 +340,7 @@ gpui::actions!(
        MoveToPreviousWordStart,
        MoveToStartOfParagraph,
        MoveToStartOfExcerpt,
-        MoveToStartOfNextExcerpt,
        MoveToEndOfExcerpt,
-        MoveToEndOfPreviousExcerpt,
        MoveUp,
        Newline,
        NewlineAbove,
@@ -380,9 +378,7 @@ gpui::actions!(
        SelectAll,
        SelectAllMatches,
        SelectToStartOfExcerpt,
-        SelectToStartOfNextExcerpt,
        SelectToEndOfExcerpt,
-        SelectToEndOfPreviousExcerpt,
        SelectDown,
        SelectEnclosingSymbol,
        SelectLargerSyntaxNode,
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -6,11 +6,11 @@ use gpui::{
 };
 use language::Buffer;
 use language::CodeLabel;
+use lsp::LanguageServerId;
 use markdown::Markdown;
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
 use project::lsp_store::CompletionDocumentation;
-use project::CompletionSource;
 use project::{CodeAction, Completion, TaskSourceKind};

 use std::{
@@ -233,9 +233,11 @@ impl CompletionsMenu {
                    runs: Default::default(),
                    filter_range: Default::default(),
                },
+                server_id: LanguageServerId(usize::MAX),
                documentation: None,
+                lsp_completion: Default::default(),
                confirm: None,
-                source: CompletionSource::Custom,
+                resolved: true,
            })
            .collect();

@@ -498,12 +500,7 @@ impl CompletionsMenu {
                                    // Ignore font weight for syntax highlighting, as we'll use it
                                    // for fuzzy matches.
                                    highlight.font_weight = None;
-                                    if completion
-                                        .source
-                                        .lsp_completion(false)
-                                        .and_then(|lsp_completion| lsp_completion.deprecated)
-                                        .unwrap_or(false)
-                                    {
+                                    if completion.lsp_completion.deprecated.unwrap_or(false) {
                                        highlight.strikethrough = Some(StrikethroughStyle {
                                            thickness: 1.0.into(),
                                            ..Default::default()
@@ -711,12 +708,7 @@ impl CompletionsMenu {

                let completion = &completions[mat.candidate_id];
                let sort_key = completion.sort_key();
-                let sort_text =
-                    if let CompletionSource::Lsp { lsp_completion, .. } = &completion.source {
-                        lsp_completion.sort_text.as_deref()
-                    } else {
-                        None
-                    };
+                let sort_text = completion.lsp_completion.sort_text.as_deref();
                let score = Reverse(OrderedFloat(mat.score));

                if mat.score >= 0.2 {
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -138,9 +138,8 @@ use multi_buffer::{
 use project::{
    lsp_store::{CompletionDocumentation, FormatTrigger, LspFormatTarget, OpenLspBufferHandle},
    project_settings::{GitGutterSetting, ProjectSettings},
-    CodeAction, Completion, CompletionIntent, CompletionSource, DocumentHighlight, InlayHint,
-    Location, LocationLink, PrepareRenameResponse, Project, ProjectItem, ProjectTransaction,
-    TaskSourceKind,
+    CodeAction, Completion, CompletionIntent, DocumentHighlight, InlayHint, Location, LocationLink,
+    PrepareRenameResponse, Project, ProjectItem, ProjectTransaction, TaskSourceKind,
 };
 use rand::prelude::*;
 use rpc::{proto::*, ErrorExt};
@@ -1573,16 +1572,13 @@ impl Editor {
            }
        }

-        if let Some(singleton_buffer) = self.buffer.read(cx).as_singleton() {
-            if let Some(extension) = singleton_buffer
-                .read(cx)
-                .file()
-                .and_then(|file| file.path().extension()?.to_str())
-            {
-                key_context.set("extension", extension.to_string());
-            }
-        } else {
-            key_context.add("multibuffer");
+        if let Some(extension) = self
+            .buffer
+            .read(cx)
+            .as_singleton()
+            .and_then(|buffer| buffer.read(cx).file()?.path().extension()?.to_str())
+        {
+            key_context.set("extension", extension.to_string());
        }

        if has_active_edit_prediction {
@@ -9848,31 +9844,6 @@ impl Editor {
        })
    }

-    pub fn move_to_start_of_next_excerpt(
-        &mut self,
-        _: &MoveToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Next,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
    pub fn move_to_end_of_excerpt(
        &mut self,
        _: &MoveToEndOfExcerpt,
@@ -9898,31 +9869,6 @@ impl Editor {
        })
    }

-    pub fn move_to_end_of_previous_excerpt(
-        &mut self,
-        _: &MoveToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Prev,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
    pub fn select_to_start_of_excerpt(
        &mut self,
        _: &SelectToStartOfExcerpt,
@@ -9944,27 +9890,6 @@ impl Editor {
        })
    }

-    pub fn select_to_start_of_next_excerpt(
-        &mut self,
-        _: &SelectToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Next),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
    pub fn select_to_end_of_excerpt(
        &mut self,
        _: &SelectToEndOfExcerpt,
@@ -9986,27 +9911,6 @@ impl Editor {
        })
    }

-    pub fn select_to_end_of_previous_excerpt(
-        &mut self,
-        _: &SelectToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Prev),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
    pub fn move_to_beginning(
        &mut self,
        _: &MoveToBeginning,
@@ -14303,13 +14207,6 @@ impl Editor {
        EditorSettings::override_global(editor_settings, cx);
    }

-    pub fn line_numbers_enabled(&self, cx: &App) -> bool {
-        if let Some(show_line_numbers) = self.show_line_numbers {
-            return show_line_numbers;
-        }
-        EditorSettings::get_global(cx).gutter.line_numbers
-    }
-
    pub fn should_use_relative_line_numbers(&self, cx: &mut App) -> bool {
        self.use_relative_line_numbers
            .unwrap_or(EditorSettings::get_global(cx).relative_line_numbers)
@@ -14985,14 +14882,14 @@ impl Editor {
        &self,
        window: &mut Window,
        cx: &mut App,
-    ) -> BTreeMap<DisplayRow, LineHighlight> {
+    ) -> BTreeMap<DisplayRow, Background> {
        let snapshot = self.snapshot(window, cx);
        let mut used_highlight_orders = HashMap::default();
        self.highlighted_rows
            .iter()
            .flat_map(|(_, highlighted_rows)| highlighted_rows.iter())
            .fold(
-                BTreeMap::<DisplayRow, LineHighlight>::new(),
+                BTreeMap::<DisplayRow, Background>::new(),
                |mut unique_rows, highlight| {
                    let start = highlight.range.start.to_display_point(&snapshot);
                    let end = highlight.range.end.to_display_point(&snapshot);
@@ -17000,41 +16897,38 @@ fn snippet_completions(
                Some(Completion {
                    old_range: range,
                    new_text: snippet.body.clone(),
-                    source: CompletionSource::Lsp {
-                        server_id: LanguageServerId(usize::MAX),
-                        resolved: true,
-                        lsp_completion: Box::new(lsp::CompletionItem {
-                            label: snippet.prefix.first().unwrap().clone(),
-                            kind: Some(CompletionItemKind::SNIPPET),
-                            label_details: snippet.description.as_ref().map(|description| {
-                                lsp::CompletionItemLabelDetails {
-                                    detail: Some(description.clone()),
-                                    description: None,
-                                }
-                            }),
-                            insert_text_format: Some(InsertTextFormat::SNIPPET),
-                            text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                lsp::InsertReplaceEdit {
-                                    new_text: snippet.body.clone(),
-                                    insert: lsp_range,
-                                    replace: lsp_range,
-                                },
-                            )),
-                            filter_text: Some(snippet.body.clone()),
-                            sort_text: Some(char::MAX.to_string()),
-                            ..lsp::CompletionItem::default()
-                        }),
-                        lsp_defaults: None,
-                    },
+                    resolved: false,
                    label: CodeLabel {
                        text: matching_prefix.clone(),
-                        runs: Vec::new(),
+                        runs: vec![],
                        filter_range: 0..matching_prefix.len(),
                    },
+                    server_id: LanguageServerId(usize::MAX),
                    documentation: snippet
                        .description
                        .clone()
                        .map(|description| CompletionDocumentation::SingleLine(description.into())),
+                    lsp_completion: lsp::CompletionItem {
+                        label: snippet.prefix.first().unwrap().clone(),
+                        kind: Some(CompletionItemKind::SNIPPET),
+                        label_details: snippet.description.as_ref().map(|description| {
+                            lsp::CompletionItemLabelDetails {
+                                detail: Some(description.clone()),
+                                description: None,
+                            }
+                        }),
+                        insert_text_format: Some(InsertTextFormat::SNIPPET),
+                        text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
+                            lsp::InsertReplaceEdit {
+                                new_text: snippet.body.clone(),
+                                insert: lsp_range,
+                                replace: lsp_range,
+                            },
+                        )),
+                        filter_text: Some(snippet.body.clone()),
+                        sort_text: Some(char::MAX.to_string()),
+                        ..Default::default()
+                    },
                    confirm: None,
                })
            })
@@ -18532,27 +18426,3 @@ impl Render for MissingEditPredictionKeybindingTooltip {
        })
    }
 }
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct LineHighlight {
-    pub background: Background,
-    pub border: Option<gpui::Hsla>,
-}
-
-impl From<Hsla> for LineHighlight {
-    fn from(hsla: Hsla) -> Self {
-        Self {
-            background: hsla.into(),
-            border: None,
-        }
-    }
-}
-
-impl From<Background> for LineHighlight {
-    fn from(background: Background) -> Self {
-        Self {
-            background,
-            border: None,
-        }
-    }
-}
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12334,6 +12334,24 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
        },
    };

+    let item_0_out = lsp::CompletionItem {
+        commit_characters: Some(default_commit_characters.clone()),
+        insert_text_format: Some(default_insert_text_format),
+        ..item_0
+    };
+    let items_out = iter::once(item_0_out)
+        .chain(items[1..].iter().map(|item| lsp::CompletionItem {
+            commit_characters: Some(default_commit_characters.clone()),
+            data: Some(default_data.clone()),
+            insert_text_mode: Some(default_insert_text_mode),
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: default_edit_range,
+                new_text: item.label.clone(),
+            })),
+            ..item.clone()
+        }))
+        .collect::<Vec<lsp::CompletionItem>>();
+
    let mut cx = EditorLspTestContext::new_rust(
        lsp::ServerCapabilities {
            completion_provider: Some(lsp::CompletionOptions {
@@ -12352,11 +12370,10 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)

    let completion_data = default_data.clone();
    let completion_characters = default_commit_characters.clone();
-    let completion_items = items.clone();
    cx.handle_request::<lsp::request::Completion, _, _>(move |_, _, _| {
        let default_data = completion_data.clone();
        let default_commit_characters = completion_characters.clone();
-        let items = completion_items.clone();
+        let items = items.clone();
        async move {
            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
                items,
@@ -12405,7 +12422,7 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
                        .iter()
                        .map(|mat| mat.string.clone())
                        .collect::<Vec<String>>(),
-                    items
+                    items_out
                        .iter()
                        .map(|completion| completion.label.clone())
                        .collect::<Vec<String>>()
@@ -12418,18 +12435,14 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
    // with 4 from the end.
    assert_eq!(
        *resolved_items.lock(),
-        [&items[0..16], &items[items.len() - 4..items.len()]]
-            .concat()
-            .iter()
-            .cloned()
-            .map(|mut item| {
-                if item.data.is_none() {
-                    item.data = Some(default_data.clone());
-                }
-                item
-            })
-            .collect::<Vec<lsp::CompletionItem>>(),
-        "Items sent for resolve should be unchanged modulo resolve `data` filled with default if missing"
+        [
+            &items_out[0..16],
+            &items_out[items_out.len() - 4..items_out.len()]
+        ]
+        .concat()
+        .iter()
+        .cloned()
+        .collect::<Vec<lsp::CompletionItem>>()
    );
    resolved_items.lock().clear();

@@ -12440,15 +12453,9 @@ async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext)
    // Completions that have already been resolved are skipped.
    assert_eq!(
        *resolved_items.lock(),
-        items[items.len() - 16..items.len() - 4]
+        items_out[items_out.len() - 16..items_out.len() - 4]
            .iter()
            .cloned()
-            .map(|mut item| {
-                if item.data.is_none() {
-                    item.data = Some(default_data.clone());
-                }
-                item
-            })
            .collect::<Vec<lsp::CompletionItem>>()
    );
    resolved_items.lock().clear();
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -20,10 +20,10 @@ use crate::{
    DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, EditDisplayMode, Editor, EditorMode,
    EditorSettings, EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GoToHunk,
    GoToPreviousHunk, GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor,
-    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, LineHighlight, LineUp,
-    OpenExcerpts, PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight,
-    Selection, SoftWrap, StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS,
-    CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
+    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, LineUp, OpenExcerpts, PageDown,
+    PageUp, Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight, Selection, SoftWrap,
+    StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS, CURSORS_VISIBLE_FOR,
+    FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
    MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
@@ -282,9 +282,7 @@ impl EditorElement {
        register_action(editor, window, Editor::move_to_beginning);
        register_action(editor, window, Editor::move_to_end);
        register_action(editor, window, Editor::move_to_start_of_excerpt);
-        register_action(editor, window, Editor::move_to_start_of_next_excerpt);
        register_action(editor, window, Editor::move_to_end_of_excerpt);
-        register_action(editor, window, Editor::move_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_up);
        register_action(editor, window, Editor::select_down);
        register_action(editor, window, Editor::select_left);
@@ -298,9 +296,7 @@ impl EditorElement {
        register_action(editor, window, Editor::select_to_start_of_paragraph);
        register_action(editor, window, Editor::select_to_end_of_paragraph);
        register_action(editor, window, Editor::select_to_start_of_excerpt);
-        register_action(editor, window, Editor::select_to_start_of_next_excerpt);
        register_action(editor, window, Editor::select_to_end_of_excerpt);
-        register_action(editor, window, Editor::select_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_to_beginning);
        register_action(editor, window, Editor::select_to_end);
        register_action(editor, window, Editor::select_all);
@@ -4136,74 +4132,46 @@ impl EditorElement {
                    }
                }

-                let mut paint_highlight = |highlight_row_start: DisplayRow,
-                                           highlight_row_end: DisplayRow,
-                                           highlight: crate::LineHighlight,
-                                           edges| {
-                    let origin = point(
-                        layout.hitbox.origin.x,
-                        layout.hitbox.origin.y
-                            + (highlight_row_start.as_f32() - scroll_top)
-                                * layout.position_map.line_height,
-                    );
-                    let size = size(
-                        layout.hitbox.size.width,
-                        layout.position_map.line_height
-                            * highlight_row_end.next_row().minus(highlight_row_start) as f32,
-                    );
-                    let mut quad = fill(Bounds { origin, size }, highlight.background);
-                    if let Some(border_color) = highlight.border {
-                        quad.border_color = border_color;
-                        quad.border_widths = edges
-                    }
-                    window.paint_quad(quad);
-                };
+                let mut paint_highlight =
+                    |highlight_row_start: DisplayRow, highlight_row_end: DisplayRow, color| {
+                        let origin = point(
+                            layout.hitbox.origin.x,
+                            layout.hitbox.origin.y
+                                + (highlight_row_start.as_f32() - scroll_top)
+                                    * layout.position_map.line_height,
+                        );
+                        let size = size(
+                            layout.hitbox.size.width,
+                            layout.position_map.line_height
+                                * highlight_row_end.next_row().minus(highlight_row_start) as f32,
+                        );
+                        window.paint_quad(fill(Bounds { origin, size }, color));
+                    };

-                let mut current_paint: Option<(LineHighlight, Range<DisplayRow>, Edges<Pixels>)> =
-                    None;
+                let mut current_paint: Option<(gpui::Background, Range<DisplayRow>)> = None;
                for (&new_row, &new_background) in &layout.highlighted_rows {
                    match &mut current_paint {
-                        Some((current_background, current_range, mut edges)) => {
+                        Some((current_background, current_range)) => {
                            let current_background = *current_background;
                            let new_range_started = current_background != new_background
                                || current_range.end.next_row() != new_row;
                            if new_range_started {
-                                if current_range.end.next_row() == new_row {
-                                    edges.bottom = px(0.);
-                                };
                                paint_highlight(
                                    current_range.start,
                                    current_range.end,
                                    current_background,
-                                    edges,
                                );
-                                let edges = Edges {
-                                    top: if current_range.end.next_row() != new_row {
-                                        px(1.)
-                                    } else {
-                                        px(0.)
-                                    },
-                                    bottom: px(1.),
-                                    ..Default::default()
-                                };
-                                current_paint = Some((new_background, new_row..new_row, edges));
+                                current_paint = Some((new_background, new_row..new_row));
                                continue;
                            } else {
                                current_range.end = current_range.end.next_row();
                            }
                        }
-                        None => {
-                            let edges = Edges {
-                                top: px(1.),
-                                bottom: px(1.),
-                                ..Default::default()
-                            };
-                            current_paint = Some((new_background, new_row..new_row, edges))
-                        }
+                        None => current_paint = Some((new_background, new_row..new_row)),
                    };
                }
-                if let Some((color, range, edges)) = current_paint {
-                    paint_highlight(range.start, range.end, color, edges);
+                if let Some((color, range)) = current_paint {
+                    paint_highlight(range.start, range.end, color);
                }

                let scroll_left =
@@ -4463,9 +4431,6 @@ impl EditorElement {
                                    background_color.opacity(if is_light { 0.2 } else { 0.32 });
                            }
                        }
-                        GitHunkStyleSetting::StagedBorder | GitHunkStyleSetting::Border => {
-                            // Don't change the background color
-                        }
                    }

                    // Flatten the background color with the editor color to prevent
@@ -6810,15 +6775,12 @@ impl Element for EditorElement {
                        let hunk_opacity = if is_light { 0.16 } else { 0.12 };
                        let slash_width = line_height.0 / 1.5; // ~16 by default

-                        let staged_highlight: LineHighlight = match hunk_style {
-                            GitHunkStyleSetting::Transparent
-                            | GitHunkStyleSetting::Pattern
-                            | GitHunkStyleSetting::Border => {
-                                solid_background(background_color.opacity(hunk_opacity)).into()
+                        let staged_background = match hunk_style {
+                            GitHunkStyleSetting::Transparent | GitHunkStyleSetting::Pattern => {
+                                solid_background(background_color.opacity(hunk_opacity))
                            }
                            GitHunkStyleSetting::StagedPattern => {
                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
-                                    .into()
                            }
                            GitHunkStyleSetting::StagedTransparent => {
                                solid_background(background_color.opacity(if is_light {
@@ -6826,56 +6788,30 @@ impl Element for EditorElement {
                                } else {
                                    0.04
                                }))
-                                .into()
                            }
-                            GitHunkStyleSetting::StagedBorder => LineHighlight {
-                                background: (background_color.opacity(if is_light {
-                                    0.08
-                                } else {
-                                    0.06
-                                }))
-                                .into(),
-                                border: Some(if is_light {
-                                    background_color.opacity(0.48)
-                                } else {
-                                    background_color.opacity(0.36)
-                                }),
-                            },
                        };

-                        let unstaged_highlight = match hunk_style {
+                        let unstaged_background = match hunk_style {
                            GitHunkStyleSetting::Transparent => {
                                solid_background(background_color.opacity(if is_light {
                                    0.08
                                } else {
                                    0.04
                                }))
-                                .into()
                            }
                            GitHunkStyleSetting::Pattern => {
                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
-                                    .into()
                            }
-                            GitHunkStyleSetting::Border => LineHighlight {
-                                background: (background_color.opacity(if is_light {
-                                    0.08
-                                } else {
-                                    0.02
-                                }))
-                                .into(),
-                                border: Some(background_color.opacity(0.5)),
-                            },
                            GitHunkStyleSetting::StagedPattern
-                            | GitHunkStyleSetting::StagedTransparent
-                            | GitHunkStyleSetting::StagedBorder => {
-                                solid_background(background_color.opacity(hunk_opacity)).into()
+                            | GitHunkStyleSetting::StagedTransparent => {
+                                solid_background(background_color.opacity(hunk_opacity))
                            }
                        };

                        let background = if unstaged {
-                            unstaged_highlight
+                            unstaged_background
                        } else {
-                            staged_highlight
+                            staged_background
                        };

                        highlighted_rows
@@ -7724,7 +7660,7 @@ pub struct EditorLayout {
    indent_guides: Option<Vec<IndentGuideLayout>>,
    visible_display_row_range: Range<DisplayRow>,
    active_rows: BTreeMap<DisplayRow, bool>,
-    highlighted_rows: BTreeMap<DisplayRow, LineHighlight>,
+    highlighted_rows: BTreeMap<DisplayRow, gpui::Background>,
    line_elements: SmallVec<[AnyElement; 1]>,
    line_numbers: Arc<HashMap<MultiBufferRow, LineNumberLayout>>,
    display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
@@ -8896,16 +8832,14 @@ fn diff_hunk_controls(
        .h(line_height)
        .mr_1()
        .gap_1()
-        .px_0p5()
+        .px_1()
        .pb_1()
-        .border_x_1()
        .border_b_1()
        .border_color(cx.theme().colors().border_variant)
        .rounded_b_lg()
        .bg(cx.theme().colors().editor_background)
        .gap_1()
        .occlude()
-        .shadow_md()
        .child(if status.has_secondary_hunk() {
            Button::new(("stage", row as u64), "Stage")
                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
@@ -8962,7 +8896,7 @@ fn diff_hunk_controls(
                })
        })
        .child(
-            Button::new("restore", "Restore")
+            Button::new("discard", "Restore")
                .tooltip({
                    let focus_handle = editor.focus_handle(cx);
                    move |window, cx| {
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -448,9 +448,7 @@ pub fn end_of_excerpt(
            if start.row() > DisplayRow(0) {
                *start.row_mut() -= 1;
            }
-            start = map.clip_point(start, Bias::Left);
-            *start.column_mut() = 0;
-            start
+            map.clip_point(start, Bias::Left)
        }
        Direction::Next => {
            let mut end = excerpt.end_anchor().to_display_point(&map);
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -17,7 +17,6 @@ async-compression.workspace = true
 async-tar.workspace = true
 async-trait.workspace = true
 collections.workspace = true
-convert_case.workspace = true
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -4,7 +4,6 @@ use crate::{
 use anyhow::{anyhow, bail, Context as _, Result};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
-use convert_case::{Case, Casing as _};
 use futures::io::BufReader;
 use futures::AsyncReadExt;
 use http_client::{self, AsyncBody, HttpClient};
@@ -98,11 +97,6 @@ impl ExtensionBuilder {
        }

        for (grammar_name, grammar_metadata) in &extension_manifest.grammars {
-            let snake_cased_grammar_name = grammar_name.to_case(Case::Snake);
-            if grammar_name.as_ref() != snake_cased_grammar_name.as_str() {
-                bail!("grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}");
-            }
-
            log::info!(
                "compiling grammar {grammar_name} for extension {}",
                extension_dir.display()
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -692,9 +692,7 @@ impl GitRepository for RealGitRepository {
                PushOptions::Force => "--force-with-lease",
            }))
            .arg(remote_name)
-            .arg(format!("{}:{}", branch_name, branch_name))
-            .stdout(smol::process::Stdio::piped())
-            .stderr(smol::process::Stdio::piped());
+            .arg(format!("{}:{}", branch_name, branch_name));
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
@@ -716,9 +714,7 @@ impl GitRepository for RealGitRepository {
            .current_dir(&working_directory)
            .args(["pull"])
            .arg(remote_name)
-            .arg(branch_name)
-            .stdout(smol::process::Stdio::piped())
-            .stderr(smol::process::Stdio::piped());
+            .arg(branch_name);
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
@@ -733,9 +729,7 @@ impl GitRepository for RealGitRepository {
            .env("SSH_ASKPASS", ask_pass.script_path())
            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
-            .args(["fetch", "--all"])
-            .stdout(smol::process::Stdio::piped())
-            .stderr(smol::process::Stdio::piped());
+            .args(["fetch", "--all"]);
        let git_process = command.spawn()?;

        run_remote_command(ask_pass, git_process)
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -54,39 +54,6 @@ impl From<TrackedStatus> for FileStatus {
    }
 }

-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StageStatus {
-    Staged,
-    Unstaged,
-    PartiallyStaged,
-}
-
-impl StageStatus {
-    pub fn is_fully_staged(&self) -> bool {
-        matches!(self, StageStatus::Staged)
-    }
-
-    pub fn is_fully_unstaged(&self) -> bool {
-        matches!(self, StageStatus::Unstaged)
-    }
-
-    pub fn has_staged(&self) -> bool {
-        matches!(self, StageStatus::Staged | StageStatus::PartiallyStaged)
-    }
-
-    pub fn has_unstaged(&self) -> bool {
-        matches!(self, StageStatus::Unstaged | StageStatus::PartiallyStaged)
-    }
-
-    pub fn as_bool(self) -> Option<bool> {
-        match self {
-            StageStatus::Staged => Some(true),
-            StageStatus::Unstaged => Some(false),
-            StageStatus::PartiallyStaged => None,
-        }
-    }
-}
-
 impl FileStatus {
    pub const fn worktree(worktree_status: StatusCode) -> Self {
        FileStatus::Tracked(TrackedStatus {
@@ -139,15 +106,15 @@ impl FileStatus {
        Ok(status)
    }

-    pub fn staging(self) -> StageStatus {
+    pub fn is_staged(self) -> Option<bool> {
        match self {
            FileStatus::Untracked | FileStatus::Ignored | FileStatus::Unmerged { .. } => {
-                StageStatus::Unstaged
+                Some(false)
            }
            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Unmodified, _) => StageStatus::Unstaged,
-                (_, StatusCode::Unmodified) => StageStatus::Staged,
-                _ => StageStatus::PartiallyStaged,
+                (StatusCode::Unmodified, _) => Some(false),
+                (_, StatusCode::Unmodified) => Some(true),
+                _ => None,
            },
        }
    }
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -18,30 +18,10 @@ use workspace::{ModalView, Workspace};
 pub fn init(cx: &mut App) {
    cx.observe_new(|workspace: &mut Workspace, _, _| {
        workspace.register_action(open);
-        workspace.register_action(switch);
-        workspace.register_action(checkout_branch);
    })
    .detach();
 }

-pub fn checkout_branch(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::CheckoutBranch,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open(workspace, &zed_actions::git::Branch, window, cx);
-}
-
-pub fn switch(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::Switch,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open(workspace, &zed_actions::git::Branch, window, cx);
-}
-
 pub fn open(
    workspace: &mut Workspace,
    _: &zed_actions::git::Branch,
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -2,7 +2,7 @@

 use crate::branch_picker::{self, BranchList};
 use crate::git_panel::{commit_message_editor, GitPanel};
-use git::{Commit, GenerateCommitMessage};
+use git::Commit;
 use panel::{panel_button, panel_editor_style, panel_filled_button};
 use ui::{prelude::*, KeybindingHint, PopoverMenu, Tooltip};

@@ -372,24 +372,11 @@ impl Render for CommitModal {
            .key_context("GitCommit")
            .on_action(cx.listener(Self::dismiss))
            .on_action(cx.listener(Self::commit))
-            .on_action(cx.listener(|this, _: &GenerateCommitMessage, _, cx| {
-                this.git_panel.update(cx, |panel, cx| {
-                    panel.generate_commit_message(cx);
-                })
-            }))
            .on_action(
                cx.listener(|this, _: &zed_actions::git::Branch, window, cx| {
-                    toggle_branch_picker(this, window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|this, _: &zed_actions::git::CheckoutBranch, window, cx| {
-                    toggle_branch_picker(this, window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|this, _: &zed_actions::git::Switch, window, cx| {
-                    toggle_branch_picker(this, window, cx);
+                    this.branch_list.update(cx, |branch_list, cx| {
+                        branch_list.popover_handle.toggle(window, cx);
+                    })
                }),
            )
            .elevation_3(cx)
@@ -428,13 +415,3 @@ impl Render for CommitModal {
            )
    }
 }
-
-fn toggle_branch_picker(
-    this: &mut CommitModal,
-    window: &mut Window,
-    cx: &mut Context<'_, CommitModal>,
-) {
-    this.branch_list.update(cx, |branch_list, cx| {
-        branch_list.popover_handle.toggle(window, cx);
-    })
-}
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -1,13 +1,9 @@
 use ::settings::Settings;
-use git::{
-    repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
-    status::FileStatus,
-};
+use git::status::FileStatus;
 use git_panel_settings::GitPanelSettings;
-use gpui::{App, Entity, FocusHandle};
-use project::Project;
+use gpui::App;
 use project_diff::ProjectDiff;
-use ui::{ActiveTheme, Color, Icon, IconName, IntoElement, SharedString};
+use ui::{ActiveTheme, Color, Icon, IconName, IntoElement};
 use workspace::Workspace;

 mod askpass_modal;
@@ -64,22 +60,6 @@ pub fn init(cx: &mut App) {
                panel.pull(window, cx);
            });
        });
-        workspace.register_action(|workspace, action: &git::StageAll, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.stage_all(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, action: &git::UnstageAll, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.unstage_all(action, window, cx);
-            });
-        });
    })
    .detach();
 }
@@ -109,343 +89,3 @@ pub fn git_status_icon(status: FileStatus, cx: &App) -> impl IntoElement {
    };
    Icon::new(icon_name).color(Color::Custom(color))
 }
-
-fn can_push_and_pull(project: &Entity<Project>, cx: &App) -> bool {
-    !project.read(cx).is_via_collab()
-}
-
-fn render_remote_button(
-    id: impl Into<SharedString>,
-    branch: &Branch,
-    keybinding_target: Option<FocusHandle>,
-    show_fetch_button: bool,
-) -> Option<impl IntoElement> {
-    let id = id.into();
-    let upstream = branch.upstream.as_ref();
-    match upstream {
-        Some(Upstream {
-            tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }),
-            ..
-        }) => match (*ahead, *behind) {
-            (0, 0) if show_fetch_button => {
-                Some(remote_button::render_fetch_button(keybinding_target, id))
-            }
-            (0, 0) => None,
-            (ahead, 0) => Some(remote_button::render_push_button(
-                keybinding_target.clone(),
-                id,
-                ahead,
-            )),
-            (ahead, behind) => Some(remote_button::render_pull_button(
-                keybinding_target.clone(),
-                id,
-                ahead,
-                behind,
-            )),
-        },
-        Some(Upstream {
-            tracking: UpstreamTracking::Gone,
-            ..
-        }) => Some(remote_button::render_republish_button(
-            keybinding_target,
-            id,
-        )),
-        None => Some(remote_button::render_publish_button(keybinding_target, id)),
-    }
-}
-
-mod remote_button {
-    use gpui::{hsla, point, Action, AnyView, BoxShadow, ClickEvent, Corner, FocusHandle};
-    use ui::{
-        div, h_flex, px, rems, ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, Clickable,
-        ContextMenu, ElementId, ElevationIndex, FluentBuilder, Icon, IconName, IconSize,
-        IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement, PopoverMenu,
-        RenderOnce, SharedString, Styled, Tooltip, Window,
-    };
-
-    pub fn render_fetch_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        SplitButton::new(
-            id,
-            "Fetch",
-            0,
-            0,
-            Some(IconName::ArrowCircle),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Fetch), cx);
-            },
-            move |window, cx| {
-                git_action_tooltip(
-                    "Fetch updates from remote",
-                    &git::Fetch,
-                    "git fetch",
-                    keybinding_target.clone(),
-                    window,
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_push_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-        ahead: u32,
-    ) -> SplitButton {
-        SplitButton::new(
-            id,
-            "Push",
-            ahead as usize,
-            0,
-            None,
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |window, cx| {
-                git_action_tooltip(
-                    "Push committed changes to remote",
-                    &git::Push,
-                    "git push",
-                    keybinding_target.clone(),
-                    window,
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_pull_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-        ahead: u32,
-        behind: u32,
-    ) -> SplitButton {
-        SplitButton::new(
-            id,
-            "Pull",
-            ahead as usize,
-            behind as usize,
-            None,
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Pull), cx);
-            },
-            move |window, cx| {
-                git_action_tooltip(
-                    "Pull",
-                    &git::Pull,
-                    "git pull",
-                    keybinding_target.clone(),
-                    window,
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_publish_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        SplitButton::new(
-            id,
-            "Publish",
-            0,
-            0,
-            Some(IconName::ArrowUpFromLine),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |window, cx| {
-                git_action_tooltip(
-                    "Publish branch to remote",
-                    &git::Push,
-                    "git push --set-upstream",
-                    keybinding_target.clone(),
-                    window,
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_republish_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        SplitButton::new(
-            id,
-            "Republish",
-            0,
-            0,
-            Some(IconName::ArrowUpFromLine),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |window, cx| {
-                git_action_tooltip(
-                    "Re-publish branch to remote",
-                    &git::Push,
-                    "git push --set-upstream",
-                    keybinding_target.clone(),
-                    window,
-                    cx,
-                )
-            },
-        )
-    }
-
-    fn git_action_tooltip(
-        label: impl Into<SharedString>,
-        action: &dyn Action,
-        command: impl Into<SharedString>,
-        focus_handle: Option<FocusHandle>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        let label = label.into();
-        let command = command.into();
-
-        if let Some(handle) = focus_handle {
-            Tooltip::with_meta_in(
-                label.clone(),
-                Some(action),
-                command.clone(),
-                &handle,
-                window,
-                cx,
-            )
-        } else {
-            Tooltip::with_meta(label.clone(), Some(action), command.clone(), window, cx)
-        }
-    }
-
-    fn render_git_action_menu(id: impl Into<ElementId>) -> impl IntoElement {
-        PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)),
-                    ),
-            )
-            .menu(move |window, cx| {
-                Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                    context_menu
-                        .action("Fetch", git::Fetch.boxed_clone())
-                        .action("Pull", git::Pull.boxed_clone())
-                        .separator()
-                        .action("Push", git::Push.boxed_clone())
-                        .action("Force Push", git::ForcePush.boxed_clone())
-                }))
-            })
-            .anchor(Corner::TopRight)
-    }
-
-    #[derive(IntoElement)]
-    pub struct SplitButton {
-        pub left: ButtonLike,
-        pub right: AnyElement,
-    }
-
-    impl SplitButton {
-        fn new(
-            id: impl Into<SharedString>,
-            left_label: impl Into<SharedString>,
-            ahead_count: usize,
-            behind_count: usize,
-            left_icon: Option<IconName>,
-            left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-            tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
-        ) -> Self {
-            let id = id.into();
-
-            fn count(count: usize) -> impl IntoElement {
-                h_flex()
-                    .ml_neg_px()
-                    .h(rems(0.875))
-                    .items_center()
-                    .overflow_hidden()
-                    .px_0p5()
-                    .child(
-                        Label::new(count.to_string())
-                            .size(LabelSize::XSmall)
-                            .line_height_style(LineHeightStyle::UiLabel),
-                    )
-            }
-
-            let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
-
-            let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
-                format!("split-button-left-{}", id).into(),
-            ))
-            .layer(ui::ElevationIndex::ModalSurface)
-            .size(ui::ButtonSize::Compact)
-            .when(should_render_counts, |this| {
-                this.child(
-                    h_flex()
-                        .ml_neg_0p5()
-                        .mr_1()
-                        .when(behind_count > 0, |this| {
-                            this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
-                                .child(count(behind_count))
-                        })
-                        .when(ahead_count > 0, |this| {
-                            this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
-                                .child(count(ahead_count))
-                        }),
-                )
-            })
-            .when_some(left_icon, |this, left_icon| {
-                this.child(
-                    h_flex()
-                        .ml_neg_0p5()
-                        .mr_1()
-                        .child(Icon::new(left_icon).size(IconSize::XSmall)),
-                )
-            })
-            .child(
-                div()
-                    .child(Label::new(left_label).size(LabelSize::Small))
-                    .mr_0p5(),
-            )
-            .on_click(left_on_click)
-            .tooltip(tooltip);
-
-            let right = render_git_action_menu(ElementId::Name(
-                format!("split-button-right-{}", id).into(),
-            ))
-            .into_any_element();
-
-            Self { left, right }
-        }
-    }
-
-    impl RenderOnce for SplitButton {
-        fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-            h_flex()
-                .rounded_sm()
-                .border_1()
-                .border_color(cx.theme().colors().text_muted.alpha(0.12))
-                .child(div().flex_grow().child(self.left))
-                .child(
-                    div()
-                        .h_full()
-                        .w_px()
-                        .bg(cx.theme().colors().text_muted.alpha(0.16)),
-                )
-                .child(self.right)
-                .bg(ElevationIndex::Surface.on_elevation_bg(cx))
-                .shadow(smallvec::smallvec![BoxShadow {
-                    color: hsla(0.0, 0.0, 0.0, 0.16),
-                    offset: point(px(0.), px(1.)),
-                    blur_radius: px(0.),
-                    spread_radius: px(0.),
-                }])
-        }
-    }
-}
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -10,8 +10,7 @@ use editor::{
 use feature_flags::FeatureFlagViewExt;
 use futures::StreamExt;
 use git::{
-    repository::Branch, status::FileStatus, Commit, StageAll, StageAndNext, ToggleStaged,
-    UnstageAll, UnstageAndNext,
+    status::FileStatus, Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext,
 };
 use gpui::{
    actions, Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity,
@@ -25,27 +24,27 @@ use project::{
 };
 use std::any::{Any, TypeId};
 use theme::ActiveTheme;
-use ui::{prelude::*, vertical_divider, KeyBinding, Tooltip};
+use ui::{prelude::*, vertical_divider, Tooltip};
 use util::ResultExt as _;
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
    searchable::SearchableItemHandle,
-    CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
-    ToolbarItemView, Workspace,
+    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
 };

-actions!(git, [Diff, Add]);
+actions!(git, [Diff]);

 pub struct ProjectDiff {
-    project: Entity<Project>,
    multibuffer: Entity<MultiBuffer>,
    editor: Entity<Editor>,
+    project: Entity<Project>,
    git_store: Entity<GitStore>,
    workspace: WeakEntity<Workspace>,
    focus_handle: FocusHandle,
    update_needed: postage::watch::Sender<()>,
    pending_scroll: Option<PathKey>,
-    current_branch: Option<Branch>,
+
    _task: Task<Result<()>>,
    _subscription: Subscription,
 }
@@ -71,9 +70,6 @@ impl ProjectDiff {
        let Some(window) = window else { return };
        cx.when_flag_enabled::<feature_flags::GitUiFeatureFlag>(window, |workspace, _, _cx| {
            workspace.register_action(Self::deploy);
-            workspace.register_action(|workspace, _: &Add, window, cx| {
-                Self::deploy(workspace, &Diff, window, cx);
-            });
        });

        workspace::register_serializable_item::<ProjectDiff>(cx);
@@ -183,7 +179,6 @@ impl ProjectDiff {
            multibuffer,
            pending_scroll: None,
            update_needed: send,
-            current_branch: None,
            _task: worker,
            _subscription: git_store_subscription,
        }
@@ -449,20 +444,6 @@ impl ProjectDiff {
        mut cx: AsyncWindowContext,
    ) -> Result<()> {
        while let Some(_) = recv.next().await {
-            this.update(&mut cx, |this, cx| {
-                let new_branch =
-                    this.git_store
-                        .read(cx)
-                        .active_repository()
-                        .and_then(|active_repository| {
-                            active_repository.read(cx).current_branch().cloned()
-                        });
-                if new_branch != this.current_branch {
-                    this.current_branch = new_branch;
-                    cx.notify();
-                }
-            })?;
-
            let buffers_to_load = this.update(&mut 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() {
@@ -661,11 +642,9 @@ impl Item for ProjectDiff {
 }

 impl Render for ProjectDiff {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let is_empty = self.multibuffer.read(cx).is_empty();

-        let can_push_and_pull = crate::can_push_and_pull(&self.project, cx);
-
        div()
            .track_focus(&self.focus_handle)
            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
@@ -675,61 +654,7 @@ impl Render for ProjectDiff {
            .justify_center()
            .size_full()
            .when(is_empty, |el| {
-                el.child(
-                    v_flex()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .justify_around()
-                                .child(Label::new("No uncommitted changes")),
-                        )
-                        .when(can_push_and_pull, |this_div| {
-                            let keybinding_focus_handle = self.focus_handle(cx);
-
-                            this_div.when_some(self.current_branch.as_ref(), |this_div, branch| {
-                                let remote_button = crate::render_remote_button(
-                                    "project-diff-remote-button",
-                                    branch,
-                                    Some(keybinding_focus_handle.clone()),
-                                    false,
-                                );
-
-                                match remote_button {
-                                    Some(button) => {
-                                        this_div.child(h_flex().justify_around().child(button))
-                                    }
-                                    None => this_div.child(
-                                        h_flex()
-                                            .justify_around()
-                                            .child(Label::new("Remote up to date")),
-                                    ),
-                                }
-                            })
-                        })
-                        .map(|this| {
-                            let keybinding_focus_handle = self.focus_handle(cx).clone();
-
-                            this.child(
-                                h_flex().justify_around().mt_1().child(
-                                    Button::new("project-diff-close-button", "Close")
-                                        // .style(ButtonStyle::Transparent)
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &CloseActiveItem::default(),
-                                            &keybinding_focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(move |_, window, cx| {
-                                            window.focus(&keybinding_focus_handle);
-                                            window.dispatch_action(
-                                                Box::new(CloseActiveItem::default()),
-                                                cx,
-                                            );
-                                        }),
-                                ),
-                            )
-                        }),
-                )
+                el.child(Label::new("No uncommitted changes"))
            })
            .when(!is_empty, |el| el.child(self.editor.clone()))
    }
--- a/crates/gpui/src/color.rs
+++ b/crates/gpui/src/color.rs
@@ -634,7 +634,7 @@ impl Display for ColorSpace {
 }

 /// A background color, which can be either a solid color or a linear gradient.
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 #[repr(C)]
 pub struct Background {
    pub(crate) tag: BackgroundTag,
@@ -646,28 +646,6 @@ pub struct Background {
    pad: u32,
 }

-impl std::fmt::Debug for Background {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self.tag {
-            BackgroundTag::Solid => write!(f, "Solid({:?})", self.solid),
-            BackgroundTag::LinearGradient => {
-                write!(
-                    f,
-                    "LinearGradient({}, {:?}, {:?})",
-                    self.gradient_angle_or_pattern_height, self.colors[0], self.colors[1]
-                )
-            }
-            BackgroundTag::PatternSlash => {
-                write!(
-                    f,
-                    "PatternSlash({:?}, {})",
-                    self.solid, self.gradient_angle_or_pattern_height
-                )
-            }
-        }
-    }
-}
-
 impl Eq for Background {}
 impl Default for Background {
    fn default() -> Self {
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -49,7 +49,7 @@ use std::{
    num::NonZeroU32,
    ops::{Deref, DerefMut, Range},
    path::{Path, PathBuf},
-    rc, str,
+    str,
    sync::{Arc, LazyLock},
    time::{Duration, Instant},
    vec,
@@ -125,7 +125,6 @@ pub struct Buffer {
    /// Memoize calls to has_changes_since(saved_version).
    /// The contents of a cell are (self.version, has_changes) at the time of a last call.
    has_unsaved_edits: Cell<(clock::Global, bool)>,
-    change_bits: Vec<rc::Weak<Cell<bool>>>,
    _subscriptions: Vec<gpui::Subscription>,
 }

@@ -979,7 +978,6 @@ impl Buffer {
            completion_triggers_timestamp: Default::default(),
            deferred_ops: OperationQueue::new(),
            has_conflict: false,
-            change_bits: Default::default(),
            _subscriptions: Vec::new(),
        }
    }
@@ -1254,7 +1252,6 @@ impl Buffer {
        self.non_text_state_update_count += 1;
        self.syntax_map.lock().clear(&self.text);
        self.language = language;
-        self.was_changed();
        self.reparse(cx);
        cx.emit(BufferEvent::LanguageChanged);
    }
@@ -1289,7 +1286,6 @@ impl Buffer {
            .set((self.saved_version().clone(), false));
        self.has_conflict = false;
        self.saved_mtime = mtime;
-        self.was_changed();
        cx.emit(BufferEvent::Saved);
        cx.notify();
    }
@@ -1385,7 +1381,6 @@ impl Buffer {

        self.file = Some(new_file);
        if file_changed {
-            self.was_changed();
            self.non_text_state_update_count += 1;
            if was_dirty != self.is_dirty() {
                cx.emit(BufferEvent::DirtyChanged);
@@ -1527,7 +1522,6 @@ impl Buffer {
    }

    fn did_finish_parsing(&mut self, syntax_snapshot: SyntaxSnapshot, cx: &mut Context<Self>) {
-        self.was_changed();
        self.non_text_state_update_count += 1;
        self.syntax_map.lock().did_parse(syntax_snapshot);
        self.request_autoindent(cx);
@@ -1964,28 +1958,6 @@ impl Buffer {
        self.text.subscribe()
    }

-    /// Adds a bit to the list of bits that are set when the buffer's text changes.
-    ///
-    /// This allows downstream code to check if the buffer's text has changed without
-    /// waiting for an effect cycle, which would be required if using eents.
-    pub fn record_changes(&mut self, bit: rc::Weak<Cell<bool>>) {
-        if let Err(ix) = self
-            .change_bits
-            .binary_search_by_key(&rc::Weak::as_ptr(&bit), rc::Weak::as_ptr)
-        {
-            self.change_bits.insert(ix, bit);
-        }
-    }
-
-    fn was_changed(&mut self) {
-        self.change_bits.retain(|change_bit| {
-            change_bit.upgrade().map_or(false, |bit| {
-                bit.replace(true);
-                true
-            })
-        });
-    }
-
    /// Starts a transaction, if one is not already in-progress. When undoing or
    /// redoing edits, all of the edits performed within a transaction are undone
    /// or redone together.
@@ -2279,13 +2251,12 @@ impl Buffer {
    }

    fn did_edit(&mut self, old_version: &clock::Global, was_dirty: bool, cx: &mut Context<Self>) {
-        self.was_changed();
-
        if self.edits_since::<usize>(old_version).next().is_none() {
            return;
        }

        self.reparse(cx);
+
        cx.emit(BufferEvent::Edited);
        if was_dirty != self.is_dirty() {
            cx.emit(BufferEvent::DirtyChanged);
@@ -2531,8 +2502,7 @@ impl Buffer {
        }
    }

-    fn send_operation(&mut self, operation: Operation, is_local: bool, cx: &mut Context<Self>) {
-        self.was_changed();
+    fn send_operation(&self, operation: Operation, is_local: bool, cx: &mut Context<Self>) {
        cx.emit(BufferEvent::Operation {
            operation,
            is_local,
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ b/crates/language_models/src/provider/copilot_chat.rs
@@ -11,8 +11,8 @@ use futures::future::BoxFuture;
 use futures::stream::BoxStream;
 use futures::{FutureExt, StreamExt};
 use gpui::{
-    percentage, svg, Action, Animation, AnimationExt, AnyView, App, AsyncApp, Entity, Render,
-    Subscription, Task, Transformation,
+    percentage, svg, Animation, AnimationExt, AnyView, App, AsyncApp, Entity, Render, Subscription,
+    Task, Transformation,
 };
 use language_model::{
    AuthenticateError, LanguageModel, LanguageModelCompletionEvent, LanguageModelId,
@@ -337,20 +337,9 @@ impl Render for ConfigurationView {
        if self.state.read(cx).is_authenticated(cx) {
            const LABEL: &str = "Authorized.";
            h_flex()
-                .justify_between()
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(Label::new(LABEL)),
-                )
-                .child(
-                    Button::new("sign_out", "Sign Out")
-                        .style(ui::ButtonStyle::Filled)
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(copilot::SignOut.boxed_clone(), cx);
-                        }),
-                )
+                .gap_1()
+                .child(Icon::new(IconName::Check).color(Color::Success))
+                .child(Label::new(LABEL))
        } else {
            let loading_icon = svg()
                .size_8()
--- a/crates/languages/src/cpp/config.toml
+++ b/crates/languages/src/cpp/config.toml
@@ -1,6 +1,6 @@
 name = "C++"
 grammar = "cpp"
-path_suffixes = ["cc", "hh", "cpp", "h", "hpp", "cxx", "hxx", "c++", "ipp", "inl", "ixx", "cu", "cuh", "C", "H"]
+path_suffixes = ["cc", "hh", "cpp", "h", "hpp", "cxx", "hxx", "c++", "ipp", "inl", "cu", "cuh", "C", "H"]
 line_comments = ["// ", "/// ", "//! "]
 autoclose_before = ";:.,=}])>"
 brackets = [
--- a/crates/languages/src/javascript/highlights.scm
+++ b/crates/languages/src/javascript/highlights.scm
@@ -62,8 +62,8 @@

 ; Literals

-(this) @variable.special
-(super) @variable.special
+(this) @keyword
+(super) @keyword

 [
  (null)
--- a/crates/languages/src/tsx/highlights.scm
+++ b/crates/languages/src/tsx/highlights.scm
@@ -62,8 +62,8 @@

 ; Literals

-(this) @variable.special
-(super) @variable.special
+(this) @keyword
+(super) @keyword

 [
  (null)
--- a/crates/languages/src/typescript/highlights.scm
+++ b/crates/languages/src/typescript/highlights.scm
@@ -80,8 +80,8 @@

 ; Literals

-(this) @variable.special
-(super) @variable.special
+(this) @keyword
+(super) @keyword

 [
  (null)
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -31,7 +31,7 @@ use smol::future::yield_now;
 use std::{
    any::type_name,
    borrow::Cow,
-    cell::{Cell, Ref, RefCell},
+    cell::{Ref, RefCell},
    cmp, fmt,
    future::Future,
    io,
@@ -39,7 +39,6 @@ use std::{
    mem,
    ops::{Range, RangeBounds, Sub},
    path::Path,
-    rc::Rc,
    str,
    sync::Arc,
    time::{Duration, Instant},
@@ -77,7 +76,6 @@ pub struct MultiBuffer {
    history: History,
    title: Option<String>,
    capability: Capability,
-    buffer_changed_since_sync: Rc<Cell<bool>>,
 }

 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -570,7 +568,6 @@ impl MultiBuffer {
            capability,
            title: None,
            buffers_by_path: Default::default(),
-            buffer_changed_since_sync: Default::default(),
            history: History {
                next_transaction_id: clock::Lamport::default(),
                undo_stack: Vec::new(),
@@ -590,7 +587,6 @@ impl MultiBuffer {
            subscriptions: Default::default(),
            singleton: false,
            capability,
-            buffer_changed_since_sync: Default::default(),
            history: History {
                next_transaction_id: Default::default(),
                undo_stack: Default::default(),
@@ -604,11 +600,7 @@ impl MultiBuffer {

    pub fn clone(&self, new_cx: &mut Context<Self>) -> Self {
        let mut buffers = HashMap::default();
-        let buffer_changed_since_sync = Rc::new(Cell::new(false));
        for (buffer_id, buffer_state) in self.buffers.borrow().iter() {
-            buffer_state.buffer.update(new_cx, |buffer, _| {
-                buffer.record_changes(Rc::downgrade(&buffer_changed_since_sync));
-            });
            buffers.insert(
                *buffer_id,
                BufferState {
@@ -637,7 +629,6 @@ impl MultiBuffer {
            capability: self.capability,
            history: self.history.clone(),
            title: self.title.clone(),
-            buffer_changed_since_sync,
        }
    }

@@ -1737,25 +1728,19 @@ impl MultiBuffer {

        self.sync(cx);

+        let buffer_id = buffer.read(cx).remote_id();
        let buffer_snapshot = buffer.read(cx).snapshot();
-        let buffer_id = buffer_snapshot.remote_id();

        let mut buffers = self.buffers.borrow_mut();
-        let buffer_state = buffers.entry(buffer_id).or_insert_with(|| {
-            self.buffer_changed_since_sync.replace(true);
-            buffer.update(cx, |buffer, _| {
-                buffer.record_changes(Rc::downgrade(&self.buffer_changed_since_sync));
-            });
-            BufferState {
-                last_version: buffer_snapshot.version().clone(),
-                last_non_text_state_update_count: buffer_snapshot.non_text_state_update_count(),
-                excerpts: Default::default(),
-                _subscriptions: [
-                    cx.observe(&buffer, |_, _, cx| cx.notify()),
-                    cx.subscribe(&buffer, Self::on_buffer_event),
-                ],
-                buffer: buffer.clone(),
-            }
+        let buffer_state = buffers.entry(buffer_id).or_insert_with(|| BufferState {
+            last_version: buffer_snapshot.version().clone(),
+            last_non_text_state_update_count: buffer_snapshot.non_text_state_update_count(),
+            excerpts: Default::default(),
+            _subscriptions: [
+                cx.observe(&buffer, |_, _, cx| cx.notify()),
+                cx.subscribe(&buffer, Self::on_buffer_event),
+            ],
+            buffer: buffer.clone(),
        });

        let mut snapshot = self.snapshot.borrow_mut();
@@ -2251,7 +2236,6 @@ impl MultiBuffer {
        cx: &mut Context<Self>,
    ) {
        self.sync(cx);
-        self.buffer_changed_since_sync.replace(true);

        let diff = diff.read(cx);
        let buffer_id = diff.buffer_id;
@@ -2730,11 +2714,6 @@ impl MultiBuffer {
    }

    fn sync(&self, cx: &App) {
-        let changed = self.buffer_changed_since_sync.replace(false);
-        if !changed {
-            return;
-        }
-
        let mut snapshot = self.snapshot.borrow_mut();
        let mut excerpts_to_edit = Vec::new();
        let mut non_text_state_updated = false;
--- a/crates/project/src/git.rs
+++ b/crates/project/src/git.rs
@@ -1353,7 +1353,7 @@ impl Repository {
        let to_stage = self
            .repository_entry
            .status()
-            .filter(|entry| !entry.status.staging().is_fully_staged())
+            .filter(|entry| !entry.status.is_staged().unwrap_or(false))
            .map(|entry| entry.repo_path.clone())
            .collect();
        self.stage_entries(to_stage, cx)
@@ -1363,7 +1363,7 @@ impl Repository {
        let to_unstage = self
            .repository_entry
            .status()
-            .filter(|entry| entry.status.staging().has_staged())
+            .filter(|entry| entry.status.is_staged().unwrap_or(true))
            .map(|entry| entry.repo_path.clone())
            .collect();
        self.unstage_entries(to_unstage, cx)
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -2,9 +2,9 @@ mod signature_help;

 use crate::{
    lsp_store::{LocalLspStore, LspStore},
-    CodeAction, CompletionSource, CoreCompletion, DocumentHighlight, Hover, HoverBlock,
+    ActionVariant, CodeAction, CoreCompletion, DocumentHighlight, Hover, HoverBlock,
    HoverBlockKind, InlayHint, InlayHintLabel, InlayHintLabelPart, InlayHintLabelPartTooltip,
-    InlayHintTooltip, Location, LocationLink, LspAction, MarkupContent, PrepareRenameResponse,
+    InlayHintTooltip, Location, LocationLink, MarkupContent, PrepareRenameResponse,
    ProjectTransaction, ResolveState,
 };
 use anyhow::{anyhow, Context as _, Result};
@@ -1847,6 +1847,7 @@ impl LspCommand for GetCompletions {
        let mut completions = if let Some(completions) = completions {
            match completions {
                lsp::CompletionResponse::Array(completions) => completions,
+
                lsp::CompletionResponse::List(mut list) => {
                    let items = std::mem::take(&mut list.items);
                    response_list = Some(list);
@@ -1854,19 +1855,74 @@ impl LspCommand for GetCompletions {
                }
            }
        } else {
-            Vec::new()
+            Default::default()
        };

        let language_server_adapter = lsp_store
            .update(&mut cx, |lsp_store, _| {
                lsp_store.language_server_adapter_for_id(server_id)
            })?
-            .with_context(|| format!("no language server with id {server_id}"))?;
+            .ok_or_else(|| anyhow!("no such language server"))?;

-        let lsp_defaults = response_list
+        let item_defaults = response_list
            .as_ref()
-            .and_then(|list| list.item_defaults.clone())
-            .map(Arc::new);
+            .and_then(|list| list.item_defaults.as_ref());
+
+        if let Some(item_defaults) = item_defaults {
+            let default_data = item_defaults.data.as_ref();
+            let default_commit_characters = item_defaults.commit_characters.as_ref();
+            let default_edit_range = item_defaults.edit_range.as_ref();
+            let default_insert_text_format = item_defaults.insert_text_format.as_ref();
+            let default_insert_text_mode = item_defaults.insert_text_mode.as_ref();
+
+            if default_data.is_some()
+                || default_commit_characters.is_some()
+                || default_edit_range.is_some()
+                || default_insert_text_format.is_some()
+                || default_insert_text_mode.is_some()
+            {
+                for item in completions.iter_mut() {
+                    if item.data.is_none() && default_data.is_some() {
+                        item.data = default_data.cloned()
+                    }
+                    if item.commit_characters.is_none() && default_commit_characters.is_some() {
+                        item.commit_characters = default_commit_characters.cloned()
+                    }
+                    if item.text_edit.is_none() {
+                        if let Some(default_edit_range) = default_edit_range {
+                            match default_edit_range {
+                                CompletionListItemDefaultsEditRange::Range(range) => {
+                                    item.text_edit =
+                                        Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                                            range: *range,
+                                            new_text: item.label.clone(),
+                                        }))
+                                }
+                                CompletionListItemDefaultsEditRange::InsertAndReplace {
+                                    insert,
+                                    replace,
+                                } => {
+                                    item.text_edit =
+                                        Some(lsp::CompletionTextEdit::InsertAndReplace(
+                                            lsp::InsertReplaceEdit {
+                                                new_text: item.label.clone(),
+                                                insert: *insert,
+                                                replace: *replace,
+                                            },
+                                        ))
+                                }
+                            }
+                        }
+                    }
+                    if item.insert_text_format.is_none() && default_insert_text_format.is_some() {
+                        item.insert_text_format = default_insert_text_format.cloned()
+                    }
+                    if item.insert_text_mode.is_none() && default_insert_text_mode.is_some() {
+                        item.insert_text_mode = default_insert_text_mode.cloned()
+                    }
+                }
+            }
+        }

        let mut completion_edits = Vec::new();
        buffer.update(&mut cx, |buffer, _cx| {
@@ -1874,34 +1930,12 @@ impl LspCommand for GetCompletions {
            let clipped_position = buffer.clip_point_utf16(Unclipped(self.position), Bias::Left);

            let mut range_for_token = None;
-            completions.retain(|lsp_completion| {
-                let lsp_edit = lsp_completion.text_edit.clone().or_else(|| {
-                    let default_text_edit = lsp_defaults.as_deref()?.edit_range.as_ref()?;
-                    match default_text_edit {
-                        CompletionListItemDefaultsEditRange::Range(range) => {
-                            Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                range: *range,
-                                new_text: lsp_completion.label.clone(),
-                            }))
-                        }
-                        CompletionListItemDefaultsEditRange::InsertAndReplace {
-                            insert,
-                            replace,
-                        } => Some(lsp::CompletionTextEdit::InsertAndReplace(
-                            lsp::InsertReplaceEdit {
-                                new_text: lsp_completion.label.clone(),
-                                insert: *insert,
-                                replace: *replace,
-                            },
-                        )),
-                    }
-                });
-
-                let edit = match lsp_edit {
+            completions.retain_mut(|lsp_completion| {
+                let edit = match lsp_completion.text_edit.as_ref() {
                    // If the language server provides a range to overwrite, then
                    // check that the range is valid.
                    Some(completion_text_edit) => {
-                        match parse_completion_text_edit(&completion_text_edit, &snapshot) {
+                        match parse_completion_text_edit(completion_text_edit, &snapshot) {
                            Some(edit) => edit,
                            None => return false,
                        }
@@ -1915,15 +1949,14 @@ impl LspCommand for GetCompletions {
                            return false;
                        }

-                        let default_edit_range = lsp_defaults.as_ref().and_then(|lsp_defaults| {
-                            lsp_defaults
-                                .edit_range
-                                .as_ref()
-                                .and_then(|range| match range {
-                                    CompletionListItemDefaultsEditRange::Range(r) => Some(r),
-                                    _ => None,
-                                })
-                        });
+                        let default_edit_range = response_list
+                            .as_ref()
+                            .and_then(|list| list.item_defaults.as_ref())
+                            .and_then(|defaults| defaults.edit_range.as_ref())
+                            .and_then(|range| match range {
+                                CompletionListItemDefaultsEditRange::Range(r) => Some(r),
+                                _ => None,
+                            });

                        let range = if let Some(range) = default_edit_range {
                            let range = range_from_lsp(*range);
@@ -1973,27 +2006,14 @@ impl LspCommand for GetCompletions {
        Ok(completions
            .into_iter()
            .zip(completion_edits)
-            .map(|(mut lsp_completion, (old_range, mut new_text))| {
+            .map(|(lsp_completion, (old_range, mut new_text))| {
                LineEnding::normalize(&mut new_text);
-                if lsp_completion.data.is_none() {
-                    if 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);
-                    }
-                }
                CoreCompletion {
                    old_range,
                    new_text,
-                    source: CompletionSource::Lsp {
-                        server_id,
-                        lsp_completion: Box::new(lsp_completion),
-                        lsp_defaults: lsp_defaults.clone(),
-                        resolved: false,
-                    },
+                    server_id,
+                    lsp_completion,
+                    resolved: false,
                }
            })
            .collect())
@@ -2236,11 +2256,11 @@ impl LspCommand for GetCodeActions {
                                return None;
                            }
                        }
-                        LspAction::Action(Box::new(lsp_action))
+                        ActionVariant::Action(Box::new(lsp_action))
                    }
                    lsp::CodeActionOrCommand::Command(command) => {
                        if available_commands.contains(&command.command) {
-                            LspAction::Command(command)
+                            ActionVariant::Command(command)
                        } else {
                            return None;
                        }
--- a/crates/project/src/lsp_store.rs
+++ b/crates/project/src/lsp_store.rs
@@ -14,8 +14,8 @@ use crate::{
    toolchain_store::{EmptyToolchainStore, ToolchainStoreEvent},
    worktree_store::{WorktreeStore, WorktreeStoreEvent},
    yarn::YarnPathStore,
-    CodeAction, Completion, CompletionSource, CoreCompletion, Hover, InlayHint, LspAction,
-    ProjectItem as _, ProjectPath, ProjectTransaction, ResolveState, Symbol, ToolchainStore,
+    ActionVariant, CodeAction, Completion, CoreCompletion, Hover, InlayHint, ProjectItem as _,
+    ProjectPath, ProjectTransaction, ResolveState, Symbol, ToolchainStore,
 };
 use anyhow::{anyhow, Context as _, Result};
 use async_trait::async_trait;
@@ -49,9 +49,10 @@ use lsp::{
    notification::DidRenameFiles, CodeActionKind, CompletionContext, DiagnosticSeverity,
    DiagnosticTag, DidChangeWatchedFilesRegistrationOptions, Edit, FileOperationFilter,
    FileOperationPatternKind, FileOperationRegistrationOptions, FileRename, FileSystemWatcher,
-    LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId,
-    LanguageServerName, LspRequestFuture, MessageActionItem, MessageType, OneOf, RenameFilesParams,
-    SymbolKind, TextEdit, WillRenameFiles, WorkDoneProgressCancelParams, WorkspaceFolder,
+    InsertTextFormat, LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions,
+    LanguageServerId, LanguageServerName, LspRequestFuture, MessageActionItem, MessageType, OneOf,
+    RenameFilesParams, SymbolKind, TextEdit, WillRenameFiles, WorkDoneProgressCancelParams,
+    WorkspaceFolder,
 };
 use node_runtime::read_package_installed_version;
 use parking_lot::Mutex;
@@ -69,7 +70,6 @@ use smol::channel::Sender;
 use snippet::Snippet;
 use std::{
    any::Any,
-    borrow::Cow,
    cell::RefCell,
    cmp::Ordering,
    convert::TryInto,
@@ -1629,7 +1629,7 @@ impl LocalLspStore {
        action: &mut CodeAction,
    ) -> anyhow::Result<()> {
        match &mut action.lsp_action {
-            LspAction::Action(lsp_action) => {
+            ActionVariant::Action(lsp_action) => {
                if GetCodeActions::can_resolve_actions(&lang_server.capabilities())
                    && lsp_action.data.is_some()
                    && (lsp_action.command.is_none() || lsp_action.edit.is_none())
@@ -1641,7 +1641,7 @@ impl LocalLspStore {
                    );
                }
            }
-            LspAction::Command(_) => {}
+            ActionVariant::Command(_) => {}
        }
        anyhow::Ok(())
    }
@@ -4401,33 +4401,26 @@ impl LspStore {
            let mut did_resolve = false;
            if let Some((client, project_id)) = client {
                for completion_index in completion_indices {
-                    let server_id = {
-                        let completion = &completions.borrow()[completion_index];
-                        completion.source.server_id()
-                    };
-                    if let Some(server_id) = server_id {
-                        if Self::resolve_completion_remote(
-                            project_id,
-                            server_id,
-                            buffer_id,
-                            completions.clone(),
-                            completion_index,
-                            client.clone(),
-                        )
-                        .await
-                        .log_err()
-                        .is_some()
-                        {
-                            did_resolve = true;
-                        }
+                    let server_id = completions.borrow()[completion_index].server_id;
+
+                    if Self::resolve_completion_remote(
+                        project_id,
+                        server_id,
+                        buffer_id,
+                        completions.clone(),
+                        completion_index,
+                        client.clone(),
+                    )
+                    .await
+                    .log_err()
+                    .is_some()
+                    {
+                        did_resolve = true;
                    }
                }
            } else {
                for completion_index in completion_indices {
-                    let Some(server_id) = completions.borrow()[completion_index].source.server_id()
-                    else {
-                        continue;
-                    };
+                    let server_id = completions.borrow()[completion_index].server_id;

                    let server_and_adapter = this
                        .read_with(&cx, |lsp_store, _| {
@@ -4475,7 +4468,6 @@ impl LspStore {
        completions: Rc<RefCell<Box<[Completion]>>>,
        completion_index: usize,
    ) -> Result<()> {
-        let server_id = server.server_id();
        let can_resolve = server
            .capabilities()
            .completion_provider
@@ -4488,28 +4480,14 @@ impl LspStore {

        let request = {
            let completion = &completions.borrow()[completion_index];
-            match &completion.source {
-                CompletionSource::Lsp {
-                    lsp_completion,
-                    resolved,
-                    server_id: completion_server_id,
-                    ..
-                } => {
-                    if *resolved {
-                        return Ok(());
-                    }
-                    anyhow::ensure!(
-                        server_id == *completion_server_id,
-                        "server_id mismatch, querying completion resolve for {server_id} but completion server id is {completion_server_id}"
-                    );
-                    server.request::<lsp::request::ResolveCompletionItem>(*lsp_completion.clone())
-                }
-                CompletionSource::Custom => return Ok(()),
+            if completion.resolved {
+                return Ok(());
            }
+            server.request::<lsp::request::ResolveCompletionItem>(completion.lsp_completion.clone())
        };
-        let resolved_completion = request.await?;
+        let completion_item = request.await?;

-        if let Some(text_edit) = resolved_completion.text_edit.as_ref() {
+        if let Some(text_edit) = completion_item.text_edit.as_ref() {
            // Technically we don't have to parse the whole `text_edit`, since the only
            // language server we currently use that does update `text_edit` in `completionItem/resolve`
            // is `typescript-language-server` and they only update `text_edit.new_text`.
@@ -4526,26 +4504,19 @@ impl LspStore {
                completion.old_range = old_range;
            }
        }
+        if completion_item.insert_text_format == Some(InsertTextFormat::SNIPPET) {
+            // vtsls might change the type of completion after resolution.
+            let mut completions = completions.borrow_mut();
+            let completion = &mut completions[completion_index];
+            if completion_item.insert_text_format != completion.lsp_completion.insert_text_format {
+                completion.lsp_completion.insert_text_format = completion_item.insert_text_format;
+            }
+        }

        let mut completions = completions.borrow_mut();
        let completion = &mut completions[completion_index];
-        if let CompletionSource::Lsp {
-            lsp_completion,
-            resolved,
-            server_id: completion_server_id,
-            ..
-        } = &mut completion.source
-        {
-            if *resolved {
-                return Ok(());
-            }
-            anyhow::ensure!(
-                server_id == *completion_server_id,
-                "server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
-            );
-            *lsp_completion = Box::new(resolved_completion);
-            *resolved = true;
-        }
+        completion.lsp_completion = completion_item;
+        completion.resolved = true;
        Ok(())
    }

@@ -4556,13 +4527,9 @@ impl LspStore {
        completion_index: usize,
    ) -> Result<()> {
        let completion_item = completions.borrow()[completion_index]
-            .source
-            .lsp_completion(true)
-            .map(Cow::into_owned);
-        if let Some(lsp_documentation) = completion_item
-            .as_ref()
-            .and_then(|completion_item| completion_item.documentation.clone())
-        {
+            .lsp_completion
+            .clone();
+        if let Some(lsp_documentation) = completion_item.documentation.clone() {
            let mut completions = completions.borrow_mut();
            let completion = &mut completions[completion_index];
            completion.documentation = Some(lsp_documentation.into());
@@ -4572,33 +4539,25 @@ impl LspStore {
            completion.documentation = Some(CompletionDocumentation::Undocumented);
        }

-        let mut new_label = match completion_item {
-            Some(completion_item) => {
-                // NB: Zed does not have `details` inside the completion resolve capabilities, but certain language servers violate the spec and do not return `details` immediately, e.g. https://github.com/yioneko/vtsls/issues/213
-                // So we have to update the label here anyway...
-                let language = snapshot.language();
-                match language {
-                    Some(language) => {
-                        adapter
-                            .labels_for_completions(&[completion_item.clone()], language)
-                            .await?
-                    }
-                    None => Vec::new(),
-                }
-                .pop()
-                .flatten()
-                .unwrap_or_else(|| {
-                    CodeLabel::fallback_for_completion(
-                        &completion_item,
-                        language.map(|language| language.as_ref()),
-                    )
-                })
+        // NB: Zed does not have `details` inside the completion resolve capabilities, but certain language servers violate the spec and do not return `details` immediately, e.g. https://github.com/yioneko/vtsls/issues/213
+        // So we have to update the label here anyway...
+        let language = snapshot.language();
+        let mut new_label = match language {
+            Some(language) => {
+                adapter
+                    .labels_for_completions(&[completion_item.clone()], language)
+                    .await?
            }
-            None => CodeLabel::plain(
-                completions.borrow()[completion_index].new_text.clone(),
-                None,
-            ),
-        };
+            None => Vec::new(),
+        }
+        .pop()
+        .flatten()
+        .unwrap_or_else(|| {
+            CodeLabel::fallback_for_completion(
+                &completion_item,
+                language.map(|language| language.as_ref()),
+            )
+        });
        ensure_uniform_list_compatible_label(&mut new_label);

        let mut completions = completions.borrow_mut();
@@ -4630,24 +4589,12 @@ impl LspStore {
    ) -> Result<()> {
        let lsp_completion = {
            let completion = &completions.borrow()[completion_index];
-            match &completion.source {
-                CompletionSource::Lsp {
-                    lsp_completion,
-                    resolved,
-                    server_id: completion_server_id,
-                    ..
-                } => {
-                    anyhow::ensure!(
-                        server_id == *completion_server_id,
-                        "remote server_id mismatch, querying completion resolve for {server_id} but completion server id is {completion_server_id}"
-                    );
-                    if *resolved {
-                        return Ok(());
-                    }
-                    serde_json::to_string(lsp_completion).unwrap().into_bytes()
-                }
-                CompletionSource::Custom => return Ok(()),
+            if completion.resolved {
+                return Ok(());
            }
+            serde_json::to_string(&completion.lsp_completion)
+                .unwrap()
+                .into_bytes()
        };
        let request = proto::ResolveCompletionDocumentation {
            project_id,
@@ -4660,7 +4607,7 @@ impl LspStore {
            .request(request)
            .await
            .context("completion documentation resolve proto request")?;
-        let resolved_lsp_completion = serde_json::from_slice(&response.lsp_completion)?;
+        let lsp_completion = serde_json::from_slice(&response.lsp_completion)?;

        let documentation = if response.documentation.is_empty() {
            CompletionDocumentation::Undocumented
@@ -4675,23 +4622,8 @@ impl LspStore {
        let mut completions = completions.borrow_mut();
        let completion = &mut completions[completion_index];
        completion.documentation = Some(documentation);
-        if let CompletionSource::Lsp {
-            lsp_completion,
-            resolved,
-            server_id: completion_server_id,
-            lsp_defaults: _,
-        } = &mut completion.source
-        {
-            if *resolved {
-                return Ok(());
-            }
-            anyhow::ensure!(
-                server_id == *completion_server_id,
-                "remote server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
-            );
-            *lsp_completion = Box::new(resolved_lsp_completion);
-            *resolved = true;
-        }
+        completion.lsp_completion = lsp_completion;
+        completion.resolved = true;

        let old_range = response
            .old_start
@@ -4727,12 +4659,17 @@ impl LspStore {
                        completion: Some(Self::serialize_completion(&CoreCompletion {
                            old_range: completion.old_range,
                            new_text: completion.new_text,
-                            source: completion.source,
+                            server_id: completion.server_id,
+                            lsp_completion: completion.lsp_completion,
+                            resolved: completion.resolved,
                        })),
                    }
                };

-                if let Some(transaction) = client.request(request).await?.transaction {
+                let response = client.request(request).await?;
+                completions.borrow_mut()[completion_index].resolved = true;
+
+                if let Some(transaction) = response.transaction {
                    let transaction = language::proto::deserialize_transaction(transaction)?;
                    buffer_handle
                        .update(&mut cx, |buffer, _| {
@@ -4750,9 +4687,8 @@ impl LspStore {
                }
            })
        } else {
+            let server_id = completions.borrow()[completion_index].server_id;
            let Some(server) = buffer_handle.update(cx, |buffer, cx| {
-                let completion = &completions.borrow()[completion_index];
-                let server_id = completion.source.server_id()?;
                Some(
                    self.language_server_for_local_buffer(buffer, server_id, cx)?
                        .1
@@ -4773,11 +4709,7 @@ impl LspStore {
                .await
                .context("resolving completion")?;
                let completion = completions.borrow()[completion_index].clone();
-                let additional_text_edits = completion
-                    .source
-                    .lsp_completion(true)
-                    .as_ref()
-                    .and_then(|lsp_completion| lsp_completion.additional_text_edits.clone());
+                let additional_text_edits = completion.lsp_completion.additional_text_edits;
                if let Some(edits) = additional_text_edits {
                    let edits = this
                        .update(&mut cx, |this, cx| {
@@ -7207,7 +7139,8 @@ impl LspStore {
                Rc::new(RefCell::new(Box::new([Completion {
                    old_range: completion.old_range,
                    new_text: completion.new_text,
-                    source: completion.source,
+                    lsp_completion: completion.lsp_completion,
+                    server_id: completion.server_id,
                    documentation: None,
                    label: CodeLabel {
                        text: Default::default(),
@@ -7215,6 +7148,7 @@ impl LspStore {
                        filter_range: Default::default(),
                    },
                    confirm: None,
+                    resolved: completion.resolved,
                }]))),
                0,
                false,
@@ -8178,39 +8112,13 @@ impl LspStore {
    }

    pub(crate) fn serialize_completion(completion: &CoreCompletion) -> proto::Completion {
-        let (source, server_id, lsp_completion, lsp_defaults, resolved) = match &completion.source {
-            CompletionSource::Lsp {
-                server_id,
-                lsp_completion,
-                lsp_defaults,
-                resolved,
-            } => (
-                proto::completion::Source::Lsp as i32,
-                server_id.0 as u64,
-                serde_json::to_vec(lsp_completion).unwrap(),
-                lsp_defaults
-                    .as_deref()
-                    .map(|lsp_defaults| serde_json::to_vec(lsp_defaults).unwrap()),
-                *resolved,
-            ),
-            CompletionSource::Custom => (
-                proto::completion::Source::Custom as i32,
-                0,
-                Vec::new(),
-                None,
-                true,
-            ),
-        };
-
        proto::Completion {
            old_start: Some(serialize_anchor(&completion.old_range.start)),
            old_end: Some(serialize_anchor(&completion.old_range.end)),
            new_text: completion.new_text.clone(),
-            server_id,
-            lsp_completion,
-            lsp_defaults,
-            resolved,
-            source,
+            server_id: completion.server_id.0 as u64,
+            lsp_completion: serde_json::to_vec(&completion.lsp_completion).unwrap(),
+            resolved: completion.resolved,
        }
    }

@@ -8223,33 +8131,24 @@ impl LspStore {
            .old_end
            .and_then(deserialize_anchor)
            .ok_or_else(|| anyhow!("invalid old end"))?;
+        let lsp_completion = serde_json::from_slice(&completion.lsp_completion)?;
+
        Ok(CoreCompletion {
            old_range: old_start..old_end,
            new_text: completion.new_text,
-            source: match proto::completion::Source::from_i32(completion.source) {
-                Some(proto::completion::Source::Custom) => CompletionSource::Custom,
-                Some(proto::completion::Source::Lsp) => CompletionSource::Lsp {
-                    server_id: LanguageServerId::from_proto(completion.server_id),
-                    lsp_completion: serde_json::from_slice(&completion.lsp_completion)?,
-                    lsp_defaults: completion
-                        .lsp_defaults
-                        .as_deref()
-                        .map(serde_json::from_slice)
-                        .transpose()?,
-                    resolved: completion.resolved,
-                },
-                _ => anyhow::bail!("Unexpected completion source {}", completion.source),
-            },
+            server_id: LanguageServerId(completion.server_id as usize),
+            lsp_completion,
+            resolved: completion.resolved,
        })
    }

    pub(crate) fn serialize_code_action(action: &CodeAction) -> proto::CodeAction {
        let (kind, lsp_action) = match &action.lsp_action {
-            LspAction::Action(code_action) => (
+            ActionVariant::Action(code_action) => (
                proto::code_action::Kind::Action as i32,
                serde_json::to_vec(code_action).unwrap(),
            ),
-            LspAction::Command(command) => (
+            ActionVariant::Command(command) => (
                proto::code_action::Kind::Command as i32,
                serde_json::to_vec(command).unwrap(),
            ),
@@ -8275,10 +8174,10 @@ impl LspStore {
            .ok_or_else(|| anyhow!("invalid end"))?;
        let lsp_action = match proto::code_action::Kind::from_i32(action.kind) {
            Some(proto::code_action::Kind::Action) => {
-                LspAction::Action(serde_json::from_slice(&action.lsp_action)?)
+                ActionVariant::Action(serde_json::from_slice(&action.lsp_action)?)
            }
            Some(proto::code_action::Kind::Command) => {
-                LspAction::Command(serde_json::from_slice(&action.lsp_action)?)
+                ActionVariant::Command(serde_json::from_slice(&action.lsp_action)?)
            }
            None => anyhow::bail!("Unknown action kind {}", action.kind),
        };
@@ -8316,23 +8215,17 @@ fn remove_empty_hover_blocks(mut hover: Hover) -> Option<Hover> {
 }

 async fn populate_labels_for_completions(
-    new_completions: Vec<CoreCompletion>,
+    mut new_completions: Vec<CoreCompletion>,
    language: Option<Arc<Language>>,
    lsp_adapter: Option<Arc<CachedLspAdapter>>,
    completions: &mut Vec<Completion>,
 ) {
    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
-            }
-        })
+        .iter_mut()
+        .map(|completion| mem::take(&mut completion.lsp_completion))
        .collect::<Vec<_>>();

-    let mut labels = if let Some((language, lsp_adapter)) = language.as_ref().zip(lsp_adapter) {
+    let labels = if let Some((language, lsp_adapter)) = language.as_ref().zip(lsp_adapter) {
        lsp_adapter
            .labels_for_completions(&lsp_completions, language)
            .await
@@ -8340,45 +8233,34 @@ async fn populate_labels_for_completions(
            .unwrap_or_default()
    } else {
        Vec::new()
-    }
-    .into_iter()
-    .fuse();
+    };

-    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
-                };
+    for ((completion, lsp_completion), label) in new_completions
+        .into_iter()
+        .zip(lsp_completions)
+        .zip(labels.into_iter().chain(iter::repeat(None)))
+    {
+        let documentation = if let Some(docs) = lsp_completion.documentation.clone() {
+            Some(docs.into())
+        } else {
+            None
+        };

-                let mut label = labels.next().flatten().unwrap_or_else(|| {
-                    CodeLabel::fallback_for_completion(&lsp_completion, language.as_deref())
-                });
-                ensure_uniform_list_compatible_label(&mut label);
-                completions.push(Completion {
-                    label,
-                    documentation,
-                    old_range: completion.old_range,
-                    new_text: completion.new_text,
-                    source: completion.source,
-                    confirm: None,
-                });
-            }
-            None => {
-                let mut label = CodeLabel::plain(completion.new_text.clone(), None);
-                ensure_uniform_list_compatible_label(&mut label);
-                completions.push(Completion {
-                    label,
-                    documentation: None,
-                    old_range: completion.old_range,
-                    new_text: completion.new_text,
-                    source: completion.source,
-                    confirm: None,
-                });
-            }
-        }
+        let mut label = label.unwrap_or_else(|| {
+            CodeLabel::fallback_for_completion(&lsp_completion, language.as_deref())
+        });
+        ensure_uniform_list_compatible_label(&mut label);
+
+        completions.push(Completion {
+            old_range: completion.old_range,
+            new_text: completion.new_text,
+            label,
+            server_id: completion.server_id,
+            documentation,
+            lsp_completion,
+            confirm: None,
+            resolved: false,
+        })
    }
 }

--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -364,10 +364,14 @@ pub struct Completion {
    pub new_text: String,
    /// A label for this completion that is shown in the menu.
    pub label: CodeLabel,
+    /// The id of the language server that produced this completion.
+    pub server_id: LanguageServerId,
    /// The documentation for this completion.
    pub documentation: Option<CompletionDocumentation>,
-    /// Completion data source which it was constructed from.
-    pub source: CompletionSource,
+    /// The raw completion provided by the language server.
+    pub lsp_completion: lsp::CompletionItem,
+    /// Whether this completion has been resolved, to ensure it happens once per completion.
+    pub resolved: bool,
    /// An optional callback to invoke when this completion is confirmed.
    /// Returns, whether new completions should be retriggered after the current one.
    /// If `true` is returned, the editor will show a new completion menu after this completion is confirmed.
@@ -375,114 +379,15 @@ pub struct Completion {
    pub confirm: Option<Arc<dyn Send + Sync + Fn(CompletionIntent, &mut Window, &mut App) -> bool>>,
 }

-#[derive(Debug, Clone)]
-pub enum CompletionSource {
-    Lsp {
-        /// The id of the language server that produced this completion.
-        server_id: LanguageServerId,
-        /// The raw completion provided by the language server.
-        lsp_completion: Box<lsp::CompletionItem>,
-        /// A set of defaults for this completion item.
-        lsp_defaults: Option<Arc<lsp::CompletionListItemDefaults>>,
-        /// Whether this completion has been resolved, to ensure it happens once per completion.
-        resolved: bool,
-    },
-    Custom,
-}
-
-impl CompletionSource {
-    pub fn server_id(&self) -> Option<LanguageServerId> {
-        if let CompletionSource::Lsp { server_id, .. } = self {
-            Some(*server_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn lsp_completion(&self, apply_defaults: bool) -> Option<Cow<lsp::CompletionItem>> {
-        if let Self::Lsp {
-            lsp_completion,
-            lsp_defaults,
-            ..
-        } = 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 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()
-                        {
-                            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 => {}
-                            }
-                        }
-                        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 {
-            None
-        }
-    }
-}
-
 impl std::fmt::Debug for Completion {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        f.debug_struct("Completion")
            .field("old_range", &self.old_range)
            .field("new_text", &self.new_text)
            .field("label", &self.label)
+            .field("server_id", &self.server_id)
            .field("documentation", &self.documentation)
-            .field("source", &self.source)
+            .field("lsp_completion", &self.lsp_completion)
            .finish()
    }
 }
@@ -492,7 +397,9 @@ impl std::fmt::Debug for Completion {
 pub(crate) struct CoreCompletion {
    old_range: Range<Anchor>,
    new_text: String,
-    source: CompletionSource,
+    server_id: LanguageServerId,
+    lsp_completion: lsp::CompletionItem,
+    resolved: bool,
 }

 /// A code action provided by a language server.
@@ -504,12 +411,12 @@ pub struct CodeAction {
    pub range: Range<Anchor>,
    /// The raw code action provided by the language server.
    /// Can be either an action or a command.
-    pub lsp_action: LspAction,
+    pub lsp_action: ActionVariant,
 }

 /// An action sent back by a language server.
 #[derive(Clone, Debug)]
-pub enum LspAction {
+pub enum ActionVariant {
    /// An action with the full data, may have a command or may not.
    /// May require resolving.
    Action(Box<lsp::CodeAction>),
@@ -517,7 +424,7 @@ pub enum LspAction {
    Command(lsp::Command),
 }

-impl LspAction {
+impl ActionVariant {
    pub fn title(&self) -> &str {
        match self {
            Self::Action(action) => &action.title,
@@ -4698,41 +4605,27 @@ impl Completion {
    /// A key that can be used to sort completions when displaying
    /// them to the user.
    pub fn sort_key(&self) -> (usize, &str) {
-        const DEFAULT_KIND_KEY: usize = 2;
-        let kind_key = self
-            .source
-            // `lsp::CompletionListItemDefaults` has no `kind` field
-            .lsp_completion(false)
-            .and_then(|lsp_completion| lsp_completion.kind)
-            .and_then(|lsp_completion_kind| match lsp_completion_kind {
-                lsp::CompletionItemKind::KEYWORD => Some(0),
-                lsp::CompletionItemKind::VARIABLE => Some(1),
-                _ => None,
-            })
-            .unwrap_or(DEFAULT_KIND_KEY);
+        let kind_key = match self.lsp_completion.kind {
+            Some(lsp::CompletionItemKind::KEYWORD) => 0,
+            Some(lsp::CompletionItemKind::VARIABLE) => 1,
+            _ => 2,
+        };
        (kind_key, &self.label.text[self.label.filter_range.clone()])
    }

    /// Whether this completion is a snippet.
    pub fn is_snippet(&self) -> bool {
-        self.source
-            // `lsp::CompletionListItemDefaults` has `insert_text_format` field
-            .lsp_completion(true)
-            .map_or(false, |lsp_completion| {
-                lsp_completion.insert_text_format == Some(lsp::InsertTextFormat::SNIPPET)
-            })
+        self.lsp_completion.insert_text_format == Some(lsp::InsertTextFormat::SNIPPET)
    }

    /// Returns the corresponding color for this completion.
    ///
    /// Will return `None` if this completion's kind is not [`CompletionItemKind::COLOR`].
    pub fn color(&self) -> Option<Hsla> {
-        // `lsp::CompletionListItemDefaults` has no `kind` field
-        let lsp_completion = self.source.lsp_completion(false)?;
-        if lsp_completion.kind? == CompletionItemKind::COLOR {
-            return color_extractor::extract_color(&lsp_completion);
+        match self.lsp_completion.kind {
+            Some(CompletionItemKind::COLOR) => color_extractor::extract_color(&self.lsp_completion),
+            _ => None,
        }
-        None
    }
 }

--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -212,15 +212,10 @@ pub enum GitHunkStyleSetting {
    Transparent,
    /// Show unstaged hunks with a pattern background
    Pattern,
-    /// Show unstaged hunks with a border background
-    Border,
-
    /// Show staged hunks with a pattern background
    StagedPattern,
    /// Show staged hunks with a pattern background
    StagedTransparent,
-    /// Show staged hunks with a pattern background
-    StagedBorder,
 }

 #[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, JsonSchema)]
--- a/crates/proto/proto/zed.proto
+++ b/crates/proto/proto/zed.proto
@@ -1,6 +1,6 @@
+
 syntax = "proto3";
 package zed.messages;
-import "google/protobuf/wrappers.proto";

 // Looking for a number? Search "// current max"

@@ -999,13 +999,6 @@ message Completion {
    uint64 server_id = 4;
    bytes lsp_completion = 5;
    bool resolved = 6;
-    Source source = 7;
-    optional bytes lsp_defaults = 8;
-
-    enum Source {
-        Custom = 0;
-        Lsp = 1;
-    }
 }

 message GetCodeActions {
--- a/crates/assistant_scripting/Cargo.toml
+++ b/crates/assistant_scripting/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "assistant_scripting"
+name = "scripting_tool"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -9,27 +9,29 @@ license = "GPL-3.0-or-later"
 workspace = true

 [lib]
-path = "src/assistant_scripting.rs"
+path = "src/scripting_tool.rs"
 doctest = false

 [dependencies]
 anyhow.workspace = true
+assistant_tool.workspace = true
 collections.workspace = true
 futures.workspace = true
 gpui.workspace = true
-log.workspace = true
 mlua.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 regex.workspace = true
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 util.workspace = true
+workspace.workspace = true

 [dev-dependencies]
 collections = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
 settings = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_scripting/LICENSE-GPL
+++ b/crates/assistant_scripting/LICENSE-GPL
--- a/crates/assistant_scripting/src/sandbox_preamble.lua
+++ b/crates/assistant_scripting/src/sandbox_preamble.lua
@@ -13,10 +13,7 @@ sandbox.tostring = tostring
 sandbox.tonumber = tonumber
 sandbox.pairs = pairs
 sandbox.ipairs = ipairs
-
-- Access to custom functions
 sandbox.search = search
-sandbox.outline = outline

 -- Create a sandboxed version of LuaFileIO
 local io = {}
--- a/crates/scripting_tool/src/scripting_tool.rs
+++ b/crates/scripting_tool/src/scripting_tool.rs
@@ -0,0 +1,63 @@
+mod session;
+
+pub(crate) use session::*;
+
+use assistant_tool::{Tool, ToolRegistry};
+use gpui::{App, AppContext as _, Task, WeakEntity, Window};
+use schemars::JsonSchema;
+use serde::Deserialize;
+use std::sync::Arc;
+use workspace::Workspace;
+
+pub fn init(cx: &App) {
+    let registry = ToolRegistry::global(cx);
+    registry.register_tool(ScriptingTool);
+}
+
+#[derive(Debug, Deserialize, JsonSchema)]
+struct ScriptingToolInput {
+    lua_script: String,
+}
+
+struct ScriptingTool;
+
+impl Tool for ScriptingTool {
+    fn name(&self) -> String {
+        "lua-interpreter".into()
+    }
+
+    fn description(&self) -> String {
+        include_str!("scripting_tool_description.txt").into()
+    }
+
+    fn input_schema(&self) -> serde_json::Value {
+        let schema = schemars::schema_for!(ScriptingToolInput);
+        serde_json::to_value(&schema).unwrap()
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        workspace: WeakEntity<Workspace>,
+        _window: &mut Window,
+        cx: &mut App,
+    ) -> Task<anyhow::Result<String>> {
+        let input = match serde_json::from_value::<ScriptingToolInput>(input) {
+            Err(err) => return Task::ready(Err(err.into())),
+            Ok(input) => input,
+        };
+        let Ok(project) = workspace.read_with(cx, |workspace, _cx| workspace.project().clone())
+        else {
+            return Task::ready(Err(anyhow::anyhow!("No project found")));
+        };
+
+        let session = cx.new(|cx| Session::new(project, cx));
+        let lua_script = input.lua_script;
+        let script = session.update(cx, |session, cx| session.run_script(lua_script, cx));
+        cx.spawn(|_cx| async move {
+            let output = script.await?.stdout;
+            drop(session);
+            Ok(format!("The script output the following:\n{output}"))
+        })
+    }
+}
--- a/crates/scripting_tool/src/scripting_tool_description.txt
+++ b/crates/scripting_tool/src/scripting_tool_description.txt
@@ -3,12 +3,6 @@ output was, including both stdout as well as the git diff of changes it made to
 the filesystem. That way, you can get more information about the code base, or
 make changes to the code base directly.

-Put the Lua script inside of an `<eval>` tag like so:
-
-<eval type="lua">
-print("Hello, world!")
-</eval>
-
 The Lua script will have access to `io` and it will run with the current working
 directory being in the root of the code base, so you can use it to explore,
 search, make changes, etc. You can also have the script print things, and I'll
@@ -16,21 +10,13 @@ tell you what the output was. Note that `io` only has `open`, and then the file
 it returns only has the methods read, write, and close - it doesn't have popen
 or anything else.

-There is a function called `search` which accepts a regex (it's implemented
+Also, I'm going to be putting this Lua script into JSON, so please don't use
+Lua's double quote syntax for string literals - use one of Lua's other syntaxes
+for string literals, so I don't have to escape the double quotes.
+
+There will be a global called `search` which accepts a regex (it's implemented
 using Rust's regex crate, so use that regex syntax) and runs that regex on the
 contents of every file in the code base (aside from gitignored files), then
 returns an array of tables with two fields: "path" (the path to the file that
 had the matches) and "matches" (an array of strings, with each string being a
 match that was found within the file).
-
-There is a function called `outline` which accepts the path to a source file,
-and returns a string where each line is a declaration. These lines are indented
-with 2 spaces to indicate when a declaration is inside another.
-
-When I send you the script output, do not thank me for running it,
-act as if you ran it yourself.
-
-IMPORTANT!
-Only include a maximum of one Lua script at the very end of your message
-DO NOT WRITE ANYTHING ELSE AFTER THE SCRIPT. Wait for my response with the script
-output to continue.
--- a/crates/assistant_scripting/src/session.rs
+++ b/crates/assistant_scripting/src/session.rs
@@ -1,11 +1,11 @@
-use anyhow::anyhow;
+use anyhow::Result;
 use collections::{HashMap, HashSet};
 use futures::{
    channel::{mpsc, oneshot},
    pin_mut, SinkExt, StreamExt,
 };
-use gpui::{AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
-use mlua::{ExternalResult, Lua, MultiValue, Table, UserData, UserDataMethods};
+use gpui::{AppContext, AsyncApp, Context, Entity, Task, WeakEntity};
+use mlua::{Lua, MultiValue, Table, UserData, UserDataMethods};
 use parking_lot::Mutex;
 use project::{search::SearchQuery, Fs, Project};
 use regex::Regex;
@@ -16,23 +16,24 @@ use std::{
 };
 use util::{paths::PathMatcher, ResultExt};

-use crate::{SCRIPT_END_TAG, SCRIPT_START_TAG};
+pub struct ScriptOutput {
+    pub stdout: String,
+}

-struct ForegroundFn(Box<dyn FnOnce(WeakEntity<ScriptSession>, AsyncApp) + Send>);
+struct ForegroundFn(Box<dyn FnOnce(WeakEntity<Session>, AsyncApp) + Send>);

-pub struct ScriptSession {
+pub struct Session {
    project: Entity<Project>,
    // TODO Remove this
    fs_changes: Arc<Mutex<HashMap<PathBuf, Vec<u8>>>>,
    foreground_fns_tx: mpsc::Sender<ForegroundFn>,
    _invoke_foreground_fns: Task<()>,
-    scripts: Vec<Script>,
 }

-impl ScriptSession {
+impl Session {
    pub fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
        let (foreground_fns_tx, mut foreground_fns_rx) = mpsc::channel(128);
-        ScriptSession {
+        Session {
            project,
            fs_changes: Arc::new(Mutex::new(HashMap::default())),
            foreground_fns_tx,
@@ -41,62 +42,15 @@ impl ScriptSession {
                    foreground_fn.0(this.clone(), cx.clone());
                }
            }),
-            scripts: Vec::new(),
        }
    }

-    pub fn new_script(&mut self) -> ScriptId {
-        let id = ScriptId(self.scripts.len() as u32);
-        let script = Script {
-            id,
-            state: ScriptState::Generating,
-            source: SharedString::new_static(""),
-        };
-        self.scripts.push(script);
-        id
-    }
-
+    /// Runs a Lua script in a sandboxed environment and returns the printed lines
    pub fn run_script(
-        &mut self,
-        script_id: ScriptId,
-        script_src: String,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let script = self.get_mut(script_id);
-
-        let stdout = Arc::new(Mutex::new(String::new()));
-        script.source = script_src.clone().into();
-        script.state = ScriptState::Running {
-            stdout: stdout.clone(),
-        };
-
-        let task = self.run_lua(script_src, stdout, cx);
-
-        cx.emit(ScriptEvent::Spawned(script_id));
-
-        cx.spawn(|session, mut cx| async move {
-            let result = task.await;
-
-            session.update(&mut cx, |session, cx| {
-                let script = session.get_mut(script_id);
-                let stdout = script.stdout_snapshot();
-
-                script.state = match result {
-                    Ok(()) => ScriptState::Succeeded { stdout },
-                    Err(error) => ScriptState::Failed { stdout, error },
-                };
-
-                cx.emit(ScriptEvent::Exited(script_id))
-            })
-        })
-    }
-
-    fn run_lua(
        &mut self,
        script: String,
-        stdout: Arc<Mutex<String>>,
        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
+    ) -> Task<Result<ScriptOutput>> {
        const SANDBOX_PREAMBLE: &str = include_str!("sandbox_preamble.lua");

        // TODO Remove fs_changes
@@ -108,84 +62,52 @@ impl ScriptSession {
            .visible_worktrees(cx)
            .next()
            .map(|worktree| worktree.read(cx).abs_path());
-
        let fs = self.project.read(cx).fs().clone();
        let foreground_fns_tx = self.foreground_fns_tx.clone();
+        cx.background_spawn(async move {
+            let lua = Lua::new();
+            lua.set_memory_limit(2 * 1024 * 1024 * 1024)?; // 2 GB
+            let globals = lua.globals();
+            let stdout = Arc::new(Mutex::new(String::new()));
+            globals.set(
+                "sb_print",
+                lua.create_function({
+                    let stdout = stdout.clone();
+                    move |_, args: MultiValue| Self::print(args, &stdout)
+                })?,
+            )?;
+            globals.set(
+                "search",
+                lua.create_async_function({
+                    let foreground_fns_tx = foreground_fns_tx.clone();
+                    let fs = fs.clone();
+                    move |lua, regex| {
+                        Self::search(lua, foreground_fns_tx.clone(), fs.clone(), regex)
+                    }
+                })?,
+            )?;
+            globals.set(
+                "sb_io_open",
+                lua.create_function({
+                    let fs_changes = fs_changes.clone();
+                    let root_dir = root_dir.clone();
+                    move |lua, (path_str, mode)| {
+                        Self::io_open(&lua, &fs_changes, root_dir.as_ref(), path_str, mode)
+                    }
+                })?,
+            )?;
+            globals.set("user_script", script)?;

-        let task = cx.background_spawn({
-            let stdout = stdout.clone();
+            lua.load(SANDBOX_PREAMBLE).exec_async().await?;

-            async move {
-                let lua = Lua::new();
-                lua.set_memory_limit(2 * 1024 * 1024 * 1024)?; // 2 GB
-                let globals = lua.globals();
-                globals.set(
-                    "sb_print",
-                    lua.create_function({
-                        let stdout = stdout.clone();
-                        move |_, args: MultiValue| Self::print(args, &stdout)
-                    })?,
-                )?;
-                globals.set(
-                    "search",
-                    lua.create_async_function({
-                        let foreground_fns_tx = foreground_fns_tx.clone();
-                        move |lua, regex| {
-                            let mut foreground_fns_tx = foreground_fns_tx.clone();
-                            let fs = fs.clone();
-                            async move {
-                                Self::search(&lua, &mut foreground_fns_tx, fs, regex)
-                                    .await
-                                    .into_lua_err()
-                            }
-                        }
-                    })?,
-                )?;
-                globals.set(
-                    "outline",
-                    lua.create_async_function({
-                        let root_dir = root_dir.clone();
-                        move |_lua, path| {
-                            let mut foreground_fns_tx = foreground_fns_tx.clone();
-                            let root_dir = root_dir.clone();
-                            async move {
-                                Self::outline(root_dir, &mut foreground_fns_tx, path)
-                                    .await
-                                    .into_lua_err()
-                            }
-                        }
-                    })?,
-                )?;
-                globals.set(
-                    "sb_io_open",
-                    lua.create_function({
-                        let fs_changes = fs_changes.clone();
-                        let root_dir = root_dir.clone();
-                        move |lua, (path_str, mode)| {
-                            Self::io_open(&lua, &fs_changes, root_dir.as_ref(), path_str, mode)
-                        }
-                    })?,
-                )?;
-                globals.set("user_script", script)?;
+            // Drop Lua instance to decrement reference count.
+            drop(lua);

-                lua.load(SANDBOX_PREAMBLE).exec_async().await?;
-
-                // Drop Lua instance to decrement reference count.
-                drop(lua);
-
-                anyhow::Ok(())
-            }
-        });
-
-        task
-    }
-
-    pub fn get(&self, script_id: ScriptId) -> &Script {
-        &self.scripts[script_id.0 as usize]
-    }
-
-    fn get_mut(&mut self, script_id: ScriptId) -> &mut Script {
-        &mut self.scripts[script_id.0 as usize]
+            let stdout = Arc::try_unwrap(stdout)
+                .expect("no more references to stdout")
+                .into_inner();
+            Ok(ScriptOutput { stdout })
+        })
    }

    /// Sandboxed print() function in Lua.
@@ -232,9 +154,27 @@ impl ScriptSession {
        file.set("__read_perm", read_perm)?;
        file.set("__write_perm", write_perm)?;

-        let path = match Self::parse_abs_path_in_root_dir(&root_dir, &path_str) {
-            Ok(path) => path,
-            Err(err) => return Ok((None, format!("{err}"))),
+        // Sandbox the path; it must be within root_dir
+        let path: PathBuf = {
+            let rust_path = Path::new(&path_str);
+
+            // Get absolute path
+            if rust_path.is_absolute() {
+                // Check if path starts with root_dir prefix without resolving symlinks
+                if !rust_path.starts_with(&root_dir) {
+                    return Ok((
+                        None,
+                        format!(
+                            "Error: Absolute path {} is outside the current working directory",
+                            path_str
+                        ),
+                    ));
+                }
+                rust_path.to_path_buf()
+            } else {
+                // Make relative path absolute relative to cwd
+                root_dir.join(rust_path)
+            }
        };

        // close method
@@ -570,11 +510,11 @@ impl ScriptSession {
    }

    async fn search(
-        lua: &Lua,
-        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
+        lua: Lua,
+        mut foreground_tx: mpsc::Sender<ForegroundFn>,
        fs: Arc<dyn Fs>,
        regex: String,
-    ) -> anyhow::Result<Table> {
+    ) -> mlua::Result<Table> {
        // TODO: Allow specification of these options.
        let search_query = SearchQuery::regex(
            &regex,
@@ -587,17 +527,18 @@ impl ScriptSession {
        );
        let search_query = match search_query {
            Ok(query) => query,
-            Err(e) => return Err(anyhow!("Invalid search query: {}", e)),
+            Err(e) => return Err(mlua::Error::runtime(format!("Invalid search query: {}", e))),
        };

        // TODO: Should use `search_query.regex`. The tool description should also be updated,
        // as it specifies standard regex.
        let search_regex = match Regex::new(&regex) {
            Ok(re) => re,
-            Err(e) => return Err(anyhow!("Invalid regex: {}", e)),
+            Err(e) => return Err(mlua::Error::runtime(format!("Invalid regex: {}", e))),
        };

-        let mut abs_paths_rx = Self::find_search_candidates(search_query, foreground_tx).await?;
+        let mut abs_paths_rx =
+            Self::find_search_candidates(search_query, &mut foreground_tx).await?;

        let mut search_results: Vec<Table> = Vec::new();
        while let Some(path) = abs_paths_rx.next().await {
@@ -645,7 +586,7 @@ impl ScriptSession {
    async fn find_search_candidates(
        search_query: SearchQuery,
        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
-    ) -> anyhow::Result<mpsc::UnboundedReceiver<PathBuf>> {
+    ) -> mlua::Result<mpsc::UnboundedReceiver<PathBuf>> {
        Self::run_foreground_fn(
            "finding search file candidates",
            foreground_tx,
@@ -695,62 +636,14 @@ impl ScriptSession {
                })
            }),
        )
-        .await?
-    }
-
-    async fn outline(
-        root_dir: Option<Arc<Path>>,
-        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
-        path_str: String,
-    ) -> anyhow::Result<String> {
-        let root_dir = root_dir
-            .ok_or_else(|| mlua::Error::runtime("cannot get outline without a root directory"))?;
-        let path = Self::parse_abs_path_in_root_dir(&root_dir, &path_str)?;
-        let outline = Self::run_foreground_fn(
-            "getting code outline",
-            foreground_tx,
-            Box::new(move |session, cx| {
-                cx.spawn(move |mut cx| async move {
-                    // TODO: This will not use file content from `fs_changes`. It will also reflect
-                    // user changes that have not been saved.
-                    let buffer = session
-                        .update(&mut cx, |session, cx| {
-                            session
-                                .project
-                                .update(cx, |project, cx| project.open_local_buffer(&path, cx))
-                        })?
-                        .await?;
-                    buffer.update(&mut cx, |buffer, _cx| {
-                        if let Some(outline) = buffer.snapshot().outline(None) {
-                            Ok(outline)
-                        } else {
-                            Err(anyhow!("No outline for file {path_str}"))
-                        }
-                    })
-                })
-            }),
-        )
-        .await?
-        .await??;
-
-        Ok(outline
-            .items
-            .into_iter()
-            .map(|item| {
-                if item.text.contains('\n') {
-                    log::error!("Outline item unexpectedly contains newline");
-                }
-                format!("{}{}", "  ".repeat(item.depth), item.text)
-            })
-            .collect::<Vec<String>>()
-            .join("\n"))
+        .await
    }

    async fn run_foreground_fn<R: Send + 'static>(
        description: &str,
        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
-        function: Box<dyn FnOnce(WeakEntity<Self>, AsyncApp) -> R + Send>,
-    ) -> anyhow::Result<R> {
+        function: Box<dyn FnOnce(WeakEntity<Self>, AsyncApp) -> anyhow::Result<R> + Send>,
+    ) -> mlua::Result<R> {
        let (response_tx, response_rx) = oneshot::channel();
        let send_result = foreground_tx
            .send(ForegroundFn(Box::new(move |this, cx| {
@@ -760,34 +653,19 @@ impl ScriptSession {
        match send_result {
            Ok(()) => (),
            Err(err) => {
-                return Err(anyhow::Error::new(err).context(format!(
-                    "Internal error while enqueuing work for {description}"
-                )));
+                return Err(mlua::Error::runtime(format!(
+                    "Internal error while enqueuing work for {description}: {err}"
+                )))
            }
        }
        match response_rx.await {
-            Ok(result) => Ok(result),
-            Err(oneshot::Canceled) => Err(anyhow!(
+            Ok(Ok(result)) => Ok(result),
+            Ok(Err(err)) => Err(mlua::Error::runtime(format!(
+                "Error while {description}: {err}"
+            ))),
+            Err(oneshot::Canceled) => Err(mlua::Error::runtime(format!(
                "Internal error: response oneshot was canceled while {description}."
-            )),
-        }
-    }
-
-    fn parse_abs_path_in_root_dir(root_dir: &Path, path_str: &str) -> anyhow::Result<PathBuf> {
-        let path = Path::new(&path_str);
-        if path.is_absolute() {
-            // Check if path starts with root_dir prefix without resolving symlinks
-            if path.starts_with(&root_dir) {
-                Ok(path.to_path_buf())
-            } else {
-                Err(anyhow!(
-                    "Error: Absolute path {} is outside the current working directory",
-                    path_str
-                ))
-            }
-        } else {
-            // TODO: Does use of `../` break sandbox - is path canonicalization needed?
-            Ok(root_dir.join(path))
+            ))),
        }
    }
 }
@@ -800,79 +678,6 @@ impl UserData for FileContent {
    }
 }

-#[derive(Debug)]
-pub enum ScriptEvent {
-    Spawned(ScriptId),
-    Exited(ScriptId),
-}
-
-impl EventEmitter<ScriptEvent> for ScriptSession {}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub struct ScriptId(u32);
-
-pub struct Script {
-    pub id: ScriptId,
-    pub state: ScriptState,
-    pub source: SharedString,
-}
-
-pub enum ScriptState {
-    Generating,
-    Running {
-        stdout: Arc<Mutex<String>>,
-    },
-    Succeeded {
-        stdout: String,
-    },
-    Failed {
-        stdout: String,
-        error: anyhow::Error,
-    },
-}
-
-impl Script {
-    pub fn source_tag(&self) -> String {
-        format!("{}{}{}", SCRIPT_START_TAG, self.source, SCRIPT_END_TAG)
-    }
-
-    /// If exited, returns a message with the output for the LLM
-    pub fn output_message_for_llm(&self) -> Option<String> {
-        match &self.state {
-            ScriptState::Generating { .. } => None,
-            ScriptState::Running { .. } => None,
-            ScriptState::Succeeded { stdout } => {
-                format!("Here's the script output:\n{}", stdout).into()
-            }
-            ScriptState::Failed { stdout, error } => format!(
-                "The script failed with:\n{}\n\nHere's the output it managed to print:\n{}",
-                error, stdout
-            )
-            .into(),
-        }
-    }
-
-    /// Get a snapshot of the script's stdout
-    pub fn stdout_snapshot(&self) -> String {
-        match &self.state {
-            ScriptState::Generating { .. } => String::new(),
-            ScriptState::Running { stdout } => stdout.lock().clone(),
-            ScriptState::Succeeded { stdout } => stdout.clone(),
-            ScriptState::Failed { stdout, .. } => stdout.clone(),
-        }
-    }
-
-    /// Returns the error if the script failed, otherwise None
-    pub fn error(&self) -> Option<&anyhow::Error> {
-        match &self.state {
-            ScriptState::Generating { .. } => None,
-            ScriptState::Running { .. } => None,
-            ScriptState::Succeeded { .. } => None,
-            ScriptState::Failed { error, .. } => Some(error),
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use gpui::TestAppContext;
@@ -884,33 +689,23 @@ mod tests {

    #[gpui::test]
    async fn test_print(cx: &mut TestAppContext) {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        let project = Project::test(fs, [], cx).await;
+        let session = cx.new(|cx| Session::new(project, cx));
        let script = r#"
            print("Hello", "world!")
            print("Goodbye", "moon!")
        "#;
-
-        let output = test_script(script, cx).await.unwrap();
-        assert_eq!(output, "Hello\tworld!\nGoodbye\tmoon!\n");
+        let output = session
+            .update(cx, |session, cx| session.run_script(script.to_string(), cx))
+            .await
+            .unwrap();
+        assert_eq!(output.stdout, "Hello\tworld!\nGoodbye\tmoon!\n");
    }

    #[gpui::test]
    async fn test_search(cx: &mut TestAppContext) {
-        let script = r#"
-            local results = search("world")
-            for i, result in ipairs(results) do
-                print("File: " .. result.path)
-                print("Matches:")
-                for j, match in ipairs(result.matches) do
-                    print("  " .. match)
-                end
-            end
-        "#;
-
-        let output = test_script(script, cx).await.unwrap();
-        assert_eq!(output, "File: /file1.txt\nMatches:\n  world\n");
-    }
-
-    async fn test_script(source: &str, cx: &mut TestAppContext) -> anyhow::Result<String> {
        init_test(cx);
        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
@@ -921,20 +716,23 @@ mod tests {
            }),
        )
        .await;
-
        let project = Project::test(fs, [Path::new("/")], cx).await;
-        let session = cx.new(|cx| ScriptSession::new(project, cx));
-
-        let (script_id, task) = session.update(cx, |session, cx| {
-            let script_id = session.new_script();
-            let task = session.run_script(script_id, source.to_string(), cx);
-
-            (script_id, task)
-        });
-
-        task.await?;
-
-        Ok(session.read_with(cx, |session, _cx| session.get(script_id).stdout_snapshot()))
+        let session = cx.new(|cx| Session::new(project, cx));
+        let script = r#"
+            local results = search("world")
+            for i, result in ipairs(results) do
+                print("File: " .. result.path)
+                print("Matches:")
+                for j, match in ipairs(result.matches) do
+                    print("  " .. match)
+                end
+            end
+        "#;
+        let output = session
+            .update(cx, |session, cx| session.run_script(script.to_string(), cx))
+            .await
+            .unwrap();
+        assert_eq!(output.stdout, "File: /file1.txt\nMatches:\n  world\n");
    }

    fn init_test(cx: &mut TestAppContext) {
--- a/crates/settings/src/settings_file.rs
+++ b/crates/settings/src/settings_file.rs
@@ -1,6 +1,5 @@
 use crate::{settings_store::SettingsStore, Settings};
-use collections::HashSet;
-use fs::{Fs, PathEventKind};
+use fs::Fs;
 use futures::{channel::mpsc, StreamExt};
 use gpui::{App, BackgroundExecutor, ReadGlobal};
 use std::{path::PathBuf, sync::Arc, time::Duration};
@@ -79,55 +78,6 @@ pub fn watch_config_file(
    rx
 }

-pub fn watch_config_dir(
-    executor: &BackgroundExecutor,
-    fs: Arc<dyn Fs>,
-    dir_path: PathBuf,
-    config_paths: HashSet<PathBuf>,
-) -> mpsc::UnboundedReceiver<String> {
-    let (tx, rx) = mpsc::unbounded();
-    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;
-                        }
-                    }
-                }
-            }
-
-            let (events, _) = fs.watch(&dir_path, Duration::from_millis(100)).await;
-            futures::pin_mut!(events);
-
-            while let Some(event_batch) = events.next().await {
-                for event in event_batch {
-                    if config_paths.contains(&event.path) {
-                        match event.kind {
-                            Some(PathEventKind::Removed) => {
-                                if tx.unbounded_send(String::new()).is_err() {
-                                    return;
-                                }
-                            }
-                            Some(PathEventKind::Created) | Some(PathEventKind::Changed) => {
-                                if let Ok(contents) = fs.load(&event.path).await {
-                                    if tx.unbounded_send(contents).is_err() {
-                                        return;
-                                    }
-                                }
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-
-    rx
-}
-
 pub fn update_settings_file<T: Settings>(
    fs: Arc<dyn Fs>,
    cx: &App,
--- a/crates/terminal_view/scripts/print256color.sh
+++ b/crates/terminal_view/scripts/print256color.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 # Tom Hale, 2016. MIT Licence.
 # Print out 256 colours, with each number printed in its corresponding colour
--- a/crates/terminal_view/scripts/truecolor.sh
+++ b/crates/terminal_view/scripts/truecolor.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Copied from: https://unix.stackexchange.com/a/696756
 # Based on: https://gist.github.com/XVilka/8346728 and https://unix.stackexchange.com/a/404415/395213

--- a/crates/theme/src/icon_theme.rs
+++ b/crates/theme/src/icon_theme.rs
@@ -85,7 +85,7 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
    ("coffeescript", &["coffee"]),
    (
        "cpp",
-        &["c++", "cc", "cpp", "cxx", "hh", "hpp", "hxx", "inl", "ixx"],
+        &["c++", "cc", "cpp", "cxx", "hh", "hpp", "hxx", "inl"],
    ),
    ("crystal", &["cr", "ecr"]),
    ("csharp", &["cs"]),
@@ -264,7 +264,6 @@ const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
    ("vs_sln", &["sln"]),
    ("vs_suo", &["suo"]),
    ("vue", &["vue"]),
-    ("wgsl", &["wgsl"]),
    ("zig", &["zig"]),
 ];

@@ -312,7 +311,7 @@ const FILE_ICONS: &[(&str, &str)] = &[
    ("lock", "icons/file_icons/lock.svg"),
    ("log", "icons/file_icons/info.svg"),
    ("lua", "icons/file_icons/lua.svg"),
-    ("luau", "icons/file_icons/luau.svg"),
+    ("luau", "icons/file_icons/file.svg"),
    ("markdown", "icons/file_icons/book.svg"),
    ("metal", "icons/file_icons/metal.svg"),
    ("nim", "icons/file_icons/nim.svg"),
@@ -349,7 +348,6 @@ const FILE_ICONS: &[(&str, &str)] = &[
    ("vs_sln", "icons/file_icons/file.svg"),
    ("vs_suo", "icons/file_icons/file.svg"),
    ("vue", "icons/file_icons/vue.svg"),
-    ("wgsl", "icons/file_icons/wgsl.svg"),
    ("zig", "icons/file_icons/zig.svg"),
 ];

--- a/crates/ui/src/components/context_menu.rs
+++ b/crates/ui/src/components/context_menu.rs
@@ -362,6 +362,7 @@ impl ContextMenu {
        if !self.keep_open_on_confirm {
            cx.emit(DismissEvent);
        }
+        cx.propagate();
    }

    pub fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -2424,10 +2424,14 @@ impl Pane {
                    .child(label),
            );

-        let single_entry_to_resolve = self.items[ix]
-            .is_singleton(cx)
-            .then(|| self.items[ix].project_entry_ids(cx).get(0).copied())
-            .flatten();
+        let single_entry_to_resolve = {
+            let item_entries = self.items[ix].project_entry_ids(cx);
+            if item_entries.len() == 1 {
+                Some(item_entries[0])
+            } else {
+                None
+            }
+        };

        let total_items = self.items.len();
        let has_items_to_left = ix > 0;
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -3960,6 +3960,10 @@ pub struct StatusEntry {
 }

 impl StatusEntry {
+    pub fn is_staged(&self) -> Option<bool> {
+        self.status.is_staged()
+    }
+
    fn to_proto(&self) -> proto::StatusEntry {
        let simple_status = match self.status {
            FileStatus::Ignored | FileStatus::Untracked => proto::GitStatus::Added as i32,
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -98,6 +98,7 @@ remote.workspace = true
 repl.workspace = true
 reqwest_client.workspace = true
 rope.workspace = true
+scripting_tool.workspace = true
 search.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/zed/resources/info/DocumentTypes.plist
+++ b/crates/zed/resources/info/DocumentTypes.plist
@@ -9,9 +9,8 @@
        <string>Alternate</string>
        <key>LSItemContentTypes</key>
        <array>
-            <string>public.folder</string>
-            <string>public.plain-text</string>
            <string>public.text</string>
+            <string>public.plain-text</string>
            <string>public.utf8-plain-text</string>
        </array>
    </dict>
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -476,6 +476,7 @@ fn main() {
            cx,
        );
        assistant_tools::init(cx);
+        scripting_tool::init(cx);
        repl::init(app_state.fs.clone(), cx);
        extension_host::init(
            extension_host_proxy,
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ b/crates/zed/src/zed/quick_action_bar.rs
@@ -96,7 +96,6 @@ impl Render for QuickActionBar {
        let git_blame_inline_enabled = editor_value.git_blame_inline_enabled();
        let show_git_blame_gutter = editor_value.show_git_blame_gutter();
        let auto_signature_help_enabled = editor_value.auto_signature_help_enabled(cx);
-        let show_line_numbers = editor_value.line_numbers_enabled(cx);
        let has_edit_prediction_provider = editor_value.edit_prediction_provider().is_some();
        let show_edit_predictions = editor_value.edit_predictions_enabled();
        let edit_predictions_enabled_at_cursor =
@@ -262,58 +261,6 @@ impl Render for QuickActionBar {
                                );
                            }

-                            if has_edit_prediction_provider {
-                                let mut inline_completion_entry = ContextMenuEntry::new("Edit Predictions")
-                                    .toggleable(IconPosition::Start, edit_predictions_enabled_at_cursor && show_edit_predictions)
-                                    .disabled(!edit_predictions_enabled_at_cursor)
-                                    .action(
-                                        editor::actions::ToggleEditPrediction.boxed_clone(),
-                                    ).handler({
-                                        let editor = editor.clone();
-                                        move |window, cx| {
-                                            editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_edit_predictions(
-                                                        &editor::actions::ToggleEditPrediction,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    });
-                                if !edit_predictions_enabled_at_cursor {
-                                    inline_completion_entry = inline_completion_entry.documentation_aside(|_| {
-                                        Label::new("You can't toggle edit predictions for this file as it is within the excluded files list.").into_any_element()
-                                    });
-                                }
-
-                                menu = menu.item(inline_completion_entry);
-                            }
-
-                            menu = menu.separator();
-
-                            menu = menu.toggleable_entry(
-                                "Line Numbers",
-                                show_line_numbers,
-                                IconPosition::Start,
-                                Some(editor::actions::ToggleLineNumbers.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_line_numbers(
-                                                    &editor::actions::ToggleLineNumbers,
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
                            menu = menu.toggleable_entry(
                                "Selection Menu",
                                selection_menu_enabled,
@@ -356,6 +303,35 @@ impl Render for QuickActionBar {
                                },
                            );

+                            if has_edit_prediction_provider {
+                                let mut inline_completion_entry = ContextMenuEntry::new("Edit Predictions")
+                                    .toggleable(IconPosition::Start, edit_predictions_enabled_at_cursor && show_edit_predictions)
+                                    .disabled(!edit_predictions_enabled_at_cursor)
+                                    .action(
+                                        editor::actions::ToggleEditPrediction.boxed_clone(),
+                                    ).handler({
+                                        let editor = editor.clone();
+                                        move |window, cx| {
+                                            editor
+                                                .update(cx, |editor, cx| {
+                                                    editor.toggle_edit_predictions(
+                                                        &editor::actions::ToggleEditPrediction,
+                                                        window,
+                                                        cx,
+                                                    );
+                                                })
+                                                .ok();
+                                        }
+                                    });
+                                if !edit_predictions_enabled_at_cursor {
+                                    inline_completion_entry = inline_completion_entry.documentation_aside(|_| {
+                                        Label::new("You can't toggle edit predictions for this file as it is within the excluded files list.").into_any_element()
+                                    });
+                                }
+
+                                menu = menu.item(inline_completion_entry);
+                            }
+
                            menu = menu.separator();

                            menu = menu.toggleable_entry(
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -114,9 +114,8 @@ pub mod workspace {
 }

 pub mod git {
-    use gpui::{action_with_deprecated_aliases, actions};
+    use gpui::action_with_deprecated_aliases;

-    actions!(git, [CheckoutBranch, Switch]);
    action_with_deprecated_aliases!(git, Branch, ["branches::OpenRecent"]);
 }

--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,14 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in
-  fetchTarball {
-    url =
-      lock.nodes.flake-compat.locked.url
-        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ./.; }).defaultNix
+(
+  import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+      fetchTarball {
+        url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
+      }
+  )
+  {src = ./.;}
+)
+.defaultNix
--- a/docs/src/key-bindings.md
+++ b/docs/src/key-bindings.md
@@ -8,7 +8,6 @@ If you're used to a specific editor's defaults you can set a `base_keymap` in yo

 - VSCode (default)
 - Atom
- Emacs (Beta)
 - JetBrains
 - SublimeText
 - TextMate
@@ -53,7 +52,7 @@ If you want to debug problems with custom keymaps you can use `debug: Open Key C

 Zed has the ability to match against not just a single keypress, but a sequence of keys typed in order. Each key in the `"bindings"` map is a sequence of keypresses separated with a space.

-Each keypress is a sequence of modifiers followed by a key. The modifiers are:
+Each key press is a sequence of modifiers followed by a key. The modifiers are:

 - `ctrl-` The control key
 - `cmd-`, `win-` or `super-` for the platform modifier (Command on macOS, Windows key on Windows, and the Super key on Linux).
@@ -78,7 +77,7 @@ The `shift-` modifier can only be used in combination with a letter to indicate

 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`.

-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 key press.

 ### Contexts

@@ -139,13 +138,13 @@ As of Zed 0.162.0, Zed has some support for non-QWERTY keyboards on macOS. Bette

 There are roughly three categories of keyboard to consider:

-Keyboards that support full ASCII (QWERTY, DVORAK, COLEMAK, etc.). On these keyboards bindings are resolved based on the character that would be generated by the key. So to type `cmd-[`, find the key labeled `[` and press it with command.
+Keyboards that support full ASCII (QWERTY, DVORAK, COLEMAK, etc.). On these keyboards bindings are resolved based on the character that would be generated by the key. So to type `cmd-[`, find the key labelled `[` and press it with command.

 Keyboards that are mostly non-ASCII, but support full ASCII when the command key is pressed. For example Cyrillic keyboards, Armenian, Hebrew, etc. On these keyboards bindings are resolved based on the character that would be generated by typing the key with command pressed. So to type `ctrl-a`, find the key that generates `cmd-a`. For these keyboards, keyboard shortcuts are displayed in the app using their ASCII equivalents. If the ASCII-equivalents are not printed on your keyboard, you can use the macOS keyboard viewer and holding down the `cmd` key to find things (though often the ASCII equivalents are in a QWERTY layout).

 Finally keyboards that support extended Latin alphabets (usually ISO keyboards) require the most support. For example French AZERTY, German QWERTZ, etc. On these keyboards it is often not possible to type the entire ASCII range without option. To ensure that shortcuts _can_ be typed without option, keyboard shortcuts are mapped to "key equivalents" in the same way as [macOS](). This mapping is defined per layout, and is a compromise between leaving keyboard shortcuts triggered by the same character they are defined with, keeping shortcuts in the same place as a QWERTY layout, and moving shortcuts out of the way of system shortcuts.

-For example on a German QWERTZ keyboard, the `cmd->` shortcut is moved to `cmd-:` because `cmd->` is the system window switcher and this is where that shortcut is typed on a QWERTY keyboard. `cmd-+` stays the same because + is still typeable without option, and as a result, `cmd-[` and `cmd-]` become `cmd-ö` and `cmd-ä`, moving out of the way of the `+` key.
+For example on a German QWERTZ keyboard, the `cmd->` shortcut is moved to `cmd-:` because `cmd->` is the system window switcher and this is where that shortcut is typed on a QWERTY keyboard. `cmd-+` stays the same because + is still typable without option, and as a result, `cmd-[` and `cmd-]` become `cmd-ö` and `cmd-ä`, moving out of the way of the `+` key.

 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:

@@ -209,7 +208,7 @@ There are some limitations to this, notably:

 The argument to `SendKeystrokes` is a space-separated list of keystrokes (using the same syntax as above). Due to the way that keystrokes are parsed, any segment that is not recognized as a keypress will be sent verbatim to the currently focused input field.

-If the argument to `SendKeystrokes` contains the binding used to trigger it, it will use the next-highest-precedence definition of that binding. This allows you to extend the default behavior of a key binding.
+If the argument to `SendKeystrokes` contains the binding used to trigger it, it will use the next-highest-precedence definition of that binding. This allows you to extend the default behaviour of a key binding.

 ### Forward keys to terminal

--- a/docs/src/languages/haskell.md
+++ b/docs/src/languages/haskell.md
@@ -1,6 +1,6 @@
 # Haskell

-Haskell support is available through the [Haskell extension](https://github.com/zed-extensions/haskell).
+Haskell support is available through the [Haskell extension](https://github.com/zed-industries/zed/tree/main/extensions/haskell).

 - Tree-sitter: [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell)
 - Language Server: [haskell-language-server](https://github.com/haskell/haskell-language-server)
--- a/extensions/haskell/Cargo.toml
+++ b/extensions/haskell/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "zed_haskell"
+version = "0.1.3"
+edition.workspace = true
+publish.workspace = true
+license = "Apache-2.0"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/haskell.rs"
+crate-type = ["cdylib"]
+
+[dependencies]
+zed_extension_api = "0.1.0"
--- a/extensions/haskell/LICENSE-APACHE
+++ b/extensions/haskell/LICENSE-APACHE
@@ -0,0 +1 @@
+../../LICENSE-APACHE
--- a/extensions/haskell/extension.toml
+++ b/extensions/haskell/extension.toml
@@ -0,0 +1,18 @@
+id = "haskell"
+name = "Haskell"
+description = "Haskell support."
+version = "0.1.3"
+schema_version = 1
+authors = [
+    "Pocæus <github@pocaeus.com>",
+    "Lei <45155667+leifu1128@users.noreply.github.com>"
+]
+repository = "https://github.com/zed-industries/zed"
+
+[language_servers.hls]
+name = "Haskell Language Server"
+language = "Haskell"
+
+[grammars.haskell]
+repository = "https://github.com/tree-sitter/tree-sitter-haskell"
+commit = "8a99848fc734f9c4ea523b3f2a07df133cbbcec2"
--- a/extensions/haskell/languages/haskell/brackets.scm
+++ b/extensions/haskell/languages/haskell/brackets.scm
@@ -0,0 +1,3 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("{" @open "}" @close)
--- a/extensions/haskell/languages/haskell/config.toml
+++ b/extensions/haskell/languages/haskell/config.toml
@@ -0,0 +1,14 @@
+name = "Haskell"
+grammar = "haskell"
+path_suffixes = ["hs"]
+autoclose_before = ",=)}]"
+line_comments = ["-- "]
+block_comment = ["{- ", " -}"]
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false },
+    { start = "'", end = "'", close = true, newline = false },
+    { start = "`", end = "`", close = true, newline = false },
+]
--- a/extensions/haskell/languages/haskell/highlights.scm
+++ b/extensions/haskell/languages/haskell/highlights.scm
@@ -0,0 +1,156 @@
+;; Copyright 2022 nvim-treesitter
+;;
+;; 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.
+
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+(integer) @number
+(exp_negation) @number
+(exp_literal (float)) @float
+(char) @string
+(string) @string
+
+(con_unit) @symbol  ; unit, as in ()
+
+(comment) @comment
+
+
+;; ----------------------------------------------------------------------------
+;; Punctuation
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  (comma)
+  ";"
+] @punctuation.delimiter
+
+
+;; ----------------------------------------------------------------------------
+;; Keywords, operators, includes
+
+[
+  "forall"
+  "∀"
+] @keyword
+
+(pragma) @constant
+
+[
+  "if"
+  "then"
+  "else"
+  "case"
+  "of"
+] @keyword
+
+(exp_lambda_cases "\\" ("cases" @variant))
+
+[
+  "import"
+  "qualified"
+  "module"
+] @keyword
+
+[
+  (operator)
+  (constructor_operator)
+  (type_operator)
+  (tycon_arrow)
+  (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
+  (all_names)
+  (wildcard)
+  "="
+  "|"
+  "::"
+  "=>"
+  "->"
+  "<-"
+  "\\"
+  "`"
+  "@"
+] @operator
+
+(module) @title
+
+[
+  (where)
+  "let"
+  "in"
+  "class"
+  "instance"
+  "data"
+  "newtype"
+  "family"
+  "type"
+  "as"
+  "hiding"
+  "deriving"
+  "via"
+  "stock"
+  "anyclass"
+  "do"
+  "mdo"
+  "rec"
+  "infix"
+  "infixl"
+  "infixr"
+] @keyword
+
+
+;; ----------------------------------------------------------------------------
+;; Functions and variables
+
+(variable) @variable
+(pat_wildcard) @variable
+
+(signature name: (variable) @type)
+(function
+  name: (variable) @function
+  patterns: (patterns))
+((signature (fun)) . (function (variable) @function))
+((signature (context (fun))) . (function (variable) @function))
+((signature (forall (context (fun)))) . (function (variable) @function))
+
+(exp_infix (variable) @operator)  ; consider infix functions as operators
+
+(exp_infix (exp_name) @function (#set! "priority" 101))
+(exp_apply . (exp_name (variable) @function))
+(exp_apply . (exp_name (qualified_variable (variable) @function)))
+
+
+;; ----------------------------------------------------------------------------
+;; Types
+
+(type) @type
+(type_variable) @type
+
+(constructor) @constructor
+
+; True or False
+((constructor) @_bool (#match? @_bool "(True|False)")) @boolean
+
+
+;; ----------------------------------------------------------------------------
+;; Quasi-quotes
+
+(quoter) @function
+; Highlighting of quasiquote_body is handled by injections.scm
--- a/extensions/haskell/languages/haskell/indents.scm
+++ b/extensions/haskell/languages/haskell/indents.scm
@@ -0,0 +1,3 @@
+(_ "[" "]" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
--- a/extensions/haskell/languages/haskell/outline.scm
+++ b/extensions/haskell/languages/haskell/outline.scm
@@ -0,0 +1,26 @@
+(adt
+  "data" @context
+  name: (type) @name) @item
+
+(type_alias
+  "type" @context
+  name: (type) @name) @item
+
+(newtype
+  "newtype" @context
+  name: (type) @name) @item
+
+(signature
+  name: (variable) @name) @item
+
+(class
+  "class" @context
+  (class_head) @name) @item
+
+(instance
+  "instance" @context
+  (instance_head) @name) @item
+
+(foreign_import
+  "foreign" @context
+  (impent) @name) @item
--- a/extensions/haskell/languages/haskell/textobjects.scm
+++ b/extensions/haskell/languages/haskell/textobjects.scm
@@ -0,0 +1,12 @@
+(comment)+ @comment.around
+
+[
+  (adt)
+  (type_alias)
+  (newtype)
+] @class.around
+
+(record_fields "{" (_)* @class.inside "}")
+
+((signature)? (function)+) @function.around
+(function rhs:(_) @function.inside)
--- a/extensions/haskell/src/haskell.rs
+++ b/extensions/haskell/src/haskell.rs
@@ -0,0 +1,67 @@
+use zed::lsp::{Symbol, SymbolKind};
+use zed::{CodeLabel, CodeLabelSpan};
+use zed_extension_api::{self as zed, Result};
+
+struct HaskellExtension;
+
+impl zed::Extension for HaskellExtension {
+    fn new() -> Self {
+        Self
+    }
+
+    fn language_server_command(
+        &mut self,
+        _language_server_id: &zed::LanguageServerId,
+        worktree: &zed::Worktree,
+    ) -> Result<zed::Command> {
+        let path = worktree
+            .which("haskell-language-server-wrapper")
+            .ok_or_else(|| "hls must be installed via ghcup".to_string())?;
+
+        Ok(zed::Command {
+            command: path,
+            args: vec!["lsp".to_string()],
+            env: worktree.shell_env(),
+        })
+    }
+
+    fn label_for_symbol(
+        &self,
+        _language_server_id: &zed::LanguageServerId,
+        symbol: Symbol,
+    ) -> Option<CodeLabel> {
+        let name = &symbol.name;
+
+        let (code, display_range, filter_range) = match symbol.kind {
+            SymbolKind::Struct => {
+                let data_decl = "data ";
+                let code = format!("{data_decl}{name} = A");
+                let display_range = 0..data_decl.len() + name.len();
+                let filter_range = data_decl.len()..display_range.end;
+                (code, display_range, filter_range)
+            }
+            SymbolKind::Constructor => {
+                let data_decl = "data A = ";
+                let code = format!("{data_decl}{name}");
+                let display_range = data_decl.len()..data_decl.len() + name.len();
+                let filter_range = 0..name.len();
+                (code, display_range, filter_range)
+            }
+            SymbolKind::Variable => {
+                let code = format!("{name} :: T");
+                let display_range = 0..name.len();
+                let filter_range = 0..name.len();
+                (code, display_range, filter_range)
+            }
+            _ => return None,
+        };
+
+        Some(CodeLabel {
+            spans: vec![CodeLabelSpan::code_range(display_range)],
+            filter_range: filter_range.into(),
+            code,
+        })
+    }
+}
+
+zed::register_extension!(HaskellExtension);
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "crane": {
      "locked": {
-        "lastModified": 1741481578,
-        "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
+        "lastModified": 1739936662,
+        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
+        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
        "type": "github"
      },
      "original": {
@@ -32,11 +32,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741379970,
-        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
+        "lastModified": 1740695751,
+        "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
+        "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
        "type": "github"
      },
      "original": {
@@ -61,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741573199,
-        "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
+        "lastModified": 1740882709,
+        "narHash": "sha256-VC+8GxWK4p08jjIbmsNfeFQajW2lsiOR/XQiOOvqgvs=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
+        "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -50,11 +50,12 @@
    in
    {
      packages = forAllSystems (pkgs: {
+        zed-editor = pkgs.zed-editor;
        default = pkgs.zed-editor;
      });

      devShells = forAllSystems (pkgs: {
-        default = pkgs.callPackage ./nix/shell.nix { };
+        default = import ./nix/shell.nix { inherit pkgs; };
      });

      formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
--- a/nix/build.nix
+++ b/nix/build.nix
@@ -2,12 +2,11 @@
  lib,
  crane,
  rustToolchain,
-  rustPlatform,
+  fetchpatch,
+  clang,
  cmake,
  copyDesktopItems,
-  fetchFromGitHub,
  curl,
-  clang,
  perl,
  pkg-config,
  protobuf,
@@ -30,12 +29,11 @@
  cargo-about,
  cargo-bundle,
  git,
-  livekit-libwebrtc,
  apple-sdk_15,
-  darwin,
  darwinMinVersionHook,
  makeWrapper,
  nodejs_22,
+  nix-gitignore,

  withGLES ? false,
 }:
@@ -43,205 +41,176 @@
 assert withGLES -> stdenv.hostPlatform.isLinux;

 let
-  mkIncludeFilter =
-    root': path: type:
+  includeFilter =
+    path: type:
    let
-      # note: under lazy-trees this introduces an extra copy
-      root = toString root' + "/";
-      relPath = lib.removePrefix root path;
-      topLevelIncludes = [
-        "crates"
-        "assets"
-        "extensions"
-        "script"
-        "tooling"
-        "Cargo.toml"
-        ".config" # nextest?
-      ];
-      firstComp = builtins.head (lib.path.subpath.components relPath);
+      baseName = baseNameOf (toString path);
+      parentDir = dirOf path;
+      inRootDir = type == "directory" && parentDir == ../.;
    in
-    builtins.elem firstComp topLevelIncludes;
-
+    !(
+      inRootDir
+      && (baseName == "docs" || baseName == ".github" || baseName == ".git" || baseName == "target")
+    );
  craneLib = crane.overrideToolchain rustToolchain;
-  gpu-lib = if withGLES then libglvnd else vulkan-loader;
-  commonArgs =
-    let
-      zedCargoLock = builtins.fromTOML (builtins.readFile ../crates/zed/Cargo.toml);
-    in
-    rec {
-      pname = "zed-editor";
-      version = zedCargoLock.package.version + "-nightly";
-      src = builtins.path {
-        path = ../.;
-        filter = mkIncludeFilter ../.;
-        name = "source";
-      };
+  commonSrc = lib.cleanSourceWith {
+    src = nix-gitignore.gitignoreSource [ ] ../.;
+    filter = includeFilter;
+    name = "source";
+  };
+  commonArgs = rec {
+    pname = "zed-editor";
+    version = "nightly";

-      cargoLock = ../Cargo.lock;
+    src = commonSrc;

-      nativeBuildInputs =
-        [
-          clang # TODO: use pkgs.clangStdenv or ignore cargo config?
-          cmake
-          copyDesktopItems
-          curl
-          perl
-          pkg-config
-          protobuf
-          cargo-about
-          rustPlatform.bindgenHook
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          # TODO: move to overlay so it's usable in the shell
-          (cargo-bundle.overrideAttrs (old: {
-            version = "0.6.0-zed";
-            src = fetchFromGitHub {
-              owner = "zed-industries";
-              repo = "cargo-bundle";
-              rev = "zed-deploy";
-              hash = "sha256-OxYdTSiR9ueCvtt7Y2OJkvzwxxnxu453cMS+l/Bi5hM=";
-            };
-          }))
+    nativeBuildInputs =
+      [
+        clang
+        cmake
+        copyDesktopItems
+        curl
+        perl
+        pkg-config
+        protobuf
+        cargo-about
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
+
+    buildInputs =
+      [
+        curl
+        fontconfig
+        freetype
+        libgit2
+        openssl
+        sqlite
+        zlib
+        zstd
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [
+        alsa-lib
+        libxkbcommon
+        wayland
+        xorg.libxcb
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        apple-sdk_15
+        (darwinMinVersionHook "10.15")
+      ];
+
+    env = {
+      ZSTD_SYS_USE_PKG_CONFIG = true;
+      FONTCONFIG_FILE = makeFontsConf {
+        fontDirectories = [
+          "${src}/assets/fonts/plex-mono"
+          "${src}/assets/fonts/plex-sans"
        ];
-
-      buildInputs =
-        [
-          curl
-          fontconfig
-          freetype
-          # TODO: need staticlib of this for linking the musl remote server.
-          # should make it a separate derivation/flake output
-          # see https://crane.dev/examples/cross-musl.html
-          libgit2
-          openssl
-          sqlite
-          zlib
-          zstd
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isLinux [
-          alsa-lib
-          libxkbcommon
-          wayland
-          gpu-lib
-          xorg.libxcb
-        ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [
-          apple-sdk_15
-          darwin.apple_sdk.frameworks.System
-          (darwinMinVersionHook "10.15")
-        ];
-
-      cargoExtraArgs = "--package=zed --package=cli --features=gpui/runtime_shaders";
-
-      env = {
-        ZSTD_SYS_USE_PKG_CONFIG = true;
-        FONTCONFIG_FILE = makeFontsConf {
-          fontDirectories = [
-            ../assets/fonts/plex-mono
-            ../assets/fonts/plex-sans
-          ];
-        };
-        ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
-        RELEASE_VERSION = version;
-        RUSTFLAGS = if withGLES then "--cfg gles" else "";
-        # TODO: why are these not handled by the linker given that they're in buildInputs?
-        NIX_LDFLAGS = "-rpath ${
-          lib.makeLibraryPath [
-            gpu-lib
-            wayland
-          ]
-        }";
-        LK_CUSTOM_WEBRTC = livekit-libwebrtc;
-      };
-
-      cargoVendorDir = craneLib.vendorCargoDeps {
-        inherit src cargoLock;
-        overrideVendorGitCheckout =
-          let
-            hasWebRtcSys = builtins.any (crate: crate.name == "webrtc-sys");
-            # `webrtc-sys` expects a staticlib; nixpkgs' `livekit-webrtc` has been patched to
-            # produce a `dylib`... patching `webrtc-sys`'s build script is the easier option
-            # TODO: send livekit sdk a PR to make this configurable
-            postPatch = ''
-              substituteInPlace webrtc-sys/build.rs --replace-fail \
-                "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
-            '';
-          in
-          crates: drv:
-          if hasWebRtcSys crates then
-            drv.overrideAttrs (o: {
-              postPatch = (o.postPatch or "") + postPatch;
-            })
-          else
-            drv;
      };
+      ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
+      RELEASE_VERSION = version;
    };
-  cargoArtifacts = craneLib.buildDepsOnly (
-    commonArgs
-    // {
-      # TODO: figure out why the main derivation is still rebuilding deps...
-      # disable pre-building the deps for now
-      buildPhaseCargoCommand = "true";
-
-      # forcibly inhibit `doInstallCargoArtifacts`...
-      # https://github.com/ipetkov/crane/blob/1d19e2ec7a29dcc25845eec5f1527aaf275ec23e/lib/setupHooks/installCargoArtifactsHook.sh#L111
-      #
-      # it is, unfortunately, not overridable in `buildDepsOnly`:
-      # https://github.com/ipetkov/crane/blob/1d19e2ec7a29dcc25845eec5f1527aaf275ec23e/lib/buildDepsOnly.nix#L85
-      preBuild = "postInstallHooks=()";
-      doCheck = false;
-    }
-  );
+  };
+  cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 in
 craneLib.buildPackage (
-  lib.recursiveUpdate commonArgs {
+  commonArgs
+  // rec {
    inherit cargoArtifacts;

-    patches = lib.optionals stdenv.hostPlatform.isDarwin [
-      # Livekit requires Swift 6
-      # We need this until livekit-rust sdk is used
-      ../script/patches/use-cross-platform-livekit.patch
-    ];
+    patches =
+      [
+        # Zed uses cargo-install to install cargo-about during the script execution.
+        # We provide cargo-about ourselves and can skip this step.
+        # Until https://github.com/zed-industries/zed/issues/19971 is fixed,
+        # we also skip any crate for which the license cannot be determined.
+        (fetchpatch {
+          url = "https://raw.githubusercontent.com/NixOS/nixpkgs/1fd02d90c6c097f91349df35da62d36c19359ba7/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch";
+          hash = "sha256-cLgqLDXW1JtQ2OQFLd5UolAjfy7bMoTw40lEx2jA2pk=";
+        })
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Livekit requires Swift 6
+        # We need this until livekit-rust sdk is used
+        (fetchpatch {
+          url = "https://raw.githubusercontent.com/NixOS/nixpkgs/1fd02d90c6c097f91349df35da62d36c19359ba7/pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch";
+          hash = "sha256-whZ7RaXv8hrVzWAveU3qiBnZSrvGNEHTuyNhxgMIo5w=";
+        })
+      ];
+
+    cargoExtraArgs = "--package=zed --package=cli --features=gpui/runtime_shaders";

    dontUseCmakeConfigure = true;
-
-    # without the env var generate-licenses fails due to crane's fetchCargoVendor, see:
-    # https://github.com/zed-industries/zed/issues/19971#issuecomment-2688455390
    preBuild = ''
-      ALLOW_MISSING_LICENSES=yes bash script/generate-licenses
-      echo nightly > crates/zed/RELEASE_CHANNEL
+      bash script/generate-licenses
    '';

-    # TODO: try craneLib.cargoNextest separate output
-    # for now we're not worried about running our test suite in the nix sandbox
-    doCheck = false;
+    postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+      patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
+      patchelf --add-rpath ${wayland}/lib $out/libexec/*
+      wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs_22 ]}
+    '';
+
+    RUSTFLAGS = if withGLES then "--cfg gles" else "";
+    gpu-lib = if withGLES then libglvnd else vulkan-loader;
+
+    preCheck = ''
+      export HOME=$(mktemp -d);
+    '';
+
+    cargoTestExtraArgs =
+      "-- "
+      + lib.concatStringsSep " " (
+        [
+          # Flaky: unreliably fails on certain hosts (including Hydra)
+          "--skip=zed::tests::test_window_edit_state_restoring_enabled"
+        ]
+        ++ lib.optionals stdenv.hostPlatform.isLinux [
+          # Fails on certain hosts (including Hydra) for unclear reason
+          "--skip=test_open_paths_action"
+        ]
+      );

    installPhase =
      if stdenv.hostPlatform.isDarwin then
        ''
          runHook preInstall

+          # cargo-bundle expects the binary in target/release
+          mv target/release/zed target/release/zed
+
          pushd crates/zed
-          sed -i "s/package.metadata.bundle-nightly/package.metadata.bundle/" Cargo.toml
+
+          # Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
+          sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
          export CARGO_BUNDLE_SKIP_BUILD=true
-          app_path="$(cargo bundle --release | xargs)"
+          app_path=$(cargo bundle --release | xargs)
+
+          # We're not using the fork of cargo-bundle, so we must manually append plist extensions
+          # Remove closing tags from Info.plist (last two lines)
+          head -n -2 $app_path/Contents/Info.plist > Info.plist
+          # Append extensions
+          cat resources/info/*.plist >> Info.plist
+          # Add closing tags
+          printf "</dict>\n</plist>\n" >> Info.plist
+          mv Info.plist $app_path/Contents/Info.plist
+
          popd

          mkdir -p $out/Applications $out/bin
          # Zed expects git next to its own binary
-          ln -s ${git}/bin/git "$app_path/Contents/MacOS/git"
-          mv target/release/cli "$app_path/Contents/MacOS/cli"
-          mv "$app_path" $out/Applications/
+          ln -s ${git}/bin/git $app_path/Contents/MacOS/git
+          mv target/release/cli $app_path/Contents/MacOS/cli
+          mv $app_path $out/Applications/

          # Physical location of the CLI must be inside the app bundle as this is used
          # to determine which app to start
-          ln -s "$out/Applications/Zed Nightly.app/Contents/MacOS/cli" $out/bin/zed
+          ln -s $out/Applications/Zed.app/Contents/MacOS/cli $out/bin/zed

          runHook postInstall
        ''
      else
-        # TODO: icons should probably be named "zed-nightly". fix bundle-linux first
        ''
          runHook preInstall

@@ -249,31 +218,24 @@ craneLib.buildPackage (
          cp target/release/zed $out/libexec/zed-editor
          cp target/release/cli $out/bin/zed

-          install -D "crates/zed/resources/app-icon-nightly@2x.png" \
-            "$out/share/icons/hicolor/1024x1024@2x/apps/zed.png"
-          install -D crates/zed/resources/app-icon-nightly.png \
-            $out/share/icons/hicolor/512x512/apps/zed.png
+          install -D ${commonSrc}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
+          install -D ${commonSrc}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png

-          # extracted from ../script/bundle-linux (envsubst) and
-          # ../script/install.sh (final desktop file name)
+          # extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
+          # and https://github.com/zed-industries/zed/blob/v0.141.2/script/install.sh (final desktop file name)
          (
            export DO_STARTUP_NOTIFY="true"
            export APP_CLI="zed"
            export APP_ICON="zed"
-            export APP_NAME="Zed Nightly"
+            export APP_NAME="Zed"
            export APP_ARGS="%U"
            mkdir -p "$out/share/applications"
-            ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed-Nightly.desktop"
+            ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed.desktop"
          )

          runHook postInstall
        '';

-    # TODO: why isn't this also done on macOS?
-    postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs_22 ]}
-    '';
-
    meta = {
      description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
      homepage = "https://zed.dev";
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,62 +1,65 @@
 {
-  lib,
-  mkShell,
-  stdenv,
-  stdenvAdapters,
-  makeFontsConf,
-
-  zed-editor,
-
-  rust-analyzer,
-  cargo-nextest,
-  nixfmt-rfc-style,
-  protobuf,
-  nodejs_22,
+  pkgs ? import <nixpkgs> { },
 }:
 let
-  moldStdenv = stdenvAdapters.useMoldLinker stdenv;
-  mkShell' =
-    if stdenv.hostPlatform.isLinux then mkShell.override { stdenv = moldStdenv; } else mkShell;
+  inherit (pkgs) lib;
 in
-mkShell' {
-  inputsFrom = [ zed-editor ];
-  packages = [
-    rust-analyzer
-    cargo-nextest
-    nixfmt-rfc-style
-    # TODO: package protobuf-language-server for editing zed.proto
-    # TODO: add other tools used in our scripts
+pkgs.mkShell rec {
+  packages =
+    [
+      pkgs.clang
+      pkgs.curl
+      pkgs.cmake
+      pkgs.perl
+      pkgs.pkg-config
+      pkgs.protobuf
+      pkgs.rustPlatform.bindgenHook
+      pkgs.rust-analyzer
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
+      pkgs.mold
+    ];

-    # `build.nix` adds this to the `zed-editor` wrapper (see `postFixup`)
-    # we'll just put it on `$PATH`:
-    nodejs_22
-  ];
+  buildInputs =
+    [
+      pkgs.bzip2
+      pkgs.curl
+      pkgs.fontconfig
+      pkgs.freetype
+      pkgs.libgit2
+      pkgs.openssl
+      pkgs.sqlite
+      pkgs.stdenv.cc.cc
+      pkgs.zlib
+      pkgs.zstd
+      pkgs.rustToolchain
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isLinux [
+      pkgs.alsa-lib
+      pkgs.libxkbcommon
+      pkgs.wayland
+      pkgs.xorg.libxcb
+      pkgs.vulkan-loader
+    ]
+    ++ lib.optional pkgs.stdenv.hostPlatform.isDarwin pkgs.apple-sdk_15;

-  # We set SDKROOT and DEVELOPER_DIR to the Xcode ones instead of the nixpkgs ones, because
-  # we need Swift 6.0 and nixpkgs doesn't have it
-  shellHook = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    export SDKROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk";
-    export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer";
-  '';
+  LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;

-  env =
-    let
-      baseEnvs =
-        (zed-editor.overrideAttrs (attrs: {
-          passthru = { inherit (attrs) env; };
-        })).env; # exfil `env`; it's not in drvAttrs
-    in
-    # unsetting this var so we download the staticlib during the build
-    (removeAttrs baseEnvs [ "LK_CUSTOM_WEBRTC" ])
-    // {
-      # note: different than `$FONTCONFIG_FILE` in `build.nix` – this refers to relative paths
-      # outside the nix store instead of to `$src`
-      FONTCONFIG_FILE = makeFontsConf {
-        fontDirectories = [
-          "./assets/fonts/plex-mono"
-          "./assets/fonts/plex-sans"
-        ];
-      };
-      PROTOC = "${protobuf}/bin/protoc";
-    };
+  PROTOC="${pkgs.protobuf}/bin/protoc";
+
+  # We set SDKROOT and DEVELOPER_DIR to the Xcode ones instead of the nixpkgs ones,
+  # because we need Swift 6.0 and nixpkgs doesn't have it.
+  # Xcode is required for development anyways
+  shellHook = lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
+      export SDKROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk";
+      export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer";
+    '';
+
+  FONTCONFIG_FILE = pkgs.makeFontsConf {
+    fontDirectories = [
+      "./assets/fonts/zed-mono"
+      "./assets/fonts/zed-sans"
+    ];
+  };
+  ZSTD_SYS_USE_PKG_CONFIG = true;
 }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,11 +2,4 @@
 channel = "1.85"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
-targets = [
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin",
-    "x86_64-unknown-linux-gnu",
-    "x86_64-pc-windows-msvc",
-    "wasm32-wasip1", # extensions
-    "x86_64-unknown-linux-musl", # remote server
-]
+targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasip1", "x86_64-pc-windows-msvc" ]
--- a/script/bump-extension-cli
+++ b/script/bump-extension-cli
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

--- a/script/bump-nightly
+++ b/script/bump-nightly
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

--- a/script/bump-zed-minor-versions
+++ b/script/bump-zed-minor-versions
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -eu

--- a/script/bump-zed-patch-version
+++ b/script/bump-zed-patch-version
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 channel=$(cat crates/zed/RELEASE_CHANNEL)

--- a/Show More
+++ b/Show More