WIP

Fix link to the PHP extension (#25144 )
2025-02-19 14:54:08 +01:00 · 2025-02-19 14:43:05 +01:00 · 2025-02-19 11:10:10 +00:00 · 2025-02-19 11:04:44 +00:00 · 2025-02-19 14:43:59 +05:30 · 2025-02-19 13:27:49 +05:30
371 changed files with 4736 additions and 29628 deletions
--- a/.github/workflows/issue_response.yml
+++ b/.github/workflows/issue_response.yml
@@ -29,5 +29,5 @@ jobs:
      - name: Run Issue Response
        run: pnpm run --dir script/issue_response start
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_RESPONSE_GITHUB_TOKEN: ${{ secrets.ISSUE_RESPONSE_GITHUB_TOKEN }}
          SLACK_ISSUE_RESPONSE_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_RESPONSE_WEBHOOK_URL }}
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -1,19 +0,0 @@
-[
-  {
-    "label": "Debug Zed with LLDB",
-    "adapter": "lldb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug Zed with GDB",
-    "adapter": "gdb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "stopAtBeginningOfMainSubprogram": true
-    }
-  }
-]
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,10 +31,6 @@ members = [
    "crates/context_server",
    "crates/context_server_settings",
    "crates/copilot",
-    "crates/dap",
-    "crates/dap_adapters",
-    "crates/debugger_tools",
-    "crates/debugger_ui",
    "crates/db",
    "crates/deepseek",
    "crates/diagnostics",
@@ -237,11 +233,7 @@ component_preview = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
 context_server_settings = { path = "crates/context_server_settings" }
 copilot = { path = "crates/copilot" }
-dap = { path = "crates/dap" }
-dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
-debugger_ui = { path = "crates/debugger_ui" }
-debugger_tools = { path = "crates/debugger_tools" }
 deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
 buffer_diff = { path = "crates/buffer_diff" }
@@ -372,8 +364,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-# TODO(#18342): Update to version 0.25 from crates.io when it is released.
-alacritty_terminal = { git = "https://github.com/alacritty/alacritty.git", rev = "5e78d20c709cb1ab8d44ca7a8702cc26d779227c" }
+alacritty_terminal = "0.25"
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -535,7 +526,7 @@ tiny_http = "0.8"
 toml = "0.8"
 tokio = { version = "1" }
 tower-http = "0.4.4"
-tree-sitter = { version = "0.24", features = ["wasm"] }
+tree-sitter = { version = "0.25.2", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
@@ -548,7 +539,7 @@ tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod"
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
 tree-sitter-diff = "0.1.0"
-tree-sitter-html = "0.20"
+tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
@@ -564,18 +555,18 @@ unicode-segmentation = "1.10"
 unicode-script = "0.5.7"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
-wasmparser = "0.217"
-wasm-encoder = "0.217"
-wasmtime = { version = "25", default-features = false, features = [
+wasmparser = "0.221"
+wasm-encoder = "0.221"
+wasmtime = { version = "29", default-features = false, features = [
    "async",
    "demangle",
    "runtime",
    "cranelift",
    "component-model",
 ] }
-wasmtime-wasi = "25"
+wasmtime-wasi = "29"
 which = "6.0.0"
-wit-component = "0.201"
+wit-component = "0.221"
 zed_llm_client = "0.4"
 zstd = "0.11"
 metal = "0.31"
@@ -710,6 +701,7 @@ codegen-units = 16
 [workspace.lints.clippy]
 dbg_macro = "deny"
 todo = "deny"
+too_many_arguments = "allow"

 # Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
 # warning on this rule produces a lot of noise.
--- a/assets/icons/debug.svg
+++ b/assets/icons/debug.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>
--- a/assets/icons/debug_breakpoint.svg
+++ b/assets/icons/debug_breakpoint.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle"><circle cx="12" cy="12" r="10"/></svg>
--- a/assets/icons/debug_continue.svg
+++ b/assets/icons/debug_continue.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-step-forward"><line x1="6" x2="6" y1="4" y2="20"/><polygon points="10,4 20,12 10,20"/></svg>
--- a/assets/icons/debug_disconnect.svg
+++ b/assets/icons/debug_disconnect.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-unplug"><path d="m19 5 3-3"/><path d="m2 22 3-3"/><path d="M6.3 20.3a2.4 2.4 0 0 0 3.4 0L12 18l-6-6-2.3 2.3a2.4 2.4 0 0 0 0 3.4Z"/><path d="M7.5 13.5 10 11"/><path d="M10.5 16.5 13 14"/><path d="m12 6 6 6 2.3-2.3a2.4 2.4 0 0 0 0-3.4l-2.6-2.6a2.4 2.4 0 0 0-3.4 0Z"/></svg>
--- a/assets/icons/debug_ignore_breakpoints.svg
+++ b/assets/icons/debug_ignore_breakpoints.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-off"><path d="m2 2 20 20"/><path d="M8.35 2.69A10 10 0 0 1 21.3 15.65"/><path d="M19.08 19.08A10 10 0 1 1 4.92 4.92"/></svg>
--- a/assets/icons/debug_log_breakpoint.svg
+++ b/assets/icons/debug_log_breakpoint.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle"><path d="M7.9 20A9 9 0 1 0 4 16.1L2 22Z"/></svg>
--- a/assets/icons/debug_pause.svg
+++ b/assets/icons/debug_pause.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-pause"><rect x="14" y="4" width="4" height="16" rx="1"/><rect x="6" y="4" width="4" height="16" rx="1"/></svg>
--- a/assets/icons/debug_restart.svg
+++ b/assets/icons/debug_restart.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-rotate-ccw"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
--- a/assets/icons/debug_step_back.svg
+++ b/assets/icons/debug_step_back.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-undo-dot"><path d="M21 17a9 9 0 0 0-15-6.7L3 13"/><path d="M3 7v6h6"/><circle cx="12" cy="17" r="1"/></svg>
--- a/assets/icons/debug_step_into.svg
+++ b/assets/icons/debug_step_into.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m5 15 7 7 7-7"/>
-  <path d="M12 8v14"/>
-  <circle cx="12" cy="3" r="1"/>
-</svg>
--- a/assets/icons/debug_step_out.svg
+++ b/assets/icons/debug_step_out.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m3 10 9-8 9 8"/>
-  <path d="M12 17V2"/>
-  <circle cx="12" cy="21" r="1"/>
-</svg>
--- a/assets/icons/debug_step_over.svg
+++ b/assets/icons/debug_step_over.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-redo-dot">
-  <circle cx="12" cy="17" r="1"/>
-  <path d="M21 7v6h-6"/>
-  <path d="M3 17a9 9 0 0 1 9-9 9 9 0 0 1 6 2.3l3 2.7"/>
-</svg>
--- a/assets/icons/debug_stop.svg
+++ b/assets/icons/debug_stop.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square"><rect width="18" height="18" x="3" y="3" rx="2"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -587,6 +587,7 @@
      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
@@ -766,13 +767,7 @@
    }
  },
  {
-    "context": "FileFinder",
-    "bindings": {
-      "ctrl": "file_finder::ToggleMenu"
-    }
-  },
-  {
-    "context": "FileFinder && !menu_open",
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "bindings": {
      "ctrl-shift-p": "file_finder::SelectPrev",
      "ctrl-j": "pane::SplitDown",
@@ -781,15 +776,6 @@
      "ctrl-l": "pane::SplitRight"
    }
  },
-  {
-    "context": "FileFinder && menu_open",
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
-  },
  {
    "context": "TabSwitcher",
    "bindings": {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -218,6 +218,7 @@
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
@@ -716,14 +717,6 @@
      "space": "project_panel::Open"
    }
  },
-  {
-    "context": "VariableList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry"
-    }
-  },
  {
    "context": "GitPanel && ChangesList",
    "use_key_equivalents": true,
@@ -792,14 +785,7 @@
    }
  },
  {
-    "context": "FileFinder",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd": "file_finder::ToggleMenu"
-    }
-  },
-  {
-    "context": "FileFinder && !menu_open",
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-p": "file_finder::SelectPrev",
@@ -809,16 +795,6 @@
      "cmd-l": "pane::SplitRight"
    }
  },
-  {
-    "context": "FileFinder && menu_open",
-    "use_key_equivalents": true,
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
-  },
  {
    "context": "TabSwitcher",
    "use_key_equivalents": true,
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -154,6 +154,10 @@
  // 4. Highlight the full line (default):
  //    "all"
  "current_line_highlight": "all",
+  // Whether to highlight all occurrences of the selected text in an editor.
+  "selection_highlight": true,
+  // The debounce delay before querying highlights based on the selected text.
+  "selection_highlight_debounce": 50,
  // The debounce delay before querying highlights from the language
  // server based on the current cursor location.
  "lsp_highlight_debounce": 75,
@@ -259,6 +263,8 @@
    "git_diff": true,
    // Whether to show buffer search results in the scrollbar.
    "search_results": true,
+    // Whether to show selected text occurrences in the scrollbar.
+    "selected_text": true,
    // Whether to show selected symbol occurrences in the scrollbar.
    "selected_symbol": true,
    // Which diagnostic indicators to show in the scrollbar:
@@ -730,9 +736,8 @@
    // Whether to show warnings or not by default.
    "include_warnings": true
  },
-  // Add files or globs of files that will be excluded by Zed entirely:
-  // they will be skipped during FS scan(s), file tree and file search
-  // will lack the corresponding file entries. Overrides `file_scan_inclusions`.
+  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
+  // scans, file searches, and not be displayed in the project file tree. Takes precedence over `file_scan_inclusions`.
  "file_scan_exclusions": [
    "**/.git",
    "**/.svn",
@@ -744,10 +749,10 @@
    "**/.classpath",
    "**/.settings"
  ],
-  // Add files or globs of files that will be included by Zed, even when
-  // ignored by git. This is useful for files that are not tracked by git,
-  // but are still important to your project. Note that globs that are
-  // overly broad can slow down Zed's file scanning. Overridden by `file_scan_exclusions`.
+  // Files or globs of files that will be included by Zed, even when ignored by git. This is useful
+  // for files that are not tracked by git, but are still important to your project. Note that globs
+  // that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes
+  // precedence over these inclusions.
  "file_scan_inclusions": [".env*"],
  // Git gutter behavior configuration.
  "git": {
@@ -1321,12 +1326,6 @@
  //   }
  // ]
  "ssh_connections": [],
-
  // Configures context servers for use in the Assistant.
-  "context_servers": {},
-  "debugger": {
-    "stepping_granularity": "line",
-    "save_breakpoints": true,
-    "button": true
-  }
+  "context_servers": {}
 }
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -1,32 +0,0 @@
-[
-  {
-    "label": "Debug active PHP file",
-    "adapter": "php",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active Python file",
-    "adapter": "python",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active JavaScript file",
-    "adapter": "javascript",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "JavaScript debug terminal",
-    "adapter": "javascript",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "console": "integratedTerminal"
-    }
-  }
-]
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -105,16 +105,6 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.added_background": "#b7bb2614",
-        "version_control.deleted": "#fb4a35ff",
-        "version_control.deleted_background": "#fb4a3514",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.modified_background": "#f9bd2f14",
-        "version_control.renamed": "#83a598ff",
-        "version_control.conflict": "#f9bd2fff",
-        "version_control.conflict_background": "#f9bd2f14",
-        "version_control.ignored": "#998b78ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -500,16 +490,6 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.added_background": "#b7bb2614",
-        "version_control.deleted": "#fb4a35ff",
-        "version_control.deleted_background": "#fb4a3514",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.modified_background": "#f9bd2f14",
-        "version_control.renamed": "#83a598ff",
-        "version_control.conflict": "#f9bd2fff",
-        "version_control.conflict_background": "#f9bd2f14",
-        "version_control.ignored": "#998b78ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -895,16 +875,6 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.added_background": "#b7bb2614",
-        "version_control.deleted": "#fb4a35ff",
-        "version_control.deleted_background": "#fb4a3514",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.modified_background": "#f9bd2f14",
-        "version_control.renamed": "#83a598ff",
-        "version_control.conflict": "#f9bd2fff",
-        "version_control.conflict_background": "#f9bd2f14",
-        "version_control.ignored": "#998b78ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -1290,16 +1260,6 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#79740eff",
-        "version_control.added_background": "#79740e14",
-        "version_control.deleted": "#9d0006ff",
-        "version_control.deleted_background": "#9d000614",
-        "version_control.modified": "#b57614ff",
-        "version_control.modified_background": "#b5761414",
-        "version_control.renamed": "#076678ff",
-        "version_control.conflict": "#b57614ff",
-        "version_control.conflict_background": "#b5761414",
-        "version_control.ignored": "#928374ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
@@ -1685,16 +1645,6 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#79740eff",
-        "version_control.added_background": "#79740e14",
-        "version_control.deleted": "#9d0006ff",
-        "version_control.deleted_background": "#9d000614",
-        "version_control.modified": "#b57614ff",
-        "version_control.modified_background": "#b5761414",
-        "version_control.renamed": "#076678ff",
-        "version_control.conflict": "#b57614ff",
-        "version_control.conflict_background": "#b5761414",
-        "version_control.ignored": "#928374ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
@@ -2080,16 +2030,6 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#79740eff",
-        "version_control.added_background": "#79740e14",
-        "version_control.deleted": "#9d0006ff",
-        "version_control.deleted_background": "#9d000614",
-        "version_control.modified": "#b57614ff",
-        "version_control.modified_background": "#b5761414",
-        "version_control.renamed": "#076678ff",
-        "version_control.conflict": "#b57614ff",
-        "version_control.conflict_background": "#b5761414",
-        "version_control.ignored": "#928374ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -96,16 +96,6 @@
        "terminal.ansi.bright_white": "#dce0e5ff",
        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
-        "version_control.added": "#a1c181ff",
-        "version_control.added_background": "#a1c18114",
-        "version_control.deleted": "#d07277ff",
-        "version_control.deleted_background": "#d0727714",
-        "version_control.modified": "#dec184ff",
-        "version_control.modified_background": "#dec18414",
-        "version_control.renamed": "#74ade8ff",
-        "version_control.conflict": "#dec184ff",
-        "version_control.conflict_background": "#dec18414",
-        "version_control.ignored": "#878a98ff",
        "conflict": "#dec184ff",
        "conflict.background": "#dec1841a",
        "conflict.border": "#5d4c2fff",
@@ -451,7 +441,7 @@
        "editor.invisible": "#a3a3a4ff",
        "editor.wrap_guide": "#383a410d",
        "editor.active_wrap_guide": "#383a411a",
-        "editor.document_highlight.read_background": "#5c78e21a",
+        "editor.document_highlight.read_background": "#5c78e225",
        "editor.document_highlight.write_background": "#a3a3a466",
        "terminal.background": "#fafafaff",
        "terminal.foreground": "#242529ff",
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -20,6 +20,7 @@ extension_host.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
+lsp.workspace = true
 project.workspace = true
 smallvec.workspace = true
 ui.workspace = true
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -7,7 +7,8 @@ use gpui::{
    EventEmitter, InteractiveElement as _, ParentElement as _, Render, SharedString,
    StatefulInteractiveElement, Styled, Transformation, Window,
 };
-use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
+use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
+use lsp::LanguageServerName;
 use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
@@ -19,21 +20,21 @@ actions!(activity_indicator, [ShowErrorMessage]);

 pub enum Event {
    ShowError {
-        server_name: SharedString,
+        lsp_name: LanguageServerName,
        error: String,
    },
 }

 pub struct ActivityIndicator {
-    statuses: Vec<ServerStatus>,
+    statuses: Vec<LspStatus>,
    project: Entity<Project>,
    auto_updater: Option<Entity<AutoUpdater>>,
    context_menu_handle: PopoverMenuHandle<ContextMenu>,
 }

-struct ServerStatus {
-    name: SharedString,
-    status: BinaryStatus,
+struct LspStatus {
+    name: LanguageServerName,
+    status: LanguageServerBinaryStatus,
 }

 struct PendingWork<'a> {
@@ -64,20 +65,7 @@ impl ActivityIndicator {
                while let Some((name, status)) = status_events.next().await {
                    this.update(&mut cx, |this: &mut ActivityIndicator, cx| {
                        this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus { name, status });
-                        cx.notify();
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-
-            let mut status_events = languages.dap_server_binary_statuses();
-            cx.spawn(|this, mut cx| async move {
-                while let Some((name, status)) = status_events.next().await {
-                    this.update(&mut cx, |this, cx| {
-                        this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus { name, status });
+                        this.statuses.push(LspStatus { name, status });
                        cx.notify();
                    })?;
                }
@@ -100,18 +88,18 @@ impl ActivityIndicator {
        });

        cx.subscribe_in(&this, window, move |_, _, event, window, cx| match event {
-            Event::ShowError { server_name, error } => {
+            Event::ShowError { lsp_name, error } => {
                let create_buffer = project.update(cx, |project, cx| project.create_buffer(cx));
                let project = project.clone();
                let error = error.clone();
-                let server_name = server_name.clone();
+                let lsp_name = lsp_name.clone();
                cx.spawn_in(window, |workspace, mut cx| async move {
                    let buffer = create_buffer.await?;
                    buffer.update(&mut cx, |buffer, cx| {
                        buffer.edit(
                            [(
                                0..0,
-                                format!("Language server error: {}\n\n{}", server_name, error),
+                                format!("Language server error: {}\n\n{}", lsp_name, error),
                            )],
                            None,
                            cx,
@@ -141,9 +129,9 @@ impl ActivityIndicator {

    fn show_error_message(&mut self, _: &ShowErrorMessage, _: &mut Window, cx: &mut Context<Self>) {
        self.statuses.retain(|status| {
-            if let BinaryStatus::Failed { error } = &status.status {
+            if let LanguageServerBinaryStatus::Failed { error } = &status.status {
                cx.emit(Event::ShowError {
-                    server_name: status.name.clone(),
+                    lsp_name: status.name.clone(),
                    error: error.clone(),
                });
                false
@@ -272,10 +260,12 @@ impl ActivityIndicator {
        let mut failed = SmallVec::<[_; 3]>::new();
        for status in &self.statuses {
            match status.status {
-                BinaryStatus::CheckingForUpdate => checking_for_update.push(status.name.clone()),
-                BinaryStatus::Downloading => downloading.push(status.name.clone()),
-                BinaryStatus::Failed { .. } => failed.push(status.name.clone()),
-                BinaryStatus::None => {}
+                LanguageServerBinaryStatus::CheckingForUpdate => {
+                    checking_for_update.push(status.name.clone())
+                }
+                LanguageServerBinaryStatus::Downloading => downloading.push(status.name.clone()),
+                LanguageServerBinaryStatus::Failed { .. } => failed.push(status.name.clone()),
+                LanguageServerBinaryStatus::None => {}
            }
        }

@@ -288,7 +278,7 @@ impl ActivityIndicator {
                ),
                message: format!(
                    "Downloading {}...",
-                    downloading.iter().map(|name| name.as_ref()).fold(
+                    downloading.iter().map(|name| name.0.as_ref()).fold(
                        String::new(),
                        |mut acc, s| {
                            if !acc.is_empty() {
@@ -316,7 +306,7 @@ impl ActivityIndicator {
                ),
                message: format!(
                    "Checking for updates to {}...",
-                    checking_for_update.iter().map(|name| name.as_ref()).fold(
+                    checking_for_update.iter().map(|name| name.0.as_ref()).fold(
                        String::new(),
                        |mut acc, s| {
                            if !acc.is_empty() {
@@ -346,7 +336,7 @@ impl ActivityIndicator {
                    "Failed to run {}. Click to show error.",
                    failed
                        .iter()
-                        .map(|name| name.as_ref())
+                        .map(|name| name.0.as_ref())
                        .fold(String::new(), |mut acc, s| {
                            if !acc.is_empty() {
                                acc.push_str(", ");
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -7,7 +7,7 @@ use assistant_context_editor::{
    make_lsp_adapter_delegate, AssistantContext, AssistantPanelDelegate, ContextEditor,
    ContextEditorToolbarItem, ContextEditorToolbarItemEvent, ContextHistory, ContextId,
    ContextStore, ContextStoreEvent, InsertDraggedFiles, SlashCommandCompletionProvider,
-    ToggleModelSelector, DEFAULT_TAB_TITLE,
+    DEFAULT_TAB_TITLE,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -20,8 +20,9 @@ use gpui::{
    Subscription, Task, UpdateGlobal, WeakEntity,
 };
 use language::LanguageRegistry;
-use language_model::{LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
-use language_model_selector::LanguageModelSelector;
+use language_model::{
+    AuthenticateError, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
+};
 use project::Project;
 use prompt_library::{open_prompt_library, PromptBuilder, PromptLibrary};
 use search::{buffer_search::DivRegistrar, BufferSearchBar};
@@ -29,7 +30,7 @@ use settings::{update_settings_file, Settings};
 use smol::stream::StreamExt;
 use std::{ops::ControlFlow, path::PathBuf, sync::Arc};
 use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
-use ui::{prelude::*, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
+use ui::{prelude::*, ContextMenu, PopoverMenu, Tooltip};
 use util::{maybe, ResultExt};
 use workspace::DraggedTab;
 use workspace::{
@@ -77,7 +78,6 @@ pub struct AssistantPanel {
    languages: Arc<LanguageRegistry>,
    fs: Arc<dyn Fs>,
    subscriptions: Vec<Subscription>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    model_summary_editor: Entity<Editor>,
    authenticate_provider_task: Option<(LanguageModelProviderId, Task<()>)>,
    configuration_subscription: Option<Subscription>,
@@ -119,17 +119,9 @@ impl AssistantPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let model_selector_menu_handle = PopoverMenuHandle::default();
        let model_summary_editor = cx.new(|cx| Editor::single_line(window, cx));
-        let context_editor_toolbar = cx.new(|cx| {
-            ContextEditorToolbarItem::new(
-                workspace,
-                model_selector_menu_handle.clone(),
-                model_summary_editor.clone(),
-                window,
-                cx,
-            )
-        });
+        let context_editor_toolbar =
+            cx.new(|_| ContextEditorToolbarItem::new(model_summary_editor.clone()));

        let pane = cx.new(|cx| {
            let mut pane = Pane::new(
@@ -331,7 +323,6 @@ impl AssistantPanel {
            languages: workspace.app_state().languages.clone(),
            fs: workspace.app_state().fs.clone(),
            subscriptions,
-            model_selector_menu_handle,
            model_summary_editor,
            authenticate_provider_task: None,
            configuration_subscription: None,
@@ -1054,15 +1045,6 @@ impl AssistantPanel {
        .detach_and_log_err(cx);
    }

-    fn toggle_model_selector(
-        &mut self,
-        _: &ToggleModelSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.model_selector_menu_handle.toggle(window, cx);
-    }
-
    pub(crate) fn active_context_editor(&self, cx: &App) -> Option<Entity<ContextEditor>> {
        self.pane
            .read(cx)
@@ -1176,7 +1158,10 @@ impl AssistantPanel {
            .map_or(false, |provider| provider.is_authenticated(cx))
    }

-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Option<Task<Result<()>>> {
+    fn authenticate(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<(), AuthenticateError>>> {
        LanguageModelRegistry::read_global(cx)
            .active_provider()
            .map_or(None, |provider| Some(provider.authenticate(cx)))
@@ -1229,7 +1214,6 @@ impl Render for AssistantPanel {
            }))
            .on_action(cx.listener(AssistantPanel::deploy_history))
            .on_action(cx.listener(AssistantPanel::deploy_prompt_library))
-            .on_action(cx.listener(AssistantPanel::toggle_model_selector))
            .child(registrar.size_full().child(self.pane.clone()))
            .into_any_element()
    }
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -387,7 +387,6 @@ impl InlineAssistant {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn suggest_assist(
        &mut self,
        editor: &Entity<Editor>,
@@ -1611,6 +1610,7 @@ impl Render for PromptEditor {
                                cx,
                            )
                        },
+                        gpui::Corner::TopRight,
                    ))
                    .map(|el| {
                        let CodegenStatus::Error(error) = self.codegen.read(cx).status(cx) else {
@@ -1674,7 +1674,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
    const MAX_LINES: u8 = 8;

-    #[allow(clippy::too_many_arguments)]
    fn new(
        id: InlineAssistId,
        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -2333,7 +2332,6 @@ struct InlineAssist {
 }

 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
    fn new(
        assist_id: InlineAssistId,
        group_id: InlineAssistGroupId,
@@ -3015,7 +3013,7 @@ impl CodegenAlternative {
                    let executor = cx.background_executor().clone();
                    let message_id = message_id.clone();
                    let line_based_stream_diff: Task<anyhow::Result<()>> =
-                        cx.background_executor().spawn(async move {
+                        cx.background_spawn(async move {
                            let mut response_latency = None;
                            let request_start = Instant::now();
                            let diff = async {
@@ -3329,8 +3327,7 @@ impl CodegenAlternative {

        cx.spawn(|codegen, mut cx| async move {
            let (deleted_row_ranges, inserted_row_ranges) = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let old_text = old_snapshot
                        .text_for_range(
                            Point::new(old_range.start.row, 0)
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -662,6 +662,7 @@ impl Render for PromptEditor {
                                cx,
                            )
                        },
+                        gpui::Corner::TopRight,
                    ))
                    .children(
                        if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
@@ -701,7 +702,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
    const MAX_LINES: u8 = 8;

-    #[allow(clippy::too_many_arguments)]
    fn new(
        id: TerminalInlineAssistId,
        prompt_history: VecDeque<String>,
@@ -1150,7 +1150,7 @@ impl Codegen {

                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);

-                let task = cx.background_executor().spawn({
+                let task = cx.background_spawn({
                    let message_id = message_id.clone();
                    let executor = cx.background_executor().clone();
                    async move {
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -179,7 +179,7 @@ impl ActiveThread {

        let markdown = cx.new(|cx| {
            Markdown::new(
-                text,
+                text.into(),
                markdown_style,
                Some(self.language_registry.clone()),
                None,
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -66,6 +66,7 @@ pub fn init(
    cx: &mut App,
 ) {
    AssistantSettings::register(cx);
+    thread_store::init(cx);
    assistant_panel::init(cx);

    inline_assistant::init(
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -61,13 +61,9 @@ impl Render for AssistantModelSelector {
                    h_flex()
                        .gap_0p5()
                        .child(
-                            div().max_w_32().child(
-                                Label::new(model_name)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .text_ellipsis()
-                                    .into_any_element(),
-                            ),
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
                        )
                        .child(
                            Icon::new(IconName::ChevronDown)
@@ -84,6 +80,7 @@ impl Render for AssistantModelSelector {
                    cx,
                )
            },
+            gpui::Corner::BottomRight,
        )
        .with_handle(self.menu_handle.clone())
    }
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;

 use anyhow::{anyhow, Result};
 use assistant_context_editor::{
-    make_lsp_adapter_delegate, AssistantPanelDelegate, ConfigurationError, ContextEditor,
-    ContextHistory, SlashCommandCompletionProvider,
+    make_lsp_adapter_delegate, render_remaining_tokens, AssistantPanelDelegate, ConfigurationError,
+    ContextEditor, ContextHistory, SlashCommandCompletionProvider,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -323,6 +323,9 @@ impl AssistantPanel {
    }

    fn open_history(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.thread_store
+            .update(cx, |thread_store, cx| thread_store.reload(cx))
+            .detach_and_log_err(cx);
        self.active_view = ActiveView::History;
        self.history.focus_handle(cx).focus(window);
        cx.notify();
@@ -478,6 +481,10 @@ impl AssistantPanel {
            .update(cx, |this, cx| this.delete_thread(thread_id, cx))
            .detach_and_log_err(cx);
    }
+
+    pub(crate) fn active_context_editor(&self) -> Option<Entity<ContextEditor>> {
+        self.context_editor.clone()
+    }
 }

 impl Focusable for AssistantPanel {
@@ -635,20 +642,33 @@ impl AssistantPanel {
            .border_color(cx.theme().colors().border)
            .child(
                h_flex()
-                    .child(Label::new(title))
-                    .when(sub_title.is_some(), |this| {
-                        this.child(
-                            h_flex()
-                                .pl_1p5()
-                                .gap_1p5()
-                                .child(
-                                    Label::new("/")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Disabled)
-                                        .alpha(0.5),
+                    .w_full()
+                    .gap_1()
+                    .justify_between()
+                    .child(
+                        h_flex()
+                            .child(Label::new(title))
+                            .when(sub_title.is_some(), |this| {
+                                this.child(
+                                    h_flex()
+                                        .pl_1p5()
+                                        .gap_1p5()
+                                        .child(
+                                            Label::new("/")
+                                                .size(LabelSize::Small)
+                                                .color(Color::Disabled)
+                                                .alpha(0.5),
+                                        )
+                                        .child(Label::new(sub_title.unwrap())),
                                )
-                                .child(Label::new(sub_title.unwrap())),
-                        )
+                            }),
+                    )
+                    .children(if matches!(self.active_view, ActiveView::PromptEditor) {
+                        self.context_editor
+                            .as_ref()
+                            .and_then(|editor| render_remaining_tokens(editor, cx))
+                    } else {
+                        None
                    }),
            )
            .child(
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -493,7 +493,7 @@ impl CodegenAlternative {
                    let executor = cx.background_executor().clone();
                    let message_id = message_id.clone();
                    let line_based_stream_diff: Task<anyhow::Result<()>> =
-                        cx.background_executor().spawn(async move {
+                        cx.background_spawn(async move {
                            let mut response_latency = None;
                            let request_start = Instant::now();
                            let diff = async {
@@ -807,8 +807,7 @@ impl CodegenAlternative {

        cx.spawn(|codegen, mut cx| async move {
            let (deleted_row_ranges, inserted_row_ranges) = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let old_text = old_snapshot
                        .text_for_range(
                            Point::new(old_range.start.row, 0)
--- a/crates/assistant2/src/context_picker/fetch_context_picker.rs
+++ b/crates/assistant2/src/context_picker/fetch_context_picker.rs
@@ -208,8 +208,7 @@ impl PickerDelegate for FetchContextPickerDelegate {
        let confirm_behavior = self.confirm_behavior;
        cx.spawn_in(window, |this, mut cx| async move {
            let text = cx
-                .background_executor()
-                .spawn(Self::build_message(http_client, url.clone()))
+                .background_spawn(Self::build_message(http_client, url.clone()))
                .await?;

            this.update_in(&mut cx, |this, window, cx| {
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -288,8 +288,11 @@ impl PickerDelegate for FileContextPickerDelegate {

                editor.insert("\n", window, cx); // Needed to end the fold

+                let file_icon = FileIcons::get_icon(&Path::new(&full_path), cx)
+                    .unwrap_or_else(|| SharedString::new(""));
+
                let placeholder = FoldPlaceholder {
-                    render: render_fold_icon_button(IconName::File, file_name.into()),
+                    render: render_fold_icon_button(file_icon, file_name.into()),
                    ..Default::default()
                };

@@ -459,15 +462,27 @@ pub fn render_file_context_entry(
 }

 fn render_fold_icon_button(
-    icon: IconName,
+    icon: SharedString,
    label: SharedString,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut Window, &mut App) -> AnyElement> {
    Arc::new(move |fold_id, _fold_range, _window, _cx| {
        ButtonLike::new(fold_id)
            .style(ButtonStyle::Filled)
            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(icon))
-            .child(Label::new(label.clone()).single_line())
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(
+                        Icon::from_path(icon.clone())
+                            .size(IconSize::Small)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        Label::new(label.clone())
+                            .size(LabelSize::Small)
+                            .single_line(),
+                    ),
+            )
            .into_any_element()
    })
 }
--- a/crates/assistant2/src/context_picker/thread_context_picker.rs
+++ b/crates/assistant2/src/context_picker/thread_context_picker.rs
@@ -123,7 +123,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        };

        let executor = cx.background_executor().clone();
-        let search_task = cx.background_executor().spawn(async move {
+        let search_task = cx.background_spawn(async move {
            if query.is_empty() {
                threads
            } else {
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, bail, Result};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::{self, future, Future, FutureExt};
-use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language::Buffer;
 use project::{ProjectPath, Worktree};
 use rope::Rope;
@@ -456,9 +456,7 @@ fn collect_buffer_info_and_text(
    };
    // Important to collect version at the same time as content so that staleness logic is correct.
    let content = buffer.as_rope().clone();
-    let text_task = cx
-        .background_executor()
-        .spawn(async move { to_fenced_codeblock(&path, content) });
+    let text_task = cx.background_spawn(async move { to_fenced_codeblock(&path, content) });
    (buffer_info, text_task)
 }

--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -36,7 +36,6 @@ pub struct ContextStrip {
 }

 impl ContextStrip {
-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        context_store: Entity<ContextStore>,
        workspace: WeakEntity<Workspace>,
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -228,8 +228,12 @@ impl InlineAssistant {
            return;
        }

-        let Some(inline_assist_target) = Self::resolve_inline_assist_target(workspace, window, cx)
-        else {
+        let Some(inline_assist_target) = Self::resolve_inline_assist_target(
+            workspace,
+            workspace.panel::<AssistantPanel>(cx),
+            window,
+            cx,
+        ) else {
            return;
        };

@@ -476,7 +480,6 @@ impl InlineAssistant {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn suggest_assist(
        &mut self,
        editor: &Entity<Editor>,
@@ -1384,6 +1387,7 @@ impl InlineAssistant {

    fn resolve_inline_assist_target(
        workspace: &mut Workspace,
+        assistant_panel: Option<Entity<AssistantPanel>>,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<InlineAssistTarget> {
@@ -1403,7 +1407,20 @@ impl InlineAssistant {
            }
        }

-        if let Some(workspace_editor) = workspace
+        let context_editor = assistant_panel
+            .and_then(|panel| panel.read(cx).active_context_editor())
+            .and_then(|editor| {
+                let editor = &editor.read(cx).editor().clone();
+                if editor.read(cx).is_focused(window) {
+                    Some(editor.clone())
+                } else {
+                    None
+                }
+            });
+
+        if let Some(context_editor) = context_editor {
+            Some(InlineAssistTarget::Editor(context_editor))
+        } else if let Some(workspace_editor) = workspace
            .active_item(cx)
            .and_then(|item| item.act_as::<Editor>(cx))
        {
@@ -1433,7 +1450,6 @@ struct InlineAssistScrollLock {
 }

 impl EditorInlineAssists {
-    #[allow(clippy::too_many_arguments)]
    fn new(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
        let (highlight_updates_tx, mut highlight_updates_rx) = async_watch::channel(());
        Self {
@@ -1545,7 +1561,6 @@ pub struct InlineAssist {
 }

 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
    fn new(
        assist_id: InlineAssistId,
        group_id: InlineAssistGroupId,
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -823,7 +823,6 @@ impl InlineAssistId {
 }

 impl PromptEditor<BufferCodegen> {
-    #[allow(clippy::too_many_arguments)]
    pub fn new_buffer(
        id: InlineAssistId,
        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -984,7 +983,6 @@ impl TerminalInlineAssistId {
 }

 impl PromptEditor<TerminalCodegen> {
-    #[allow(clippy::too_many_arguments)]
    pub fn new_terminal(
        id: TerminalInlineAssistId,
        prompt_history: VecDeque<String>,
--- a/crates/assistant2/src/terminal_codegen.rs
+++ b/crates/assistant2/src/terminal_codegen.rs
@@ -1,7 +1,7 @@
 use crate::inline_prompt_editor::CodegenStatus;
 use client::telemetry::Telemetry;
 use futures::{channel::mpsc, SinkExt, StreamExt};
-use gpui::{App, Context, Entity, EventEmitter, Task};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
 use language_model::{LanguageModelRegistry, LanguageModelRequest};
 use language_models::report_assistant_event;
 use std::{sync::Arc, time::Instant};
@@ -53,7 +53,7 @@ impl TerminalCodegen {

                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);

-                let task = cx.background_executor().spawn({
+                let task = cx.background_spawn({
                    let message_id = message_id.clone();
                    let executor = cx.background_executor().clone();
                    async move {
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -9,7 +9,9 @@ use context_server::manager::ContextServerManager;
 use context_server::{ContextServerFactoryRegistry, ContextServerTool};
 use futures::future::{self, BoxFuture, Shared};
 use futures::FutureExt as _;
-use gpui::{prelude::*, App, BackgroundExecutor, Context, Entity, SharedString, Task};
+use gpui::{
+    prelude::*, App, BackgroundExecutor, Context, Entity, Global, ReadGlobal, SharedString, Task,
+};
 use heed::types::SerdeBincode;
 use heed::Database;
 use language_model::Role;
@@ -19,6 +21,10 @@ use util::ResultExt as _;

 use crate::thread::{MessageId, Thread, ThreadId};

+pub fn init(cx: &mut App) {
+    ThreadsDatabase::init(cx);
+}
+
 pub struct ThreadStore {
    #[allow(unused)]
    project: Entity<Project>,
@@ -26,7 +32,6 @@ pub struct ThreadStore {
    context_server_manager: Entity<ContextServerManager>,
    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SavedThreadMetadata>,
-    database_future: Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>,
 }

 impl ThreadStore {
@@ -41,24 +46,12 @@ impl ThreadStore {
                ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
            });

-            let executor = cx.background_executor().clone();
-            let database_future = executor
-                .spawn({
-                    let executor = executor.clone();
-                    let database_path = paths::support_dir().join("threads/threads-db.0.mdb");
-                    async move { ThreadsDatabase::new(database_path, executor) }
-                })
-                .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
-                .boxed()
-                .shared();
-
            let this = Self {
                project,
                tools,
                context_server_manager,
                context_server_tool_ids: HashMap::default(),
                threads: Vec::new(),
-                database_future,
            };
            this.register_context_server_handlers(cx);
            this.reload(cx).detach_and_log_err(cx);
@@ -94,7 +87,7 @@ impl ThreadStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<Entity<Thread>>> {
        let id = id.clone();
-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            let thread = database
@@ -127,7 +120,7 @@ impl ThreadStore {
            (id, thread)
        });

-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            database.save_thread(metadata, thread).await?;
@@ -138,7 +131,7 @@ impl ThreadStore {

    pub fn delete_thread(&mut self, id: &ThreadId, cx: &mut Context<Self>) -> Task<Result<()>> {
        let id = id.clone();
-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            database.delete_thread(id.clone()).await?;
@@ -149,8 +142,8 @@ impl ThreadStore {
        })
    }

-    fn reload(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let database_future = self.database_future.clone();
+    pub fn reload(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let threads = database_future
                .await
@@ -253,13 +246,40 @@ pub struct SavedMessage {
    pub text: String,
 }

-struct ThreadsDatabase {
+struct GlobalThreadsDatabase(
+    Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>,
+);
+
+impl Global for GlobalThreadsDatabase {}
+
+pub(crate) struct ThreadsDatabase {
    executor: BackgroundExecutor,
    env: heed::Env,
    threads: Database<SerdeBincode<ThreadId>, SerdeBincode<SavedThread>>,
 }

 impl ThreadsDatabase {
+    fn global_future(
+        cx: &mut App,
+    ) -> Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>> {
+        GlobalThreadsDatabase::global(cx).0.clone()
+    }
+
+    fn init(cx: &mut App) {
+        let executor = cx.background_executor().clone();
+        let database_future = executor
+            .spawn({
+                let executor = executor.clone();
+                let database_path = paths::support_dir().join("threads/threads-db.0.mdb");
+                async move { ThreadsDatabase::new(database_path, executor) }
+            })
+            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
+            .boxed()
+            .shared();
+
+        cx.set_global(GlobalThreadsDatabase(database_future));
+    }
+
    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
        std::fs::create_dir_all(&path)?;

--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -650,7 +650,6 @@ impl AssistantContext {
        )
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn new(
        id: ContextId,
        replica_id: ReplicaId,
@@ -771,7 +770,6 @@ impl AssistantContext {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn deserialize(
        saved_context: SavedContext,
        path: PathBuf,
@@ -851,7 +849,7 @@ impl AssistantContext {
            .collect::<Vec<_>>();
        context_ops.extend(self.pending_ops.iter().cloned());

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let buffer_ops = buffer_ops.await;
            context_ops.sort_unstable_by_key(|op| op.timestamp());
            buffer_ops
@@ -1192,11 +1190,14 @@ impl AssistantContext {
        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };
+        let debounce = self.token_count.is_some();
        self.pending_token_count = cx.spawn(|this, mut cx| {
            async move {
-                cx.background_executor()
-                    .timer(Duration::from_millis(200))
-                    .await;
+                if debounce {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(200))
+                        .await;
+                }

                let token_count = cx.update(|cx| model.count_tokens(request, cx))?.await?;
                this.update(&mut cx, |this, cx| {
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -193,6 +193,8 @@ pub struct ContextEditor {
    // the file is opened. In order to keep the worktree alive for the duration of the
    // context editor, we keep a reference here.
    dragged_file_worktrees: Vec<Entity<Worktree>>,
+    language_model_selector: Entity<LanguageModelSelector>,
+    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 pub const DEFAULT_TAB_TITLE: &str = "New Chat";
@@ -238,6 +240,22 @@ impl ContextEditor {
            cx.subscribe_in(&editor, window, Self::handle_editor_search_event),
        ];

+        let fs_clone = fs.clone();
+        let language_model_selector = cx.new(|cx| {
+            LanguageModelSelector::new(
+                move |model, cx| {
+                    update_settings_file::<AssistantSettings>(
+                        fs_clone.clone(),
+                        cx,
+                        move |settings, _| settings.set_model(model.clone()),
+                    );
+                },
+                window,
+                cx,
+            )
+        });
+
+        let language_model_selector_menu_handle = PopoverMenuHandle::default();
        let sections = context.read(cx).slash_command_output_sections().to_vec();
        let patch_ranges = context.read(cx).patch_ranges().collect::<Vec<_>>();
        let slash_commands = context.read(cx).slash_commands().clone();
@@ -262,6 +280,8 @@ impl ContextEditor {
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
+            language_model_selector,
+            language_model_selector_menu_handle,
        };
        this.update_message_headers(cx);
        this.update_image_blocks(cx);
@@ -497,7 +517,6 @@ impl ContextEditor {
        }
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn run_command(
        &mut self,
        command_range: Range<language::Anchor>,
@@ -2038,7 +2057,6 @@ impl ContextEditor {
            .unwrap_or_else(|| Cow::Borrowed(DEFAULT_TAB_TITLE))
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_patch_block(
        &mut self,
        range: Range<text::Anchor>,
@@ -2355,15 +2373,61 @@ impl ContextEditor {
        slash_command_picker::SlashCommandSelector::new(
            self.slash_commands.clone(),
            cx.entity().downgrade(),
-            Button::new("trigger", "Add Context")
-                .icon(IconName::Plus)
+            IconButton::new("trigger", IconName::Plus)
                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .icon_position(IconPosition::Start),
-            Tooltip::text("Type / to insert via keyboard"),
+                .icon_color(Color::Muted),
+            move |window, cx| {
+                Tooltip::with_meta(
+                    "Add Context",
+                    None,
+                    "Type / to insert via keyboard",
+                    window,
+                    cx,
+                )
+            },
        )
    }

+    fn render_language_model_selector(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.editor().focus_handle(cx).clone();
+        let model_name = match active_model {
+            Some(model) => model.name().0,
+            None => SharedString::from("No model selected"),
+        };
+
+        LanguageModelSelectorPopoverMenu::new(
+            self.language_model_selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .gap_0p5()
+                        .child(
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                ),
+            move |window, cx| {
+                Tooltip::for_action_in(
+                    "Change Model",
+                    &ToggleModelSelector,
+                    &focus_handle,
+                    window,
+                    cx,
+                )
+            },
+            gpui::Corner::BottomLeft,
+        )
+        .with_handle(self.language_model_selector_menu_handle.clone())
+    }
+
    fn render_last_error(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let last_error = self.last_error.as_ref()?;

@@ -2852,7 +2916,17 @@ impl Render for ContextEditor {
                        .border_t_1()
                        .border_color(cx.theme().colors().border_variant)
                        .bg(cx.theme().colors().editor_background)
-                        .child(h_flex().gap_1().child(self.render_inject_context_menu(cx)))
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(self.render_inject_context_menu(cx))
+                                .child(ui::Divider::vertical())
+                                .child(
+                                    div()
+                                        .pl_0p5()
+                                        .child(self.render_language_model_selector(cx)),
+                                ),
+                        )
                        .child(
                            h_flex()
                                .w_full()
@@ -3163,80 +3237,67 @@ impl FollowableItem for ContextEditor {
 pub struct ContextEditorToolbarItem {
    active_context_editor: Option<WeakEntity<ContextEditor>>,
    model_summary_editor: Entity<Editor>,
-    language_model_selector: Entity<LanguageModelSelector>,
-    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 impl ContextEditorToolbarItem {
-    pub fn new(
-        workspace: &Workspace,
-        model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-        model_summary_editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
+    pub fn new(model_summary_editor: Entity<Editor>) -> Self {
        Self {
            active_context_editor: None,
            model_summary_editor,
-            language_model_selector: cx.new(|cx| {
-                let fs = workspace.app_state().fs.clone();
-                LanguageModelSelector::new(
-                    move |model, cx| {
-                        update_settings_file::<AssistantSettings>(
-                            fs.clone(),
-                            cx,
-                            move |settings, _| settings.set_model(model.clone()),
-                        );
-                    },
-                    window,
-                    cx,
-                )
-            }),
-            language_model_selector_menu_handle: model_selector_menu_handle,
        }
    }
+}

-    fn render_remaining_tokens(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let context = &self
-            .active_context_editor
-            .as_ref()?
-            .upgrade()?
-            .read(cx)
-            .context;
-        let (token_count_color, token_count, max_token_count) = match token_state(context, cx)? {
-            TokenState::NoTokensLeft {
-                max_token_count,
-                token_count,
-            } => (Color::Error, token_count, max_token_count),
-            TokenState::HasMoreTokens {
-                max_token_count,
-                token_count,
-                over_warn_threshold,
-            } => {
-                let color = if over_warn_threshold {
-                    Color::Warning
-                } else {
-                    Color::Muted
-                };
-                (color, token_count, max_token_count)
-            }
-        };
-        Some(
-            h_flex()
-                .gap_0p5()
-                .child(
-                    Label::new(humanize_token_count(token_count))
-                        .size(LabelSize::Small)
-                        .color(token_count_color),
-                )
-                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
-                .child(
-                    Label::new(humanize_token_count(max_token_count))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-        )
-    }
+pub fn render_remaining_tokens(
+    context_editor: &Entity<ContextEditor>,
+    cx: &App,
+) -> Option<impl IntoElement> {
+    let context = &context_editor.read(cx).context;
+
+    let (token_count_color, token_count, max_token_count, tooltip) = match token_state(context, cx)?
+    {
+        TokenState::NoTokensLeft {
+            max_token_count,
+            token_count,
+        } => (
+            Color::Error,
+            token_count,
+            max_token_count,
+            Some("Token Limit Reached"),
+        ),
+        TokenState::HasMoreTokens {
+            max_token_count,
+            token_count,
+            over_warn_threshold,
+        } => {
+            let (color, tooltip) = if over_warn_threshold {
+                (Color::Warning, Some("Token Limit is Close to Exhaustion"))
+            } else {
+                (Color::Muted, None)
+            };
+            (color, token_count, max_token_count, tooltip)
+        }
+    };
+
+    Some(
+        h_flex()
+            .id("token-count")
+            .gap_0p5()
+            .child(
+                Label::new(humanize_token_count(token_count))
+                    .size(LabelSize::Small)
+                    .color(token_count_color),
+            )
+            .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
+            .child(
+                Label::new(humanize_token_count(max_token_count))
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .when_some(tooltip, |element, tooltip| {
+                element.tooltip(Tooltip::text(tooltip))
+            }),
+    )
 }

 impl Render for ContextEditorToolbarItem {
@@ -3263,8 +3324,7 @@ impl Render for ContextEditorToolbarItem {
                        })),
                ),
            );
-        let active_provider = LanguageModelRegistry::read_global(cx).active_provider();
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+
        let right_side = h_flex()
            .gap_2()
            // TODO display this in a nicer way, once we have a design for it.
@@ -3280,57 +3340,12 @@ impl Render for ContextEditorToolbarItem {
            //     scan_items_remaining
            //         .map(|remaining_items| format!("Files to scan: {}", remaining_items))
            // })
-            .child(
-                LanguageModelSelectorPopoverMenu::new(
-                    self.language_model_selector.clone(),
-                    ButtonLike::new("active-model")
-                        .style(ButtonStyle::Subtle)
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .gap_0p5()
-                                .child(
-                                    div()
-                                        .overflow_x_hidden()
-                                        .flex_grow()
-                                        .whitespace_nowrap()
-                                        .child(match (active_provider, active_model) {
-                                            (Some(provider), Some(model)) => h_flex()
-                                                .gap_1()
-                                                .child(
-                                                    Icon::new(
-                                                        model
-                                                            .icon()
-                                                            .unwrap_or_else(|| provider.icon()),
-                                                    )
-                                                    .color(Color::Muted)
-                                                    .size(IconSize::XSmall),
-                                                )
-                                                .child(
-                                                    Label::new(model.name().0)
-                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted),
-                                                )
-                                                .into_any_element(),
-                                            _ => Label::new("No model selected")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted)
-                                                .into_any_element(),
-                                        }),
-                                )
-                                .child(
-                                    Icon::new(IconName::ChevronDown)
-                                        .color(Color::Muted)
-                                        .size(IconSize::XSmall),
-                                ),
-                        ),
-                    move |window, cx| {
-                        Tooltip::for_action("Change Model", &ToggleModelSelector, window, cx)
-                    },
-                )
-                .with_handle(self.language_model_selector_menu_handle.clone()),
-            )
-            .children(self.render_remaining_tokens(cx));
+            .children(
+                self.active_context_editor
+                    .as_ref()
+                    .and_then(|editor| editor.upgrade())
+                    .and_then(|editor| render_remaining_tokens(&editor, cx)),
+            );

        h_flex()
            .px_0p5()
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -265,19 +265,18 @@ impl ContextStore {
                    local_versions.push(context.version(cx).to_proto(context_id.clone()));
                    let client = this.client.clone();
                    let project_id = envelope.payload.project_id;
-                    cx.background_executor()
-                        .spawn(async move {
-                            let operations = operations.await;
-                            for operation in operations {
-                                client.send(proto::UpdateContext {
-                                    project_id,
-                                    context_id: context_id.to_proto(),
-                                    operation: Some(operation),
-                                })?;
-                            }
-                            anyhow::Ok(())
-                        })
-                        .detach_and_log_err(cx);
+                    cx.background_spawn(async move {
+                        let operations = operations.await;
+                        for operation in operations {
+                            client.send(proto::UpdateContext {
+                                project_id,
+                                context_id: context_id.to_proto(),
+                                operation: Some(operation),
+                            })?;
+                        }
+                        anyhow::Ok(())
+                    })
+                    .detach_and_log_err(cx);
                }
            }

@@ -401,8 +400,7 @@ impl ContextStore {
                )
            })?;
            let operations = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    context_proto
                        .operations
                        .into_iter()
@@ -436,7 +434,7 @@ impl ContextStore {
        let languages = self.languages.clone();
        let project = self.project.clone();
        let telemetry = self.telemetry.clone();
-        let load = cx.background_executor().spawn({
+        let load = cx.background_spawn({
            let path = path.clone();
            async move {
                let saved_context = fs.load(&path).await?;
@@ -539,8 +537,7 @@ impl ContextStore {
                )
            })?;
            let operations = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    context_proto
                        .operations
                        .into_iter()
@@ -693,7 +690,7 @@ impl ContextStore {
    pub fn search(&self, query: String, cx: &App) -> Task<Vec<SavedContextMetadata>> {
        let metadata = self.contexts_metadata.clone();
        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            if query.is_empty() {
                metadata
            } else {
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Context as _, Result};
 use collections::HashMap;
 use editor::ProposedChangesEditor;
 use futures::{future, TryFutureExt as _};
-use gpui::{App, AsyncApp, Entity, SharedString};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString};
 use language::{AutoindentMode, Buffer, BufferSnapshot};
 use project::{Project, ProjectPath};
 use std::{cmp, ops::Range, path::Path, sync::Arc};
@@ -258,8 +258,7 @@ impl AssistantEdit {

        let snapshot = buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
        let suggestion = cx
-            .background_executor()
-            .spawn(async move { kind.resolve(&snapshot) })
+            .background_spawn(async move { kind.resolve(&snapshot) })
            .await;

        Ok((buffer, suggestion))
@@ -547,7 +546,7 @@ impl Eq for AssistantPatch {}
 #[cfg(test)]
 mod tests {
    use super::*;
-    use gpui::{App, AppContext as _};
+    use gpui::App;
    use language::{
        language_settings::AllLanguageSettings, Language, LanguageConfig, LanguageMatcher,
    };
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -4,10 +4,10 @@ pub use assistant_slash_command::SlashCommand;
 use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
-use gpui::{App, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, CompletionDocumentation, LanguageServerId, ToPoint};
+use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
+use language::{Anchor, Buffer, LanguageServerId, ToPoint};
 use parking_lot::Mutex;
-use project::CompletionIntent;
+use project::{lsp_store::CompletionDocumentation, CompletionIntent};
 use rope::Point;
 use std::{
    cell::RefCell,
@@ -121,7 +121,7 @@ impl SlashCommandCompletionProvider {
                        Some(project::Completion {
                            old_range: name_range.clone(),
                            documentation: Some(CompletionDocumentation::SingleLine(
-                                command.description(),
+                                command.description().into(),
                            )),
                            new_text,
                            label: command.label(cx),
@@ -136,7 +136,6 @@ impl SlashCommandCompletionProvider {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    fn complete_command_argument(
        &self,
        command_name: &str,
@@ -163,7 +162,7 @@ impl SlashCommandCompletionProvider {
            let editor = self.editor.clone();
            let workspace = self.workspace.clone();
            let arguments = arguments.to_vec();
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                Ok(completions
                    .await?
                    .into_iter()
--- a/crates/assistant_context_editor/src/slash_command_picker.rs
+++ b/crates/assistant_context_editor/src/slash_command_picker.rs
@@ -102,8 +102,7 @@ impl PickerDelegate for SlashCommandDelegate {
        let all_commands = self.all_commands.clone();
        cx.spawn_in(window, |this, mut cx| async move {
            let filtered_commands = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    if query.is_empty() {
                        all_commands
                    } else {
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -88,7 +88,7 @@ pub trait SlashCommand: 'static + Send + Sync {
    fn accepts_arguments(&self) -> bool {
        self.requires_argument()
    }
-    #[allow(clippy::too_many_arguments)]
+
    fn run(
        self: Arc<Self>,
        arguments: &[String],
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -103,7 +103,7 @@ impl SlashCommand for ExtensionSlashCommand {
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
        let command = self.command.clone();
        let arguments = arguments.to_owned();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let completions = self
                .extension
                .complete_slash_command_argument(command, arguments)
@@ -135,7 +135,7 @@ impl SlashCommand for ExtensionSlashCommand {
    ) -> Task<SlashCommandResult> {
        let command = self.command.clone();
        let arguments = arguments.to_owned();
-        let output = cx.background_executor().spawn(async move {
+        let output = cx.background_spawn(async move {
            let delegate =
                delegate.map(|delegate| Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _);
            let output = self
--- a/crates/assistant_slash_commands/src/auto_command.rs
+++ b/crates/assistant_slash_commands/src/auto_command.rs
@@ -82,7 +82,7 @@ impl SlashCommand for AutoCommand {
                project_index.flush_summary_backlogs(cx)
            })?;

-            cx.background_executor().spawn(task).await;
+            cx.background_spawn(task).await;

            anyhow::Ok(Vec::new())
        })
@@ -129,7 +129,7 @@ impl SlashCommand for AutoCommand {
        // so you don't have to write it again.
        let original_prompt = argument.to_string();

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let commands = task.await?;
            let mut prompt = String::new();

@@ -285,57 +285,56 @@ async fn commands_for_summaries(
        })
        .collect::<Vec<_>>();

-    cx.background_executor()
-        .spawn(async move {
-            let futures = completion_streams
-                .into_iter()
-                .enumerate()
-                .map(|(ix, (stream, tx))| async move {
-                    let start = std::time::Instant::now();
-                    let events = stream.await?;
-                    log::info!("Time taken for awaiting /await chunk stream #{ix}: {:?}", start.elapsed());
+    cx.background_spawn(async move {
+        let futures = completion_streams
+            .into_iter()
+            .enumerate()
+            .map(|(ix, (stream, tx))| async move {
+                let start = std::time::Instant::now();
+                let events = stream.await?;
+                log::info!("Time taken for awaiting /await chunk stream #{ix}: {:?}", start.elapsed());

-                    let completion: String = events
-                        .filter_map(|event| async {
-                            if let Ok(LanguageModelCompletionEvent::Text(text)) = event {
-                                Some(text)
-                            } else {
-                                None
-                            }
-                        })
-                        .collect()
-                        .await;
-
-                    log::info!("Time taken for all /auto chunks to come back for #{ix}: {:?}", start.elapsed());
-
-                    for line in completion.split('\n') {
-                        if let Some(first_space) = line.find(' ') {
-                            let command = &line[..first_space].trim();
-                            let arg = &line[first_space..].trim();
-
-                            tx.send(CommandToRun {
-                                name: command.to_string(),
-                                arg: arg.to_string(),
-                            })
-                            .await?;
-                        } else if !line.trim().is_empty() {
-                            // All slash-commands currently supported in context inference need a space for the argument.
-                            log::warn!(
-                                "Context inference returned a non-blank line that contained no spaces (meaning no argument for the slash command): {:?}",
-                                line
-                            );
+                let completion: String = events
+                    .filter_map(|event| async {
+                        if let Ok(LanguageModelCompletionEvent::Text(text)) = event {
+                            Some(text)
+                        } else {
+                            None
                        }
+                    })
+                    .collect()
+                    .await;
+
+                log::info!("Time taken for all /auto chunks to come back for #{ix}: {:?}", start.elapsed());
+
+                for line in completion.split('\n') {
+                    if let Some(first_space) = line.find(' ') {
+                        let command = &line[..first_space].trim();
+                        let arg = &line[first_space..].trim();
+
+                        tx.send(CommandToRun {
+                            name: command.to_string(),
+                            arg: arg.to_string(),
+                        })
+                        .await?;
+                    } else if !line.trim().is_empty() {
+                        // All slash-commands currently supported in context inference need a space for the argument.
+                        log::warn!(
+                            "Context inference returned a non-blank line that contained no spaces (meaning no argument for the slash command): {:?}",
+                            line
+                        );
                    }
+                }

-                    anyhow::Ok(())
-                })
-                .collect::<Vec<_>>();
+                anyhow::Ok(())
+            })
+            .collect::<Vec<_>>();

-            let _ = futures::future::try_join_all(futures).await.log_err();
+        let _ = futures::future::try_join_all(futures).await.log_err();

-            let duration = all_start.elapsed();
-            eprintln!("All futures completed in {:?}", duration);
-        })
+        let duration = all_start.elapsed();
+        eprintln!("All futures completed in {:?}", duration);
+    })
        .await;

    drop(tx); // Close the channel so that rx.collect() won't hang. This is safe because all futures have completed.
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
@@ -132,7 +132,7 @@ impl SlashCommand for CargoWorkspaceSlashCommand {
            let project = workspace.project().clone();
            let fs = workspace.project().read(cx).fs().clone();
            let path = Self::path_to_cargo_toml(project, cx);
-            let output = cx.background_executor().spawn(async move {
+            let output = cx.background_spawn(async move {
                let path = path.with_context(|| "Cargo.toml not found")?;
                Self::build_message(fs, &path).await
            });
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -54,7 +54,7 @@ impl SlashCommand for DefaultSlashCommand {
        cx: &mut App,
    ) -> Task<SlashCommandResult> {
        let store = PromptStore::global(cx);
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let store = store.await?;
            let prompts = store.default_prompt_metadata();

--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -86,7 +86,7 @@ impl SlashCommand for DeltaSlashCommand {
            }
        }

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut output = SlashCommandOutput::default();
            let mut changes_detected = false;

--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -129,7 +129,7 @@ impl SlashCommand for DiagnosticsSlashCommand {

        let paths = self.search_paths(query.clone(), cancellation_flag.clone(), &workspace, cx);
        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut matches: Vec<String> = paths
                .await
                .into_iter()
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ b/crates/assistant_slash_commands/src/docs_command.rs
@@ -176,7 +176,7 @@ impl SlashCommand for DocsSlashCommand {
            .provider()
            .ok_or_else(|| anyhow!("no docs provider specified"))
            .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            fn build_completions(items: Vec<String>) -> Vec<ArgumentCompletion> {
                items
                    .into_iter()
@@ -284,7 +284,7 @@ impl SlashCommand for DocsSlashCommand {

        let args = DocsSlashCommandArgs::parse(arguments);
        let executor = cx.background_executor().clone();
-        let task = cx.background_executor().spawn({
+        let task = cx.background_spawn({
            let store = args
                .provider()
                .ok_or_else(|| anyhow!("no docs provider specified"))
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -151,7 +151,7 @@ impl SlashCommand for FetchSlashCommand {
        let http_client = workspace.read(cx).client().http_client();
        let url = argument.to_string();

-        let text = cx.background_executor().spawn({
+        let text = cx.background_spawn({
            let url = url.clone();
            async move { Self::build_message(http_client, &url).await }
        });
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -156,7 +156,7 @@ impl SlashCommand for FileSlashCommand {
            cx,
        );
        let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            Ok(paths
                .await
                .into_iter()
--- a/crates/assistant_slash_commands/src/project_command.rs
+++ b/crates/assistant_slash_commands/src/project_command.rs
@@ -130,49 +130,48 @@ impl SlashCommand for ProjectSlashCommand {

            let results = SemanticDb::load_results(results, &fs, &cx).await?;

-            cx.background_executor()
-                .spawn(async move {
-                    let mut output = "Project context:\n".to_string();
-                    let mut sections = Vec::new();
+            cx.background_spawn(async move {
+                let mut output = "Project context:\n".to_string();
+                let mut sections = Vec::new();

-                    for (ix, query) in search_queries.into_iter().enumerate() {
-                        let start_ix = output.len();
-                        writeln!(&mut output, "Results for {query}:").unwrap();
-                        let mut has_results = false;
-                        for result in &results {
-                            if result.query_index == ix {
-                                add_search_result_section(result, &mut output, &mut sections);
-                                has_results = true;
-                            }
-                        }
-                        if has_results {
-                            sections.push(SlashCommandOutputSection {
-                                range: start_ix..output.len(),
-                                icon: IconName::MagnifyingGlass,
-                                label: query.into(),
-                                metadata: None,
-                            });
-                            output.push('\n');
-                        } else {
-                            output.truncate(start_ix);
+                for (ix, query) in search_queries.into_iter().enumerate() {
+                    let start_ix = output.len();
+                    writeln!(&mut output, "Results for {query}:").unwrap();
+                    let mut has_results = false;
+                    for result in &results {
+                        if result.query_index == ix {
+                            add_search_result_section(result, &mut output, &mut sections);
+                            has_results = true;
                        }
                    }
-
-                    sections.push(SlashCommandOutputSection {
-                        range: 0..output.len(),
-                        icon: IconName::Book,
-                        label: "Project context".into(),
-                        metadata: None,
-                    });
-
-                    Ok(SlashCommandOutput {
-                        text: output,
-                        sections,
-                        run_commands_in_text: true,
+                    if has_results {
+                        sections.push(SlashCommandOutputSection {
+                            range: start_ix..output.len(),
+                            icon: IconName::MagnifyingGlass,
+                            label: query.into(),
+                            metadata: None,
+                        });
+                        output.push('\n');
+                    } else {
+                        output.truncate(start_ix);
                    }
-                    .to_event_stream())
-                })
-                .await
+                }
+
+                sections.push(SlashCommandOutputSection {
+                    range: 0..output.len(),
+                    icon: IconName::Book,
+                    label: "Project context".into(),
+                    metadata: None,
+                });
+
+                Ok(SlashCommandOutput {
+                    text: output,
+                    sections,
+                    run_commands_in_text: true,
+                }
+                .to_event_stream())
+            })
+            .await
        })
    }
 }
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -43,7 +43,7 @@ impl SlashCommand for PromptSlashCommand {
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
        let store = PromptStore::global(cx);
        let query = arguments.to_owned().join(" ");
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let prompts = store.await?.search(query).await;
            Ok(prompts
                .into_iter()
@@ -77,7 +77,7 @@ impl SlashCommand for PromptSlashCommand {

        let store = PromptStore::global(cx);
        let title = SharedString::from(title.clone());
-        let prompt = cx.background_executor().spawn({
+        let prompt = cx.background_spawn({
            let title = title.clone();
            async move {
                let store = store.await?;
--- a/crates/assistant_slash_commands/src/search_command.rs
+++ b/crates/assistant_slash_commands/src/search_command.rs
@@ -119,8 +119,7 @@ impl SlashCommand for SearchSlashCommand {
            let loaded_results = SemanticDb::load_results(results, &fs, &cx).await?;

            let output = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let mut text = format!("Search results for {query}:\n");
                    let mut sections = Vec::new();
                    for loaded_result in &loaded_results {
--- a/crates/assistant_slash_commands/src/streaming_example_command.rs
+++ b/crates/assistant_slash_commands/src/streaming_example_command.rs
@@ -63,56 +63,55 @@ impl SlashCommand for StreamingExampleSlashCommand {
        cx: &mut App,
    ) -> Task<SlashCommandResult> {
        let (events_tx, events_rx) = mpsc::unbounded();
-        cx.background_executor()
-            .spawn(async move {
-                events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                    icon: IconName::FileRust,
-                    label: "Section 1".into(),
-                    metadata: None,
-                }))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                    SlashCommandContent::Text {
-                        text: "Hello".into(),
-                        run_commands_in_text: false,
-                    },
-                )))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+        cx.background_spawn(async move {
+            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
+                icon: IconName::FileRust,
+                label: "Section 1".into(),
+                metadata: None,
+            }))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
+                SlashCommandContent::Text {
+                    text: "Hello".into(),
+                    run_commands_in_text: false,
+                },
+            )))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;

+            Timer::after(Duration::from_secs(1)).await;
+
+            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
+                icon: IconName::FileRust,
+                label: "Section 2".into(),
+                metadata: None,
+            }))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
+                SlashCommandContent::Text {
+                    text: "World".into(),
+                    run_commands_in_text: false,
+                },
+            )))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+
+            for n in 1..=10 {
                Timer::after(Duration::from_secs(1)).await;

                events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                    icon: IconName::FileRust,
-                    label: "Section 2".into(),
+                    icon: IconName::StarFilled,
+                    label: format!("Section {n}").into(),
                    metadata: None,
                }))?;
                events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
                    SlashCommandContent::Text {
-                        text: "World".into(),
+                        text: "lorem ipsum ".repeat(n).trim().into(),
                        run_commands_in_text: false,
                    },
                )))?;
                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+            }

-                for n in 1..=10 {
-                    Timer::after(Duration::from_secs(1)).await;
-
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                        icon: IconName::StarFilled,
-                        label: format!("Section {n}").into(),
-                        metadata: None,
-                    }))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "lorem ipsum ".repeat(n).trim().into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-                }
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);

        Task::ready(Ok(events_rx.boxed()))
    }
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ b/crates/assistant_slash_commands/src/symbols_command.rs
@@ -4,7 +4,7 @@ use assistant_slash_command::{
    SlashCommandResult,
 };
 use editor::Editor;
-use gpui::{Task, WeakEntity};
+use gpui::{AppContext as _, Task, WeakEntity};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::sync::Arc;
 use std::{path::Path, sync::atomic::AtomicBool};
@@ -69,7 +69,7 @@ impl SlashCommand for OutlineSlashCommand {
            let snapshot = buffer.read(cx).snapshot();
            let path = snapshot.resolve_file_path(cx, true);

-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                let outline = snapshot
                    .outline(None)
                    .context("no symbols for active tab")?;
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ b/crates/assistant_slash_commands/src/tab_command.rs
@@ -152,7 +152,7 @@ impl SlashCommand for TabSlashCommand {
            cx,
        );

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut output = SlashCommandOutput::default();
            for (full_path, buffer, _) in tab_items_search.await? {
                append_buffer_to_output(&buffer, full_path.as_deref(), &mut output).log_err();
@@ -212,74 +212,73 @@ fn tab_items_for_queries(
                })??;

        let background_executor = cx.background_executor().clone();
-        cx.background_executor()
-            .spawn(async move {
-                open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
-                if empty_query
-                    || queries
-                        .iter()
-                        .any(|query| query == ALL_TABS_COMPLETION_ITEM)
-                {
-                    return Ok(open_buffers);
-                }
+        cx.background_spawn(async move {
+            open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
+            if empty_query
+                || queries
+                    .iter()
+                    .any(|query| query == ALL_TABS_COMPLETION_ITEM)
+            {
+                return Ok(open_buffers);
+            }

-                let matched_items = if strict_match {
-                    let match_candidates = open_buffers
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(id, (full_path, ..))| {
-                            let path_string = full_path.as_deref()?.to_string_lossy().to_string();
-                            Some((id, path_string))
-                        })
-                        .fold(HashMap::default(), |mut candidates, (id, path_string)| {
-                            candidates
-                                .entry(path_string)
-                                .or_insert_with(Vec::new)
-                                .push(id);
-                            candidates
-                        });
-
-                    queries
-                        .iter()
-                        .filter_map(|query| match_candidates.get(query))
-                        .flatten()
-                        .copied()
-                        .filter_map(|id| open_buffers.get(id))
-                        .cloned()
-                        .collect()
-                } else {
-                    let match_candidates = open_buffers
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(id, (full_path, ..))| {
-                            let path_string = full_path.as_deref()?.to_string_lossy().to_string();
-                            Some(fuzzy::StringMatchCandidate::new(id, &path_string))
-                        })
-                        .collect::<Vec<_>>();
-                    let mut processed_matches = HashSet::default();
-                    let file_queries = queries.iter().map(|query| {
-                        fuzzy::match_strings(
-                            &match_candidates,
-                            query,
-                            true,
-                            usize::MAX,
-                            &cancel,
-                            background_executor.clone(),
-                        )
+            let matched_items = if strict_match {
+                let match_candidates = open_buffers
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(id, (full_path, ..))| {
+                        let path_string = full_path.as_deref()?.to_string_lossy().to_string();
+                        Some((id, path_string))
+                    })
+                    .fold(HashMap::default(), |mut candidates, (id, path_string)| {
+                        candidates
+                            .entry(path_string)
+                            .or_insert_with(Vec::new)
+                            .push(id);
+                        candidates
                    });

-                    join_all(file_queries)
-                        .await
-                        .into_iter()
-                        .flatten()
-                        .filter(|string_match| processed_matches.insert(string_match.candidate_id))
-                        .filter_map(|string_match| open_buffers.get(string_match.candidate_id))
-                        .cloned()
-                        .collect()
-                };
-                Ok(matched_items)
-            })
-            .await
+                queries
+                    .iter()
+                    .filter_map(|query| match_candidates.get(query))
+                    .flatten()
+                    .copied()
+                    .filter_map(|id| open_buffers.get(id))
+                    .cloned()
+                    .collect()
+            } else {
+                let match_candidates = open_buffers
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(id, (full_path, ..))| {
+                        let path_string = full_path.as_deref()?.to_string_lossy().to_string();
+                        Some(fuzzy::StringMatchCandidate::new(id, &path_string))
+                    })
+                    .collect::<Vec<_>>();
+                let mut processed_matches = HashSet::default();
+                let file_queries = queries.iter().map(|query| {
+                    fuzzy::match_strings(
+                        &match_candidates,
+                        query,
+                        true,
+                        usize::MAX,
+                        &cancel,
+                        background_executor.clone(),
+                    )
+                });
+
+                join_all(file_queries)
+                    .await
+                    .into_iter()
+                    .flatten()
+                    .filter(|string_match| processed_matches.insert(string_match.candidate_id))
+                    .filter_map(|string_match| open_buffers.get(string_match.candidate_id))
+                    .cloned()
+                    .collect()
+            };
+            Ok(matched_items)
+        })
+        .await
    })
 }

--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -513,7 +513,7 @@ impl AutoUpdater {
        should_show: bool,
        cx: &App,
    ) -> Task<Result<()>> {
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            if should_show {
                KEY_VALUE_STORE
                    .write_kvp(
@@ -531,7 +531,7 @@ impl AutoUpdater {
    }

    pub fn should_show_update_notification(&self, cx: &App) -> Task<Result<bool>> {
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            Ok(KEY_VALUE_STORE
                .read_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY)?
                .is_some())
--- a/crates/auto_update_ui/Cargo.toml
+++ b/crates/auto_update_ui/Cargo.toml
@@ -19,7 +19,6 @@ editor.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 markdown_preview.workspace = true
-menu.workspace = true
 release_channel.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -1,19 +1,17 @@
-mod update_notification;
-
 use auto_update::AutoUpdater;
+use client::proto::UpdateNotification;
 use editor::{Editor, MultiBuffer};
-use gpui::{actions, prelude::*, App, Context, Entity, SharedString, Window};
+use gpui::{actions, prelude::*, App, Context, DismissEvent, Entity, SharedString, Window};
 use http_client::HttpClient;
 use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView};
 use release_channel::{AppVersion, ReleaseChannel};
 use serde::Deserialize;
 use smol::io::AsyncReadExt;
 use util::ResultExt as _;
+use workspace::notifications::simple_message_notification::MessageNotification;
 use workspace::notifications::{show_app_notification, NotificationId};
 use workspace::Workspace;

-use crate::update_notification::UpdateNotification;
-
 actions!(auto_update, [ViewReleaseNotesLocally]);

 pub fn init(cx: &mut App) {
@@ -131,19 +129,32 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
    let Some(updater) = AutoUpdater::get(cx) else {
        return;
    };
-    let version = updater.read(cx).current_version();
    let should_show_notification = updater.read(cx).should_show_update_notification(cx);
-
    cx.spawn(|cx| async move {
        let should_show_notification = should_show_notification.await?;
        if should_show_notification {
            cx.update(|cx| {
+                let version = updater.read(cx).current_version();
+                let app_name = ReleaseChannel::global(cx).display_name();
                show_app_notification(
                    NotificationId::unique::<UpdateNotification>(),
                    cx,
                    move |cx| {
                        let workspace_handle = cx.entity().downgrade();
-                        cx.new(|_| UpdateNotification::new(version, workspace_handle))
+                        cx.new(|_cx| {
+                            MessageNotification::new(format!("Updated to {app_name} {}", version))
+                                .primary_message("View Release Notes")
+                                .primary_on_click(move |window, cx| {
+                                    if let Some(workspace) = workspace_handle.upgrade() {
+                                        workspace.update(cx, |workspace, cx| {
+                                            crate::view_release_notes_locally(
+                                                workspace, window, cx,
+                                            );
+                                        })
+                                    }
+                                    cx.emit(DismissEvent);
+                                })
+                        })
                    },
                );
                updater.update(cx, |updater, cx| {
--- a/crates/auto_update_ui/src/update_notification.rs
+++ b/crates/auto_update_ui/src/update_notification.rs
@@ -1,70 +0,0 @@
-use gpui::{
-    div, Context, DismissEvent, EventEmitter, InteractiveElement, IntoElement, ParentElement,
-    Render, SemanticVersion, StatefulInteractiveElement, Styled, WeakEntity, Window,
-};
-use menu::Cancel;
-use release_channel::ReleaseChannel;
-use util::ResultExt;
-use workspace::{
-    ui::{h_flex, v_flex, Icon, IconName, Label, StyledExt},
-    Workspace,
-};
-
-pub struct UpdateNotification {
-    version: SemanticVersion,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl EventEmitter<DismissEvent> for UpdateNotification {}
-
-impl Render for UpdateNotification {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let app_name = ReleaseChannel::global(cx).display_name();
-
-        v_flex()
-            .on_action(cx.listener(UpdateNotification::dismiss))
-            .elevation_3(cx)
-            .p_4()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(Label::new(format!(
-                        "Updated to {app_name} {}",
-                        self.version
-                    )))
-                    .child(
-                        div()
-                            .id("cancel")
-                            .child(Icon::new(IconName::Close))
-                            .cursor_pointer()
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dismiss(&menu::Cancel, window, cx)
-                            })),
-                    ),
-            )
-            .child(
-                div()
-                    .id("notes")
-                    .child(Label::new("View the release notes"))
-                    .cursor_pointer()
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.workspace
-                            .update(cx, |workspace, cx| {
-                                crate::view_release_notes_locally(workspace, window, cx);
-                            })
-                            .log_err();
-                        this.dismiss(&menu::Cancel, window, cx)
-                    })),
-            )
-    }
-}
-
-impl UpdateNotification {
-    pub fn new(version: SemanticVersion, workspace: WeakEntity<Workspace>) -> Self {
-        Self { version, workspace }
-    }
-
-    pub fn dismiss(&mut self, _: &Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -1,6 +1,6 @@
 use futures::{channel::oneshot, future::OptionFuture};
 use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch};
-use gpui::{App, AsyncApp, Context, Entity, EventEmitter};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter};
 use language::{Language, LanguageRegistry};
 use rope::Rope;
 use std::{cmp, future::Future, iter, ops::Range, sync::Arc};
@@ -615,11 +615,9 @@ impl BufferDiff {
                cx,
            )
        });
-        let base_text_snapshot = cx
-            .background_executor()
-            .spawn(OptionFuture::from(base_text_snapshot));
+        let base_text_snapshot = cx.background_spawn(OptionFuture::from(base_text_snapshot));

-        let hunks = cx.background_executor().spawn({
+        let hunks = cx.background_spawn({
            let buffer = buffer.clone();
            async move { compute_hunks(diff_base, buffer) }
        });
@@ -641,7 +639,7 @@ impl BufferDiff {
                .clone()
                .map(|buffer| buffer.as_rope().clone()),
        );
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            BufferDiffInner {
                hunks: compute_hunks(diff_base, buffer),
                base_text: diff_base_buffer,
@@ -721,7 +719,6 @@ impl BufferDiff {
        Some(start..end)
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn update_diff(
        this: Entity<BufferDiff>,
        buffer: text::BufferSnapshot,
@@ -999,7 +996,7 @@ mod tests {
    use std::fmt::Write as _;

    use super::*;
-    use gpui::{AppContext as _, TestAppContext};
+    use gpui::TestAppContext;
    use rand::{rngs::StdRng, Rng as _};
    use text::{Buffer, BufferId, Rope};
    use unindent::Unindent as _;
--- a/crates/call/src/cross_platform/mod.rs
+++ b/crates/call/src/cross_platform/mod.rs
@@ -241,7 +241,7 @@ impl ActiveCall {
                })
                .shared();
            self.pending_room_creation = Some(room.clone());
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                room.await.map_err(|err| anyhow!("{:?}", err))?;
                anyhow::Ok(())
            })
@@ -278,7 +278,7 @@ impl ActiveCall {
        };

        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::CancelCall {
                    room_id,
--- a/crates/call/src/cross_platform/room.rs
+++ b/crates/call/src/cross_platform/room.rs
@@ -13,7 +13,7 @@ use client::{
 use collections::{BTreeMap, HashMap, HashSet};
 use fs::Fs;
 use futures::{FutureExt, StreamExt};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
 use language::LanguageRegistry;
 #[cfg(not(all(target_os = "windows", target_env = "gnu")))]
 use livekit::{
@@ -255,7 +255,7 @@ impl Room {
    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> impl Future<Output = ()> {
        let task = if self.status.is_online() {
            let leave = self.leave_internal(cx);
-            Some(cx.background_executor().spawn(async move {
+            Some(cx.background_spawn(async move {
                leave.await.log_err();
            }))
        } else {
@@ -322,7 +322,7 @@ impl Room {
        self.clear_state(cx);

        let leave_room = self.client.request(proto::LeaveRoom {});
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            leave_room.await?;
            anyhow::Ok(())
        })
@@ -1248,7 +1248,7 @@ impl Room {
        };

        cx.notify();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::UpdateParticipantLocation {
                    room_id,
@@ -1373,11 +1373,10 @@ impl Room {
                match publication {
                    Ok(publication) => {
                        if canceled {
-                            cx.background_executor()
-                                .spawn(async move {
-                                    participant.unpublish_track(&publication.sid()).await
-                                })
-                                .detach_and_log_err(cx)
+                            cx.background_spawn(async move {
+                                participant.unpublish_track(&publication.sid()).await
+                            })
+                            .detach_and_log_err(cx)
                        } else {
                            if live_kit.muted_by_user || live_kit.deafened {
                                publication.mute();
@@ -1465,11 +1464,10 @@ impl Room {
                match publication {
                    Ok(publication) => {
                        if canceled {
-                            cx.background_executor()
-                                .spawn(async move {
-                                    participant.unpublish_track(&publication.sid()).await
-                                })
-                                .detach()
+                            cx.background_spawn(async move {
+                                participant.unpublish_track(&publication.sid()).await
+                            })
+                            .detach()
                        } else {
                            live_kit.screen_track = LocalTrack::Published {
                                track_publication: publication,
@@ -1561,9 +1559,10 @@ impl Room {
                {
                    let local_participant = live_kit.room.local_participant();
                    let sid = track_publication.sid();
-                    cx.background_executor()
-                        .spawn(async move { local_participant.unpublish_track(&sid).await })
-                        .detach_and_log_err(cx);
+                    cx.background_spawn(
+                        async move { local_participant.unpublish_track(&sid).await },
+                    )
+                    .detach_and_log_err(cx);
                    cx.notify();
                }

@@ -1722,13 +1721,12 @@ impl LiveKitRoom {
        }

        let participant = self.room.local_participant();
-        cx.background_executor()
-            .spawn(async move {
-                for sid in tracks_to_unpublish {
-                    participant.unpublish_track(&sid).await.log_err();
-                }
-            })
-            .detach();
+        cx.background_spawn(async move {
+            for sid in tracks_to_unpublish {
+                participant.unpublish_track(&sid).await.log_err();
+            }
+        })
+        .detach();
    }
 }

--- a/crates/call/src/macos/mod.rs
+++ b/crates/call/src/macos/mod.rs
@@ -234,7 +234,7 @@ impl ActiveCall {
                })
                .shared();
            self.pending_room_creation = Some(room.clone());
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                room.await.map_err(|err| anyhow!("{:?}", err))?;
                anyhow::Ok(())
            })
@@ -271,7 +271,7 @@ impl ActiveCall {
        };

        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::CancelCall {
                    room_id,
--- a/crates/call/src/macos/room.rs
+++ b/crates/call/src/macos/room.rs
@@ -311,7 +311,7 @@ impl Room {
    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> impl Future<Output = ()> {
        let task = if self.status.is_online() {
            let leave = self.leave_internal(cx);
-            Some(cx.background_executor().spawn(async move {
+            Some(cx.background_spawn(async move {
                leave.await.log_err();
            }))
        } else {
@@ -378,7 +378,7 @@ impl Room {
        self.clear_state(cx);

        let leave_room = self.client.request(proto::LeaveRoom {});
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            leave_room.await?;
            anyhow::Ok(())
        })
@@ -1268,7 +1268,7 @@ impl Room {
        };

        cx.notify();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::UpdateParticipantLocation {
                    room_id,
@@ -1385,9 +1385,7 @@ impl Room {
                                live_kit.room.unpublish_track(publication);
                            } else {
                                if live_kit.muted_by_user || live_kit.deafened {
-                                    cx.background_executor()
-                                        .spawn(publication.set_mute(true))
-                                        .detach();
+                                    cx.background_spawn(publication.set_mute(true)).detach();
                                }
                                live_kit.microphone_track = LocalTrack::Published {
                                    track_publication: publication,
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -514,8 +514,7 @@ impl ChannelStore {
                }
            }
        };
-        cx.background_executor()
-            .spawn(async move { task.await.map_err(|error| anyhow!("{}", error)) })
+        cx.background_spawn(async move { task.await.map_err(|error| anyhow!("{}", error)) })
    }

    pub fn is_channel_admin(&self, channel_id: ChannelId) -> bool {
@@ -781,7 +780,7 @@ impl ChannelStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::RespondToChannelInvite {
                    channel_id: channel_id.0,
@@ -975,21 +974,18 @@ impl ChannelStore {

                                if let Some(operations) = operations {
                                    let client = this.client.clone();
-                                    cx.background_executor()
-                                        .spawn(async move {
-                                            let operations = operations.await;
-                                            for chunk in
-                                                language::proto::split_operations(operations)
-                                            {
-                                                client
-                                                    .send(proto::UpdateChannelBuffer {
-                                                        channel_id: channel_id.0,
-                                                        operations: chunk,
-                                                    })
-                                                    .ok();
-                                            }
-                                        })
-                                        .detach();
+                                    cx.background_spawn(async move {
+                                        let operations = operations.await;
+                                        for chunk in language::proto::split_operations(operations) {
+                                            client
+                                                .send(proto::UpdateChannelBuffer {
+                                                    channel_id: channel_id.0,
+                                                    operations: chunk,
+                                                })
+                                                .ok();
+                                        }
+                                    })
+                                    .detach();
                                    return true;
                                }
                            }
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -19,7 +19,7 @@ use futures::{
    channel::oneshot, future::BoxFuture, AsyncReadExt, FutureExt, SinkExt, Stream, StreamExt,
    TryFutureExt as _, TryStreamExt,
 };
-use gpui::{actions, App, AsyncApp, Entity, Global, Task, WeakEntity};
+use gpui::{actions, App, AppContext as _, AsyncApp, Entity, Global, Task, WeakEntity};
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use parking_lot::RwLock;
 use postage::watch;
@@ -1064,7 +1064,7 @@ impl Client {
        let rpc_url = self.rpc_url(http, release_channel);
        let system_id = self.telemetry.system_id();
        let metrics_id = self.telemetry.metrics_id();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            use HttpOrHttps::*;

            #[derive(Debug)]
@@ -1743,7 +1743,7 @@ mod tests {
    use crate::test::FakeServer;

    use clock::FakeSystemClock;
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};
+    use gpui::{BackgroundExecutor, TestAppContext};
    use http_client::FakeHttpClient;
    use parking_lot::Mutex;
    use proto::TypedEnvelope;
@@ -1806,7 +1806,7 @@ mod tests {

        // Time out when client tries to connect.
        client.override_authenticate(move |cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                Ok(Credentials {
                    user_id,
                    access_token: "token".into(),
@@ -1814,7 +1814,7 @@ mod tests {
            })
        });
        client.override_establish_connection(|_, cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                future::pending::<()>().await;
                unreachable!()
            })
@@ -1848,7 +1848,7 @@ mod tests {
        // Time out when re-establishing the connection.
        server.allow_connections();
        client.override_establish_connection(|_, cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                future::pending::<()>().await;
                unreachable!()
            })
@@ -1887,7 +1887,7 @@ mod tests {
            move |cx| {
                let auth_count = auth_count.clone();
                let dropped_auth_count = dropped_auth_count.clone();
-                cx.background_executor().spawn(async move {
+                cx.background_spawn(async move {
                    *auth_count.lock() += 1;
                    let _drop = util::defer(move || *dropped_auth_count.lock() += 1);
                    future::pending::<()>().await;
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use clock::SystemClock;
 use futures::channel::mpsc;
 use futures::{Future, StreamExt};
-use gpui::{App, BackgroundExecutor, Task};
+use gpui::{App, AppContext as _, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
@@ -219,18 +219,17 @@ impl Telemetry {
        }));
        Self::log_file_path();

-        cx.background_executor()
-            .spawn({
-                let state = state.clone();
-                let os_version = os_version();
-                state.lock().os_version = Some(os_version.clone());
-                async move {
-                    if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
-                        state.lock().log_file = Some(tempfile);
-                    }
+        cx.background_spawn({
+            let state = state.clone();
+            let os_version = os_version();
+            state.lock().os_version = Some(os_version.clone());
+            async move {
+                if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
+                    state.lock().log_file = Some(tempfile);
                }
-            })
-            .detach();
+            }
+        })
+        .detach();

        cx.observe_global::<SettingsStore>({
            let state = state.clone();
@@ -252,17 +251,16 @@ impl Telemetry {
        let (tx, mut rx) = mpsc::unbounded();
        ::telemetry::init(tx);

-        cx.background_executor()
-            .spawn({
-                let this = Arc::downgrade(&this);
-                async move {
-                    while let Some(event) = rx.next().await {
-                        let Some(state) = this.upgrade() else { break };
-                        state.report_event(Event::Flexible(event))
-                    }
+        cx.background_spawn({
+            let this = Arc::downgrade(&this);
+            async move {
+                while let Some(event) = rx.next().await {
+                    let Some(state) = this.upgrade() else { break };
+                    state.report_event(Event::Flexible(event))
                }
-            })
-            .detach();
+            }
+        })
+        .detach();

        // We should only ever have one instance of Telemetry, leak the subscription to keep it alive
        // rather than store in TelemetryState, complicating spawn as subscriptions are not Send
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -85,7 +85,7 @@ impl FakeServer {
                            Connection::in_memory(cx.background_executor().clone());
                        let (connection_id, io, incoming) =
                            peer.add_test_connection(server_conn, cx.background_executor().clone());
-                        cx.background_executor().spawn(io).detach();
+                        cx.background_spawn(io).detach();
                        {
                            let mut state = state.lock();
                            state.connection_id = Some(connection_id);
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -89,11 +89,8 @@ channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
 collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
-command_palette_hooks.workspace = true
 context_server.workspace = true
 ctor.workspace = true
-dap = { workspace = true, features = ["test-support"] }
-debugger_ui = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 extension.workspace = true
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -469,14 +469,3 @@ CREATE TABLE IF NOT EXISTS processed_stripe_events (
 );

 CREATE INDEX "ix_processed_stripe_events_on_stripe_event_created_timestamp" ON processed_stripe_events (stripe_event_created_timestamp);
-
-CREATE TABLE IF NOT EXISTS "breakpoints" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "position" INTEGER NOT NULL,
-    "log_message" TEXT NULL,
-    "worktree_id" BIGINT NOT NULL,
-    "path" TEXT NOT NULL,
-    "kind" VARCHAR NOT NULL
-);
-CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");
--- a/crates/collab/migrations/20241121185750_add_breakpoints.sql
+++ b/crates/collab/migrations/20241121185750_add_breakpoints.sql
@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS "breakpoints" (
-    "id" SERIAL PRIMARY KEY,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "position" INTEGER NOT NULL,
-    "log_message" TEXT NULL,
-    "worktree_id" BIGINT NOT NULL,
-    "path" TEXT NOT NULL,
-    "kind" VARCHAR NOT NULL
-);
-
-CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -659,7 +659,6 @@ pub struct RejoinedProject {
    pub collaborators: Vec<ProjectCollaborator>,
    pub worktrees: Vec<RejoinedWorktree>,
    pub language_servers: Vec<proto::LanguageServer>,
-    pub breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>>,
 }

 impl RejoinedProject {
@@ -682,17 +681,6 @@ impl RejoinedProject {
                .map(|collaborator| collaborator.to_proto())
                .collect(),
            language_servers: self.language_servers.clone(),
-            breakpoints: self
-                .breakpoints
-                .iter()
-                .map(
-                    |(project_path, breakpoints)| proto::SynchronizeBreakpoints {
-                        project_id: self.id.to_proto(),
-                        breakpoints: breakpoints.iter().cloned().collect(),
-                        project_path: Some(project_path.clone()),
-                    },
-                )
-                .collect(),
        }
    }
 }
@@ -739,7 +727,6 @@ pub struct Project {
    pub collaborators: Vec<ProjectCollaborator>,
    pub worktrees: BTreeMap<u64, Worktree>,
    pub language_servers: Vec<proto::LanguageServer>,
-    pub breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>>,
 }

 pub struct ProjectCollaborator {
--- a/crates/collab/src/db/ids.rs
+++ b/crates/collab/src/db/ids.rs
@@ -94,9 +94,6 @@ id_type!(RoomParticipantId);
 id_type!(ServerId);
 id_type!(SignupId);
 id_type!(UserId);
-id_type!(DebugClientId);
-id_type!(SessionId);
-id_type!(ThreadId);

 /// ChannelRole gives you permissions for both channels and calls.
 #[derive(
--- a/crates/collab/src/db/queries/messages.rs
+++ b/crates/collab/src/db/queries/messages.rs
@@ -229,7 +229,6 @@ impl Database {
    }

    /// Creates a new channel message.
-    #[allow(clippy::too_many_arguments)]
    pub async fn create_channel_message(
        &self,
        channel_id: ChannelId,
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -1,5 +1,5 @@
 use anyhow::Context as _;
-use collections::{HashMap, HashSet};
+
 use util::ResultExt;

 use super::*;
@@ -571,60 +571,6 @@ impl Database {
        .await
    }

-    pub async fn update_breakpoints(
-        &self,
-        connection_id: ConnectionId,
-        update: &proto::SynchronizeBreakpoints,
-    ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        self.project_transaction(project_id, |tx| async move {
-            let project_path = update
-                .project_path
-                .as_ref()
-                .ok_or_else(|| anyhow!("invalid project path"))?;
-
-            // Ensure the update comes from the host.
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("no such project"))?;
-
-            // remove all existing breakpoints
-            breakpoints::Entity::delete_many()
-                .filter(breakpoints::Column::ProjectId.eq(project.id))
-                .exec(&*tx)
-                .await?;
-
-            if !update.breakpoints.is_empty() {
-                breakpoints::Entity::insert_many(update.breakpoints.iter().map(|breakpoint| {
-                    breakpoints::ActiveModel {
-                        id: ActiveValue::NotSet,
-                        project_id: ActiveValue::Set(project_id),
-                        worktree_id: ActiveValue::Set(project_path.worktree_id as i64),
-                        path: ActiveValue::Set(project_path.path.clone()),
-                        kind: match proto::BreakpointKind::from_i32(breakpoint.kind) {
-                            Some(proto::BreakpointKind::Log) => {
-                                ActiveValue::Set(breakpoints::BreakpointKind::Log)
-                            }
-                            Some(proto::BreakpointKind::Standard) => {
-                                ActiveValue::Set(breakpoints::BreakpointKind::Standard)
-                            }
-                            None => ActiveValue::Set(breakpoints::BreakpointKind::Standard),
-                        },
-                        log_message: ActiveValue::Set(breakpoint.message.clone()),
-                        position: ActiveValue::Set(breakpoint.cached_position as i32),
-                    }
-                }))
-                .exec_without_returning(&*tx)
-                .await?;
-            }
-
-            self.internal_project_connection_ids(project_id, connection_id, true, &tx)
-                .await
-        })
-        .await
-    }
-
    /// Updates the worktree settings for the given connection.
    pub async fn update_worktree_settings(
        &self,
@@ -906,33 +852,6 @@ impl Database {
            }
        }

-        let mut breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>> =
-            HashMap::default();
-
-        let db_breakpoints = project.find_related(breakpoints::Entity).all(tx).await?;
-
-        for breakpoint in db_breakpoints.iter() {
-            let project_path = proto::ProjectPath {
-                worktree_id: breakpoint.worktree_id as u64,
-                path: breakpoint.path.clone(),
-            };
-
-            breakpoints
-                .entry(project_path)
-                .or_default()
-                .insert(proto::Breakpoint {
-                    position: None,
-                    cached_position: breakpoint.position as u32,
-                    kind: match breakpoint.kind {
-                        breakpoints::BreakpointKind::Standard => {
-                            proto::BreakpointKind::Standard.into()
-                        }
-                        breakpoints::BreakpointKind::Log => proto::BreakpointKind::Log.into(),
-                    },
-                    message: breakpoint.log_message.clone(),
-                });
-        }
-
        // Populate language servers.
        let language_servers = project
            .find_related(language_server::Entity)
@@ -960,7 +879,6 @@ impl Database {
                    worktree_id: None,
                })
                .collect(),
-            breakpoints,
        };
        Ok((project, replica_id as ReplicaId))
    }
@@ -1188,52 +1106,41 @@ impl Database {
        exclude_dev_server: bool,
    ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
        self.project_transaction(project_id, |tx| async move {
-            self.internal_project_connection_ids(project_id, connection_id, exclude_dev_server, &tx)
-                .await
+            let project = project::Entity::find_by_id(project_id)
+                .one(&*tx)
+                .await?
+                .ok_or_else(|| anyhow!("no such project"))?;
+
+            let mut collaborators = project_collaborator::Entity::find()
+                .filter(project_collaborator::Column::ProjectId.eq(project_id))
+                .stream(&*tx)
+                .await?;
+
+            let mut connection_ids = HashSet::default();
+            if let Some(host_connection) = project.host_connection().log_err() {
+                if !exclude_dev_server {
+                    connection_ids.insert(host_connection);
+                }
+            }
+
+            while let Some(collaborator) = collaborators.next().await {
+                let collaborator = collaborator?;
+                connection_ids.insert(collaborator.connection());
+            }
+
+            if connection_ids.contains(&connection_id)
+                || Some(connection_id) == project.host_connection().ok()
+            {
+                Ok(connection_ids)
+            } else {
+                Err(anyhow!(
+                    "can only send project updates to a project you're in"
+                ))?
+            }
        })
        .await
    }

-    async fn internal_project_connection_ids(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        exclude_dev_server: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<HashSet<ConnectionId>> {
-        let project = project::Entity::find_by_id(project_id)
-            .one(tx)
-            .await?
-            .ok_or_else(|| anyhow!("no such project"))?;
-
-        let mut collaborators = project_collaborator::Entity::find()
-            .filter(project_collaborator::Column::ProjectId.eq(project_id))
-            .stream(tx)
-            .await?;
-
-        let mut connection_ids = HashSet::default();
-        if let Some(host_connection) = project.host_connection().log_err() {
-            if !exclude_dev_server {
-                connection_ids.insert(host_connection);
-            }
-        }
-
-        while let Some(collaborator) = collaborators.next().await {
-            let collaborator = collaborator?;
-            connection_ids.insert(collaborator.connection());
-        }
-
-        if connection_ids.contains(&connection_id)
-            || Some(connection_id) == project.host_connection().ok()
-        {
-            Ok(connection_ids)
-        } else {
-            Err(anyhow!(
-                "can only send project updates to a project you're in"
-            ))?
-        }
-    }
-
    async fn project_guest_connection_ids(
        &self,
        project_id: ProjectId,
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -765,33 +765,6 @@ impl Database {
            worktrees.push(worktree);
        }

-        let mut breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>> =
-            HashMap::default();
-
-        let db_breakpoints = project.find_related(breakpoints::Entity).all(tx).await?;
-
-        for breakpoint in db_breakpoints.iter() {
-            let project_path = proto::ProjectPath {
-                worktree_id: breakpoint.worktree_id as u64,
-                path: breakpoint.path.clone(),
-            };
-
-            breakpoints
-                .entry(project_path)
-                .or_default()
-                .insert(proto::Breakpoint {
-                    position: None,
-                    cached_position: breakpoint.position as u32,
-                    kind: match breakpoint.kind {
-                        breakpoints::BreakpointKind::Standard => {
-                            proto::BreakpointKind::Standard.into()
-                        }
-                        breakpoints::BreakpointKind::Log => proto::BreakpointKind::Log.into(),
-                    },
-                    message: breakpoint.log_message.clone(),
-                });
-        }
-
        let language_servers = project
            .find_related(language_server::Entity)
            .all(tx)
@@ -861,7 +834,6 @@ impl Database {
            collaborators,
            worktrees,
            language_servers,
-            breakpoints,
        }))
    }

--- a/crates/collab/src/db/queries/users.rs
+++ b/crates/collab/src/db/queries/users.rs
@@ -122,7 +122,6 @@ impl Database {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn get_or_create_user_by_github_account_tx(
        &self,
        github_login: &str,
--- a/crates/collab/src/db/tables.rs
+++ b/crates/collab/src/db/tables.rs
@@ -2,7 +2,6 @@ pub mod access_token;
 pub mod billing_customer;
 pub mod billing_preference;
 pub mod billing_subscription;
-pub mod breakpoints;
 pub mod buffer;
 pub mod buffer_operation;
 pub mod buffer_snapshot;
--- a/crates/collab/src/db/tables/breakpoints.rs
+++ b/crates/collab/src/db/tables/breakpoints.rs
@@ -1,47 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "breakpoints")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    pub worktree_id: i64,
-    pub path: String,
-    pub kind: BreakpointKind,
-    pub log_message: Option<String>,
-    pub position: i32,
-}
-
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default, Hash, serde::Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum BreakpointKind {
-    #[default]
-    #[sea_orm(string_value = "standard")]
-    Standard,
-    #[sea_orm(string_value = "log")]
-    Log,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/db/tables/project.rs
+++ b/crates/collab/src/db/tables/project.rs
@@ -49,8 +49,6 @@ pub enum Relation {
    Collaborators,
    #[sea_orm(has_many = "super::language_server::Entity")]
    LanguageServers,
-    #[sea_orm(has_many = "super::breakpoints::Entity")]
-    Breakpoints,
 }

 impl Related<super::user::Entity> for Entity {
@@ -83,10 +81,4 @@ impl Related<super::language_server::Entity> for Entity {
    }
 }

-impl Related<super::breakpoints::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Breakpoints.def()
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/db/queries/usages.rs
+++ b/crates/collab/src/llm/db/queries/usages.rs
@@ -289,7 +289,6 @@ impl LlmDatabase {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    pub async fn record_usage(
        &self,
        user_id: UserId,
@@ -554,7 +553,6 @@ impl LlmDatabase {
        .await
    }

-    #[allow(clippy::too_many_arguments)]
    async fn update_usage_for_measure(
        &self,
        user_id: UserId,
--- a/crates/collab/src/llm/token.rs
+++ b/crates/collab/src/llm/token.rs
@@ -33,7 +33,6 @@ pub struct LlmTokenClaims {
 const LLM_TOKEN_LIFETIME: Duration = Duration::from_secs(60 * 60);

 impl LlmTokenClaims {
-    #[allow(clippy::too_many_arguments)]
    pub fn create(
        user: &user::Model,
        is_staff: bool,
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -423,40 +423,7 @@ impl Server {
                        app_state.config.openai_api_key.clone(),
                    )
                }
-            })
-            .add_message_handler(update_breakpoints)
-            .add_message_handler(broadcast_project_message_from_host::<proto::SetActiveDebugLine>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::RemoveActiveDebugLine>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateDebugAdapter>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::SetDebugClientCapabilities>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::ShutdownDebugClient>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapNextRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepInRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepOutRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepBackRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapContinueRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapPauseRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapDisconnectRequest>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::DapTerminateThreadsRequest>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::DapRestartRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapTerminateRequest>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateThreadStatus>)
-            .add_request_handler(forward_mutating_project_request::<proto::VariablesRequest>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::DapRestartStackFrameRequest>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::ToggleIgnoreBreakpoints>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::IgnoreBreakpointState>,
-            );
+            });

        Arc::new(server)
    }
@@ -724,7 +691,6 @@ impl Server {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    pub fn handle_connection(
        self: &Arc<Self>,
        connection: Connection,
@@ -1108,7 +1074,6 @@ pub fn routes(server: Arc<Server>) -> Router<(), Body> {
        .layer(Extension(server))
 }

-#[allow(clippy::too_many_arguments)]
 pub async fn handle_websocket_request(
    TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
    app_version_header: Option<TypedHeader<AppVersionHeader>>,
@@ -1896,18 +1861,6 @@ fn join_project_internal(
            .trace_err();
    }

-    let breakpoints = project
-        .breakpoints
-        .iter()
-        .map(
-            |(project_path, breakpoint_set)| proto::SynchronizeBreakpoints {
-                project_id: project.id.0 as u64,
-                breakpoints: breakpoint_set.iter().map(|bp| bp.clone()).collect(),
-                project_path: Some(project_path.clone()),
-            },
-        )
-        .collect();
-
    // First, we send the metadata associated with each worktree.
    response.send(proto::JoinProjectResponse {
        project_id: project.id.0 as u64,
@@ -1916,7 +1869,6 @@ fn join_project_internal(
        collaborators: collaborators.clone(),
        language_servers: project.language_servers.clone(),
        role: project.role.into(),
-        breakpoints,
    })?;

    for (worktree_id, worktree) in mem::take(&mut project.worktrees) {
@@ -2103,7 +2055,7 @@ async fn update_worktree_settings(
    Ok(())
 }

-/// Notify other participants that a language server has started.
+/// Notify other participants that a  language server has started.
 async fn start_language_server(
    request: proto::StartLanguageServer,
    session: Session,
@@ -2149,29 +2101,6 @@ async fn update_language_server(
    Ok(())
 }

-/// Notify other participants that breakpoints have changed.
-async fn update_breakpoints(
-    request: proto::SynchronizeBreakpoints,
-    session: Session,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_breakpoints(session.connection_id, &request)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    Ok(())
-}
-
 /// forward a project request to the host. These requests should be read only
 /// as guests are allowed to send them.
 async fn forward_read_only_project_request<T>(
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -11,7 +11,6 @@ mod channel_buffer_tests;
 mod channel_guest_tests;
 mod channel_message_tests;
 mod channel_tests;
-mod debug_panel_tests;
 mod editor_tests;
 mod following_tests;
 mod integration_tests;
--- a/crates/collab/src/tests/debug_panel_tests.rs
+++ b/crates/collab/src/tests/debug_panel_tests.rs
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -22,7 +22,7 @@ use language::{
 };
 use project::{
    project_settings::{InlineBlameSettings, ProjectSettings},
-    ProjectPath, SERVER_PROGRESS_THROTTLE_TIMEOUT,
+    SERVER_PROGRESS_THROTTLE_TIMEOUT,
 };
 use recent_projects::disconnected_overlay::DisconnectedOverlay;
 use rpc::RECEIVE_TIMEOUT;
@@ -1591,8 +1591,6 @@ async fn test_mutual_editor_inlay_hint_cache_update(
        .await
        .unwrap();

-    executor.run_until_parked();
-
    // Client B joins the project
    let project_b = client_b.join_remote_project(project_id, cx_b).await;
    active_call_b
@@ -2396,202 +2394,6 @@ fn main() { let foo = other::foo(); }"};
    );
 }

-#[gpui::test]
-async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "test.txt": "one\ntwo\nthree\nfour\nfive",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let project_path = ProjectPath {
-        worktree_id,
-        path: Arc::from(Path::new(&"test.txt")),
-    };
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Client A opens an editor.
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens same editor as A.
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Client A adds breakpoint on line (1)
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-
-    // Client B adds breakpoint on line(2)
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(2, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client A removes last added breakpoint from client B
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client B removes first added breakpoint by client A
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(0, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-}
-
 #[track_caller]
 fn tab_undo_assert(
    cx_a: &mut EditorTestContext,
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -463,7 +463,6 @@ impl<T: RandomizedTest> TestPlan<T> {
        })
    }

-    #[allow(clippy::too_many_arguments)]
    async fn apply_server_operation(
        plan: Arc<Mutex<Self>>,
        deterministic: BackgroundExecutor,
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -244,18 +244,17 @@ impl TestServer {
                            .await
                            .expect("retrieving user failed")
                            .unwrap();
-                        cx.background_executor()
-                            .spawn(server.handle_connection(
-                                server_conn,
-                                client_name,
-                                Principal::User(user),
-                                ZedVersion(SemanticVersion::new(1, 0, 0)),
-                                None,
-                                None,
-                                Some(connection_id_tx),
-                                Executor::Deterministic(cx.background_executor().clone()),
-                            ))
-                            .detach();
+                        cx.background_spawn(server.handle_connection(
+                            server_conn,
+                            client_name,
+                            Principal::User(user),
+                            ZedVersion(SemanticVersion::new(1, 0, 0)),
+                            None,
+                            None,
+                            Some(connection_id_tx),
+                            Executor::Deterministic(cx.background_executor().clone()),
+                        ))
+                        .detach();
                        let connection_id = connection_id_rx.await.map_err(|e| {
                            EstablishConnectionError::Other(anyhow!(
                                "{} (is server shutting down?)",
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -201,8 +201,7 @@ impl ChatPanel {
    ) -> Task<Result<Entity<Self>>> {
        cx.spawn(|mut cx| async move {
            let serialized_panel = if let Some(panel) = cx
-                .background_executor()
-                .spawn(async move { KEY_VALUE_STORE.read_kvp(CHAT_PANEL_KEY) })
+                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(CHAT_PANEL_KEY) })
                .await
                .log_err()
                .flatten()
@@ -227,7 +226,7 @@ impl ChatPanel {

    fn serialize(&mut self, cx: &mut Context<Self>) {
        let width = self.width;
-        self.pending_serialization = cx.background_executor().spawn(
+        self.pending_serialization = cx.background_spawn(
            async move {
                KEY_VALUE_STORE
                    .write_kvp(
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -454,8 +454,7 @@ impl MessageEditor {
        mut cx: AsyncWindowContext,
    ) {
        let (buffer, ranges) = cx
-            .background_executor()
-            .spawn(async move {
+            .background_spawn(async move {
                let ranges = MENTIONS_SEARCH.search(&buffer, None).await;
                (buffer, ranges)
            })
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -319,8 +319,7 @@ impl CollabPanel {
        mut cx: AsyncWindowContext,
    ) -> anyhow::Result<Entity<Self>> {
        let serialized_panel = cx
-            .background_executor()
-            .spawn(async move { KEY_VALUE_STORE.read_kvp(COLLABORATION_PANEL_KEY) })
+            .background_spawn(async move { KEY_VALUE_STORE.read_kvp(COLLABORATION_PANEL_KEY) })
            .await
            .map_err(|_| anyhow::anyhow!("Failed to read collaboration panel from key value store"))
            .log_err()
@@ -351,7 +350,7 @@ impl CollabPanel {
    fn serialize(&mut self, cx: &mut Context<Self>) {
        let width = self.width;
        let collapsed_channels = self.collapsed_channels.clone();
-        self.pending_serialization = cx.background_executor().spawn(
+        self.pending_serialization = cx.background_spawn(
            async move {
                KEY_VALUE_STORE
                    .write_kvp(
@@ -870,7 +869,6 @@ impl CollabPanel {
            })
    }

-    #[allow(clippy::too_many_arguments)]
    fn render_participant_project(
        &self,
        project_id: u64,
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle"><circle cx="12" cy="12" r="10"/></svg>`