Theme chaos!

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Remove unneded ThemeColorField
2025-07-10 12:51:48 -04:00 · 2025-07-10 11:59:43 -04:00 · 2025-07-08 19:51:24 -03:00 · 2025-07-08 14:48:48 -06:00 · 2025-07-08 14:39:55 -05:00 · 2025-07-08 18:44:51 +00:00
388 changed files with 16496 additions and 10998 deletions
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -33,7 +33,6 @@ workspace-members = [
    "zed_emmet",
    "zed_glsl",
    "zed_html",
-    "perplexity",
    "zed_proto",
    "zed_ruff",
    "slash_commands_example",
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
          else
            echo "run_docs=false" >> $GITHUB_OUTPUT
          fi
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^Cargo.lock') ]]; then
+          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -P '^(Cargo.lock|script/.*licenses)') ]]; then
            echo "run_license=true" >> $GITHUB_OUTPUT
          else
            echo "run_license=false" >> $GITHUB_OUTPUT
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -5,9 +5,7 @@
    "build": {
      "label": "Build Zed",
      "command": "cargo",
-      "args": [
-        "build"
-      ]
+      "args": ["build"]
    }
  },
  {
@@ -16,9 +14,7 @@
    "build": {
      "label": "Build Zed",
      "command": "cargo",
-      "args": [
-        "build"
-      ]
+      "args": ["build"]
    }
-  },
+  }
 ]
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -538,6 +538,8 @@ dependencies = [
 "anyhow",
 "futures 0.3.31",
 "gpui",
+ "net",
+ "parking_lot",
 "smol",
 "tempfile",
 "util",
@@ -2076,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.6.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
 dependencies = [
 "ash",
 "ash-window",
@@ -2109,7 +2111,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2119,7 +2121,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.2.0"
-source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
+source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
 dependencies = [
 "blade-graphics",
 "bytemuck",
@@ -4324,6 +4326,7 @@ dependencies = [
 "futures 0.3.31",
 "fuzzy",
 "gpui",
+ "indoc",
 "itertools 0.14.0",
 "language",
 "log",
@@ -4344,6 +4347,7 @@ dependencies = [
 "tasks_ui",
 "telemetry",
 "terminal_view",
+ "text",
 "theme",
 "tree-sitter",
 "tree-sitter-go",
@@ -4830,6 +4834,7 @@ dependencies = [
 "tree-sitter-python",
 "tree-sitter-rust",
 "tree-sitter-typescript",
+ "tree-sitter-yaml",
 "ui",
 "unicode-script",
 "unicode-segmentation",
@@ -8950,6 +8955,7 @@ dependencies = [
 "credentials_provider",
 "deepseek",
 "editor",
+ "feature_flags",
 "fs",
 "futures 0.3.31",
 "google_ai",
@@ -9022,7 +9028,6 @@ dependencies = [
 "itertools 0.14.0",
 "language",
 "lsp",
- "picker",
 "project",
 "release_channel",
 "serde_json",
@@ -10229,6 +10234,18 @@ dependencies = [
 "jni-sys",
 ]

+[[package]]
+name = "net"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-io",
+ "smol",
+ "tempfile",
+ "windows 0.61.1",
+ "workspace-hack",
+]
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -11334,14 +11351,6 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

-[[package]]
-name = "perplexity"
-version = "0.1.0"
-dependencies = [
- "serde",
- "zed_extension_api 0.6.0",
-]
-
 [[package]]
 name = "pest"
 version = "2.8.0"
@@ -12258,6 +12267,7 @@ dependencies = [
 "language",
 "log",
 "lsp",
+ "markdown",
 "node_runtime",
 "parking_lot",
 "pathdiff",
@@ -12532,6 +12542,7 @@ dependencies = [
 "prost 0.9.0",
 "prost-build 0.9.0",
 "serde",
+ "typed-path",
 "workspace-hack",
 ]

@@ -13195,6 +13206,7 @@ dependencies = [
 "fs",
 "futures 0.3.31",
 "git",
+ "git2",
 "git_hosting_providers",
 "gpui",
 "gpui_tokio",
@@ -14567,6 +14579,7 @@ dependencies = [
 name = "settings_ui"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
 "collections",
 "command_palette",
 "command_palette_hooks",
@@ -14577,6 +14590,7 @@ dependencies = [
 "fs",
 "fuzzy",
 "gpui",
+ "language",
 "log",
 "menu",
 "paths",
@@ -14586,6 +14600,8 @@ dependencies = [
 "serde",
 "settings",
 "theme",
+ "tree-sitter-json",
+ "tree-sitter-rust",
 "ui",
 "util",
 "workspace",
@@ -17029,6 +17045,12 @@ dependencies = [
 "utf-8",
 ]

+[[package]]
+name = "typed-path"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c462d18470a2857aa657d338af5fa67170bb48bcc80a296710ce3b0802a32566"
+
 [[package]]
 name = "typeid"
 version = "1.0.3"
@@ -17342,6 +17364,7 @@ dependencies = [
 "rand 0.8.5",
 "regex",
 "rust-embed",
+ "schemars",
 "serde",
 "serde_json",
 "serde_json_lenient",
@@ -18274,6 +18297,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "client",
+ "feature_flags",
 "futures 0.3.31",
 "gpui",
 "http_client",
@@ -18351,7 +18375,6 @@ dependencies = [
 "language",
 "picker",
 "project",
- "schemars",
 "serde",
 "settings",
 "telemetry",
@@ -19939,7 +19962,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.194.0"
+version = "0.195.0"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -20137,9 +20160,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c740e29260b8797ad252c202ea09a255b3cbc13f30faaf92fb6b2490336106e0"
+checksum = "6607f74dee2a18a9ce0f091844944a0e59881359ab62e0768fb0618f55d4c1dc"
 dependencies = [
 "anyhow",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,6 +99,7 @@ members = [
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
+    "crates/net",
    "crates/node_runtime",
    "crates/notifications",
    "crates/ollama",
@@ -188,7 +189,6 @@ members = [
    "extensions/emmet",
    "extensions/glsl",
    "extensions/html",
-    "extensions/perplexity",
    "extensions/proto",
    "extensions/ruff",
    "extensions/slash-commands-example",
@@ -311,6 +311,7 @@ menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
 mistral = { path = "crates/mistral" }
 multi_buffer = { path = "crates/multi_buffer" }
+net = { path = "crates/net" }
 node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
@@ -425,9 +426,9 @@ aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -480,7 +481,7 @@ json_dotpath = "1.1"
 jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
-jupyter-websocket-client = {  git = "https://github.com/ConradIrwin/runtimed" ,rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+jupyter-websocket-client = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
@@ -491,7 +492,7 @@ metal = "0.29"
 moka = { version = "0.12.10", features = ["sync"] }
 naga = { version = "25.0", features = ["wgsl-in"] }
 nanoid = "0.4"
-nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+nbformat = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
 num-format = "0.4.4"
 objc = "0.2"
@@ -531,7 +532,7 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
    "stream",
 ] }
 rsa = "0.9.6"
-runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
+runtimelib = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rust-embed = { version = "8.4", features = ["include-exclude"] }
@@ -625,7 +626,7 @@ wasmtime = { version = "29", default-features = false, features = [
 wasmtime-wasi = "29"
 which = "6.0.0"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.8.5"
+zed_llm_client = "= 0.8.6"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
@@ -660,6 +661,7 @@ features = [
    "Win32_Graphics_Gdi",
    "Win32_Graphics_Imaging",
    "Win32_Graphics_Imaging_D2D",
+    "Win32_Networking_WinSock",
    "Win32_Security",
    "Win32_Security_Credentials",
    "Win32_Storage_FileSystem",
--- a/assets/icons/bolt_filled_alt.svg
+++ b/assets/icons/bolt_filled_alt.svg
@@ -1,3 +1,3 @@
 <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.75776 5.50003H8.49988C8.70769 5.50003 8.89518 5.62971 8.95455 5.82346C9.04049 6.01876 8.9858 6.23906 8.82956 6.37656L4.82971 9.87643C4.65315 10.0295 4.39488 10.042 4.20614 9.90455C4.01724 9.76705 3.94849 9.51706 4.04052 9.30301L5.24219 6.49999H3.48601C3.2918 6.49999 3.10524 6.37031 3.03197 6.17657C2.9587 5.98126 3.014 5.76096 3.1708 5.62346L7.17018 2.12375C7.34674 1.97001 7.60454 1.95829 7.7936 2.09547C7.98265 2.23275 8.0514 2.48218 7.95922 2.69695L6.75776 5.50003Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.98749 1.67322C7.08029 1.71878 7.15543 1.79374 7.20121 1.88643C7.24699 1.97912 7.26084 2.08434 7.24061 2.18572L6.72812 4.75007H9.28122C9.37107 4.75006 9.45903 4.77588 9.53463 4.82445C9.61022 4.87302 9.67027 4.94229 9.70761 5.02402C9.74495 5.10574 9.75801 5.19648 9.74524 5.28542C9.73247 5.37437 9.69441 5.45776 9.63559 5.52569L5.57313 10.2131C5.50536 10.2912 5.41366 10.3447 5.31233 10.3653C5.211 10.3858 5.10571 10.3723 5.01285 10.3268C4.92 10.2813 4.8448 10.2064 4.79896 10.1137C4.75311 10.021 4.7392 9.9158 4.75939 9.81439L5.27188 7.25004H2.71878C2.62893 7.25005 2.54097 7.22423 2.46537 7.17566C2.38978 7.12709 2.32973 7.05782 2.29239 6.97609C2.25505 6.89437 2.24199 6.80363 2.25476 6.71469C2.26753 6.62574 2.30559 6.54235 2.36441 6.47443L6.42687 1.78697C6.49466 1.70879 6.58641 1.65524 6.68782 1.63467C6.78923 1.61409 6.89459 1.62765 6.98749 1.67322Z" fill="black"/>
 </svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -34,7 +34,7 @@
      "ctrl-q": "zed::Quit",
      "f4": "debugger::Start",
      "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::Restart",
+      "ctrl-shift-f5": "debugger::RerunSession",
      "f6": "debugger::Pause",
      "f7": "debugger::StepOver",
      "ctrl-f11": "debugger::StepInto",
@@ -557,6 +557,13 @@
      "ctrl-b": "workspace::ToggleLeftDock",
      "ctrl-j": "workspace::ToggleBottomDock",
      "ctrl-alt-y": "workspace::CloseAllDocks",
+      "ctrl-alt-0": "workspace::ResetActiveDockSize",
+      // For 0px parameter, uses UI font size value.
+      "ctrl-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
+      "ctrl-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
+      "ctrl-alt-)": "workspace::ResetOpenDocksSize",
+      "ctrl-alt-_": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
+      "ctrl-alt-+": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
      "shift-find": "pane::DeploySearch",
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
@@ -598,7 +605,9 @@
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
      // or by tag:
      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
-      "f5": "debugger::RerunLastSession"
+      "f5": "debugger::Rerun",
+      "ctrl-f4": "workspace::CloseActiveDock",
+      "ctrl-w": "workspace::CloseActiveDock"
    }
  },
  {
@@ -701,6 +710,13 @@
      "pagedown": "editor::ContextMenuLast"
    }
  },
+  {
+    "context": "Editor && showing_signature_help && !showing_completions",
+    "bindings": {
+      "up": "editor::SignatureHelpPrevious",
+      "down": "editor::SignatureHelpNext"
+    }
+  },
  // Custom bindings
  {
    "bindings": {
@@ -1068,6 +1084,13 @@
      "ctrl-shift-tab": "pane::ActivatePreviousItem"
    }
  },
+  {
+    "context": "MarkdownPreview",
+    "bindings": {
+      "pageup": "markdown::MovePageUp",
+      "pagedown": "markdown::MovePageDown"
+    }
+  },
  {
    "context": "KeymapEditor",
    "use_key_equivalents": true,
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -5,10 +5,10 @@
    "bindings": {
      "f4": "debugger::Start",
      "shift-f5": "debugger::Stop",
-      "shift-cmd-f5": "debugger::Restart",
+      "shift-cmd-f5": "debugger::RerunSession",
      "f6": "debugger::Pause",
      "f7": "debugger::StepOver",
-      "f11": "debugger::StepInto",
+      "ctrl-f11": "debugger::StepInto",
      "shift-f11": "debugger::StepOut",
      "home": "menu::SelectFirst",
      "shift-pageup": "menu::SelectFirst",
@@ -624,6 +624,13 @@
      "cmd-r": "workspace::ToggleRightDock",
      "cmd-j": "workspace::ToggleBottomDock",
      "alt-cmd-y": "workspace::CloseAllDocks",
+      // For 0px parameter, uses UI font size value.
+      "ctrl-alt-0": "workspace::ResetActiveDockSize",
+      "ctrl-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
+      "ctrl-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
+      "ctrl-alt-)": "workspace::ResetOpenDocksSize",
+      "ctrl-alt-_": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
+      "ctrl-alt-+": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
      "cmd-shift-f": "pane::DeploySearch",
      "cmd-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "cmd-shift-t": "pane::ReopenClosedItem",
@@ -652,7 +659,8 @@
      "cmd-k shift-up": "workspace::SwapPaneUp",
      "cmd-k shift-down": "workspace::SwapPaneDown",
      "cmd-shift-x": "zed::Extensions",
-      "f5": "debugger::RerunLastSession"
+      "f5": "debugger::Rerun",
+      "cmd-w": "workspace::CloseActiveDock"
    }
  },
  {
@@ -766,6 +774,13 @@
      "pagedown": "editor::ContextMenuLast"
    }
  },
+  {
+    "context": "Editor && showing_signature_help && !showing_completions",
+    "bindings": {
+      "up": "editor::SignatureHelpPrevious",
+      "down": "editor::SignatureHelpNext"
+    }
+  },
  // Custom bindings
  {
    "use_key_equivalents": true,
@@ -1168,6 +1183,13 @@
      "ctrl-shift-tab": "pane::ActivatePreviousItem"
    }
  },
+  {
+    "context": "MarkdownPreview",
+    "bindings": {
+      "pageup": "markdown::MovePageUp",
+      "pagedown": "markdown::MovePageDown"
+    }
+  },
  {
    "context": "KeymapEditor",
    "use_key_equivalents": true,
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -98,6 +98,13 @@
      "ctrl-n": "editor::ContextMenuNext"
    }
  },
+  {
+    "context": "Editor && showing_signature_help && !showing_completions",
+    "bindings": {
+      "ctrl-p": "editor::SignatureHelpPrevious",
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
+  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -98,6 +98,13 @@
      "ctrl-n": "editor::ContextMenuNext"
    }
  },
+  {
+    "context": "Editor && showing_signature_help && !showing_completions",
+    "bindings": {
+      "ctrl-p": "editor::SignatureHelpPrevious",
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
+  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -189,6 +189,8 @@
      "z shift-r": "editor::UnfoldAll",
      "z l": "vim::ColumnRight",
      "z h": "vim::ColumnLeft",
+      "z shift-l": "vim::HalfPageRight",
+      "z shift-h": "vim::HalfPageLeft",
      "shift-z shift-q": ["pane::CloseActiveItem", { "save_intent": "skip" }],
      "shift-z shift-z": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
      // Count support
@@ -218,35 +220,18 @@
    "context": "vim_mode == normal",
    "bindings": {
      "ctrl-[": "editor::Cancel",
-      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
      "d": "vim::PushDelete",
      "delete": "vim::DeleteRight",
-      "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "vim::JoinLines",
      "g shift-j": "vim::JoinLinesNoWhitespace",
      "y": "vim::PushYank",
-      "shift-y": "vim::YankLine",
-      "i": "vim::InsertBefore",
-      "shift-i": "vim::InsertFirstNonWhitespace",
-      "a": "vim::InsertAfter",
-      "shift-a": "vim::InsertEndOfLine",
      "x": "vim::DeleteRight",
      "shift-x": "vim::DeleteLeft",
-      "o": "vim::InsertLineBelow",
-      "shift-o": "vim::InsertLineAbove",
-      "~": "vim::ChangeCase",
      "ctrl-a": "vim::Increment",
      "ctrl-x": "vim::Decrement",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "before": true }],
-      "u": "vim::Undo",
      "ctrl-r": "vim::Redo",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
      ">": "vim::PushIndent",
      "<": "vim::PushOutdent",
      "=": "vim::PushAutoIndent",
@@ -256,11 +241,8 @@
      "g ~": "vim::PushOppositeCase",
      "g ?": "vim::PushRot13",
      // "g ?": "vim::PushRot47",
-      "\"": "vim::PushRegister",
      "g w": "vim::PushRewrap",
      "g q": "vim::PushRewrap",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
      // tree-sitter related commands
      "[ x": "vim::SelectLargerSyntaxNode",
@@ -327,6 +309,7 @@
      "g shift-r": ["vim::Paste", { "preserve_clipboard": true }],
      "g c": "vim::ToggleComments",
      "g q": "vim::Rewrap",
+      "g w": "vim::Rewrap",
      "g ?": "vim::ConvertToRot13",
      // "g ?": "vim::ConvertToRot47",
      "\"": "vim::PushRegister",
@@ -363,18 +346,11 @@
    }
  },
  {
-    "context": "vim_mode == helix_normal && !menu",
+    "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
    "bindings": {
      "escape": "editor::Cancel",
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      "left": "vim::WrappingLeft",
-      "right": "vim::WrappingRight",
-      "h": "vim::WrappingLeft",
-      "l": "vim::WrappingRight",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
-      "y": "editor::Copy",
      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
      "shift-i": "vim::InsertFirstNonWhitespace",
@@ -388,27 +364,39 @@
      "p": "vim::Paste",
      "shift-p": ["vim::Paste", { "before": true }],
      "u": "vim::Undo",
+      "r": "vim::PushReplace",
+      "s": "vim::Substitute",
+      "shift-s": "vim::SubstituteLine",
+      "\"": "vim::PushRegister",
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem"
+    }
+  },
+  {
+    "context": "vim_mode == helix_normal && !menu",
+    "bindings": {
+      "ctrl-[": "editor::Cancel",
+      ":": "command_palette::Toggle",
+      "left": "vim::WrappingLeft",
+      "right": "vim::WrappingRight",
+      "h": "vim::WrappingLeft",
+      "l": "vim::WrappingRight",
+      "y": "editor::Copy",
+      "alt-;": "vim::OtherEnd",
      "ctrl-r": "vim::Redo",
      "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
      "t": ["vim::PushFindForward", { "before": true, "multiline": true }],
      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": true }],
      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": true }],
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
      ">": "vim::Indent",
      "<": "vim::Outdent",
      "=": "vim::AutoIndent",
      "g u": "vim::PushLowercase",
      "g shift-u": "vim::PushUppercase",
      "g ~": "vim::PushOppositeCase",
-      "\"": "vim::PushRegister",
      "g q": "vim::PushRewrap",
      "g w": "vim::PushRewrap",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
-      ".": "vim::Repeat",
      "alt-.": "vim::RepeatFind",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
@@ -428,7 +416,6 @@
      "g h": "vim::StartOfLine",
      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
      "g e": "vim::EndOfDocument",
-      "g y": "editor::GoToTypeDefinition",
      "g r": "editor::FindAllReferences", // zed specific
      "g t": "vim::WindowTop",
      "g c": "vim::WindowMiddle",
@@ -477,6 +464,13 @@
      "ctrl-n": "editor::ShowWordCompletions"
    }
  },
+  {
+    "context": "vim_mode == insert && showing_signature_help && !showing_completions",
+    "bindings": {
+      "ctrl-p": "editor::SignatureHelpPrevious",
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
+  },
  {
    "context": "vim_mode == replace",
    "bindings": {
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -617,6 +617,8 @@
    // 3. Mark files with errors and warnings:
    //    "all"
    "show_diagnostics": "all",
+    // Whether to stick parent directories at top of the project panel.
+    "sticky_scroll": true,
    // Settings related to indent guides in the project panel.
    "indent_guides": {
      // When to show indent guides in the project panel.
@@ -746,8 +748,6 @@
    "default_width": 380
  },
  "agent": {
-    // Version of this setting.
-    "version": "2",
    // Whether the agent is enabled.
    "enabled": true,
    /// What completion mode to start new threads in, if available. Can be 'normal' or 'burn'.
@@ -810,6 +810,7 @@
          "edit_file": true,
          "fetch": true,
          "list_directory": true,
+          "project_notifications": true,
          "move_path": true,
          "now": true,
          "find_path": true,
@@ -829,6 +830,7 @@
          "diagnostics": true,
          "fetch": true,
          "list_directory": true,
+          "project_notifications": true,
          "now": true,
          "find_path": true,
          "read_file": true,
@@ -855,7 +857,15 @@
    // its response, or needs user input.

    // Default: false
-    "play_sound_when_agent_done": false
+    "play_sound_when_agent_done": false,
+    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
+    ///
+    /// Default: true
+    "expand_edit_card": true,
+    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
+    ///
+    /// Default: true
+    "expand_terminal_card": true
  },
  // The settings for slash commands.
  "slash_commands": {
@@ -1292,6 +1302,8 @@
    // Whether or not selecting text in the terminal will automatically
    // copy to the system clipboard.
    "copy_on_select": false,
+    // Whether to keep the text selection after copying it to the clipboard
+    "keep_selection_on_copy": false,
    // Whether to show the terminal button in the status bar
    "button": true,
    // Any key-value pairs added to this list will be added to the terminal's
@@ -1348,7 +1360,7 @@
      // 5. Never show the scrollbar:
      //    "never"
      "show": null
-    }
+    },
    // Set the terminal's font size. If this option is not included,
    // the terminal will default to matching the buffer's font size.
    // "font_size": 15,
@@ -1365,6 +1377,21 @@
    // Default: 10_000, maximum: 100_000 (all bigger values set will be treated as 100_000), 0 disables the scrolling.
    // Existing terminals will not pick up this change until they are recreated.
    // "max_scroll_history_lines": 10000,
+    // The minimum APCA perceptual contrast between foreground and background colors.
+    // APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
+    // especially for dark mode. Values range from 0 to 106.
+    //
+    // Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
+    // https://readtech.org/ARC/tests/bronze-simple-mode/
+    // - 0: No contrast adjustment
+    // - 45: Minimum for large fluent text (36px+)
+    // - 60: Minimum for other content text
+    // - 75: Minimum for body text
+    // - 90: Preferred for body text
+    //
+    // Most terminal themes have APCA values of 40-70.
+    // A value of 45 preserves colorful themes while ensuring legibility.
+    "minimum_contrast": 45
  },
  "code_actions_on_format": {},
  // Settings related to running tasks.
@@ -1576,6 +1603,9 @@
      "use_on_type_format": false,
      "allow_rewrap": "anywhere",
      "soft_wrap": "editor_width",
+      "completions": {
+        "words": "disabled"
+      },
      "prettier": {
        "allowed": true
      }
@@ -1589,6 +1619,9 @@
      }
    },
    "Plain Text": {
+      "completions": {
+        "words": "disabled"
+      },
      "allow_rewrap": "anywhere"
    },
    "Python": {
@@ -1656,7 +1689,6 @@
  // Different settings for specific language models.
  "language_models": {
    "anthropic": {
-      "version": "1",
      "api_url": "https://api.anthropic.com"
    },
    "google": {
@@ -1666,7 +1698,6 @@
      "api_url": "http://localhost:11434"
    },
    "openai": {
-      "version": "1",
      "api_url": "https://api.openai.com/v1"
    },
    "open_router": {
@@ -1784,7 +1815,8 @@
  // `socks5h`. `http` will be used when no scheme is specified.
  //
  // By default no proxy will be used, or Zed will try get proxy settings from
-  // environment variables.
+  // environment variables. If certain hosts should not be proxied,
+  // set the `no_proxy` environment variable and provide a comma-separated list.
  //
  // Examples:
  //   - "proxy": "socks5h://localhost:10808"
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -3,13 +3,6 @@
 // For more documentation on how to configure debug tasks,
 // see: https://zed.dev/docs/debugger
 [
-  {
-    "label": "Debug active PHP file",
-    "adapter": "PHP",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
  {
    "label": "Debug active Python file",
    "adapter": "Debugpy",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -6,398 +6,7 @@
    {
      "name": "One Dark",
      "appearance": "dark",
-      "style": {
-        "border": "#464b57ff",
-        "border.variant": "#363c46ff",
-        "border.focused": "#47679eff",
-        "border.selected": "#293b5bff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#414754ff",
-        "elevated_surface.background": "#2f343eff",
-        "surface.background": "#2f343eff",
-        "background": "#3b414dff",
-        "element.background": "#2e343eff",
-        "element.hover": "#363c46ff",
-        "element.active": "#454a56ff",
-        "element.selected": "#454a56ff",
-        "element.disabled": "#2e343eff",
-        "drop_target.background": "#83899480",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#363c46ff",
-        "ghost_element.active": "#454a56ff",
-        "ghost_element.selected": "#454a56ff",
-        "ghost_element.disabled": "#2e343eff",
-        "text": "#dce0e5ff",
-        "text.muted": "#a9afbcff",
-        "text.placeholder": "#878a98ff",
-        "text.disabled": "#878a98ff",
-        "text.accent": "#74ade8ff",
-        "icon": "#dce0e5ff",
-        "icon.muted": "#a9afbcff",
-        "icon.disabled": "#878a98ff",
-        "icon.placeholder": "#a9afbcff",
-        "icon.accent": "#74ade8ff",
-        "status_bar.background": "#3b414dff",
-        "title_bar.background": "#3b414dff",
-        "title_bar.inactive_background": "#2e343eff",
-        "toolbar.background": "#282c33ff",
-        "tab_bar.background": "#2f343eff",
-        "tab.inactive_background": "#2f343eff",
-        "tab.active_background": "#282c33ff",
-        "search.match_background": "#74ade866",
-        "panel.background": "#2f343eff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#c8ccd44c",
-        "scrollbar.thumb.hover_background": "#363c46ff",
-        "scrollbar.thumb.border": "#363c46ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#2e333cff",
-        "editor.foreground": "#acb2beff",
-        "editor.background": "#282c33ff",
-        "editor.gutter.background": "#282c33ff",
-        "editor.subheader.background": "#2f343eff",
-        "editor.active_line.background": "#2f343ebf",
-        "editor.highlighted_line.background": "#2f343eff",
-        "editor.line_number": "#4e5a5f",
-        "editor.active_line_number": "#d0d4da",
-        "editor.hover_line_number": "#acb0b4",
-        "editor.invisible": "#878a98ff",
-        "editor.wrap_guide": "#c8ccd40d",
-        "editor.active_wrap_guide": "#c8ccd41a",
-        "editor.document_highlight.read_background": "#74ade81a",
-        "editor.document_highlight.write_background": "#555a6366",
-        "terminal.background": "#282c33ff",
-        "terminal.foreground": "#dce0e5ff",
-        "terminal.bright_foreground": "#dce0e5ff",
-        "terminal.dim_foreground": "#282c33ff",
-        "terminal.ansi.black": "#282c33ff",
-        "terminal.ansi.bright_black": "#525561ff",
-        "terminal.ansi.dim_black": "#dce0e5ff",
-        "terminal.ansi.red": "#d07277ff",
-        "terminal.ansi.bright_red": "#673a3cff",
-        "terminal.ansi.dim_red": "#eab7b9ff",
-        "terminal.ansi.green": "#a1c181ff",
-        "terminal.ansi.bright_green": "#4d6140ff",
-        "terminal.ansi.dim_green": "#d1e0bfff",
-        "terminal.ansi.yellow": "#dec184ff",
-        "terminal.ansi.bright_yellow": "#e5c07bff",
-        "terminal.ansi.dim_yellow": "#f1dfc1ff",
-        "terminal.ansi.blue": "#74ade8ff",
-        "terminal.ansi.bright_blue": "#385378ff",
-        "terminal.ansi.dim_blue": "#bed5f4ff",
-        "terminal.ansi.magenta": "#be5046ff",
-        "terminal.ansi.bright_magenta": "#5e2b26ff",
-        "terminal.ansi.dim_magenta": "#e6a79eff",
-        "terminal.ansi.cyan": "#6eb4bfff",
-        "terminal.ansi.bright_cyan": "#3a565bff",
-        "terminal.ansi.dim_cyan": "#b9d9dfff",
-        "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#dce0e5ff",
-        "terminal.ansi.dim_white": "#575d65ff",
-        "link_text.hover": "#74ade8ff",
-        "version_control.added": "#27a657ff",
-        "version_control.modified": "#d3b020ff",
-        "version_control.deleted": "#e06c76ff",
-        "version_control.conflict_marker.ours": "#a1c1811a",
-        "version_control.conflict_marker.theirs": "#74ade81a",
-        "conflict": "#dec184ff",
-        "conflict.background": "#dec1841a",
-        "conflict.border": "#5d4c2fff",
-        "created": "#a1c181ff",
-        "created.background": "#a1c1811a",
-        "created.border": "#38482fff",
-        "deleted": "#d07277ff",
-        "deleted.background": "#d072771a",
-        "deleted.border": "#4c2b2cff",
-        "error": "#d07277ff",
-        "error.background": "#d072771a",
-        "error.border": "#4c2b2cff",
-        "hidden": "#878a98ff",
-        "hidden.background": "#696b771a",
-        "hidden.border": "#414754ff",
-        "hint": "#788ca6ff",
-        "hint.background": "#5a6f891a",
-        "hint.border": "#293b5bff",
-        "ignored": "#878a98ff",
-        "ignored.background": "#696b771a",
-        "ignored.border": "#464b57ff",
-        "info": "#74ade8ff",
-        "info.background": "#74ade81a",
-        "info.border": "#293b5bff",
-        "modified": "#dec184ff",
-        "modified.background": "#dec1841a",
-        "modified.border": "#5d4c2fff",
-        "predictive": "#5a6a87ff",
-        "predictive.background": "#5a6a871a",
-        "predictive.border": "#38482fff",
-        "renamed": "#74ade8ff",
-        "renamed.background": "#74ade81a",
-        "renamed.border": "#293b5bff",
-        "success": "#a1c181ff",
-        "success.background": "#a1c1811a",
-        "success.border": "#38482fff",
-        "unreachable": "#a9afbcff",
-        "unreachable.background": "#8389941a",
-        "unreachable.border": "#464b57ff",
-        "warning": "#dec184ff",
-        "warning.background": "#dec1841a",
-        "warning.border": "#5d4c2fff",
-        "players": [
-          {
-            "cursor": "#74ade8ff",
-            "background": "#74ade8ff",
-            "selection": "#74ade83d"
-          },
-          {
-            "cursor": "#be5046ff",
-            "background": "#be5046ff",
-            "selection": "#be50463d"
-          },
-          {
-            "cursor": "#bf956aff",
-            "background": "#bf956aff",
-            "selection": "#bf956a3d"
-          },
-          {
-            "cursor": "#b477cfff",
-            "background": "#b477cfff",
-            "selection": "#b477cf3d"
-          },
-          {
-            "cursor": "#6eb4bfff",
-            "background": "#6eb4bfff",
-            "selection": "#6eb4bf3d"
-          },
-          {
-            "cursor": "#d07277ff",
-            "background": "#d07277ff",
-            "selection": "#d072773d"
-          },
-          {
-            "cursor": "#dec184ff",
-            "background": "#dec184ff",
-            "selection": "#dec1843d"
-          },
-          {
-            "cursor": "#a1c181ff",
-            "background": "#a1c181ff",
-            "selection": "#a1c1813d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#5d636fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#878e98ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#dfc184ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#788ca6ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#b477cfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#73ade9ff",
-            "font_style": "normal",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#5a6a87ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#b2b9c6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#b2b9c6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#b1574bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#dfc184ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#a1c181ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#878e98ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#a1c181ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": 400
-          },
-          "type": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
+      "style": {}
    },
    {
      "name": "One Light",
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -31,7 +31,13 @@ use workspace::{StatusItemView, Workspace, item::ItemHandle};

 const GIT_OPERATION_DELAY: Duration = Duration::from_millis(0);

-actions!(activity_indicator, [ShowErrorMessage]);
+actions!(
+    activity_indicator,
+    [
+        /// Displays error messages from language servers in the status bar.
+        ShowErrorMessage
+    ]
+);

 pub enum Event {
    ShowStatus {
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use agent_settings::{AgentProfileId, AgentProfileSettings, AgentSettings};
-use assistant_tool::{Tool, ToolSource, ToolWorkingSet};
+use assistant_tool::{Tool, ToolSource, ToolWorkingSet, UniqueToolName};
 use collections::IndexMap;
 use convert_case::{Case, Casing};
 use fs::Fs;
@@ -72,7 +72,7 @@ impl AgentProfile {
        &self.id
    }

-    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+    pub fn enabled_tools(&self, cx: &App) -> Vec<(UniqueToolName, Arc<dyn Tool>)> {
        let Some(settings) = AgentSettings::get_global(cx).profiles.get(&self.id) else {
            return Vec::new();
        };
@@ -81,7 +81,7 @@ impl AgentProfile {
            .read(cx)
            .tools(cx)
            .into_iter()
-            .filter(|tool| Self::is_enabled(settings, tool.source(), tool.name()))
+            .filter(|(_, tool)| Self::is_enabled(settings, tool.source(), tool.name()))
            .collect()
    }

@@ -137,7 +137,7 @@ mod tests {
        let mut enabled_tools = cx
            .read(|cx| profile.enabled_tools(cx))
            .into_iter()
-            .map(|tool| tool.name())
+            .map(|(_, tool)| tool.name())
            .collect::<Vec<_>>();
        enabled_tools.sort();

@@ -174,7 +174,7 @@ mod tests {
        let mut enabled_tools = cx
            .read(|cx| profile.enabled_tools(cx))
            .into_iter()
-            .map(|tool| tool.name())
+            .map(|(_, tool)| tool.name())
            .collect::<Vec<_>>();
        enabled_tools.sort();

@@ -207,7 +207,7 @@ mod tests {
        let mut enabled_tools = cx
            .read(|cx| profile.enabled_tools(cx))
            .into_iter()
-            .map(|tool| tool.name())
+            .map(|(_, tool)| tool.name())
            .collect::<Vec<_>>();
        enabled_tools.sort();

@@ -267,10 +267,10 @@ mod tests {
    }

    fn default_tool_set(cx: &mut TestAppContext) -> Entity<ToolWorkingSet> {
-        cx.new(|_| {
+        cx.new(|cx| {
            let mut tool_set = ToolWorkingSet::default();
-            tool_set.insert(Arc::new(FakeTool::new("enabled_mcp_tool", "mcp")));
-            tool_set.insert(Arc::new(FakeTool::new("disabled_mcp_tool", "mcp")));
+            tool_set.insert(Arc::new(FakeTool::new("enabled_mcp_tool", "mcp")), cx);
+            tool_set.insert(Arc::new(FakeTool::new("disabled_mcp_tool", "mcp")), cx);
            tool_set
        })
    }
--- a/crates/agent/src/prompts/stale_files_prompt_header.txt
+++ b/crates/agent/src/prompts/stale_files_prompt_header.txt
@@ -0,0 +1,3 @@
+[The following is an auto-generated notification; do not reply]
+
+These files have changed since the last read:
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -13,7 +13,7 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use client::{ModelRequestUsage, RequestUsage};
-use collections::{HashMap, HashSet};
+use collections::HashMap;
 use feature_flags::{self, FeatureFlagAppExt};
 use futures::{FutureExt, StreamExt as _, future::Shared};
 use git::repository::DiffType;
@@ -23,10 +23,11 @@ use gpui::{
 };
 use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
-    LanguageModelToolUseId, MessageContent, ModelRequestLimitReachedError, PaymentRequiredError,
-    Role, SelectedModel, StopReason, TokenUsage,
+    LanguageModelExt as _, LanguageModelId, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
+    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
+    ModelRequestLimitReachedError, PaymentRequiredError, Role, SelectedModel, StopReason,
+    TokenUsage,
 };
 use postage::stream::Stream as _;
 use project::{
@@ -45,7 +46,7 @@ use std::{
    time::{Duration, Instant},
 };
 use thiserror::Error;
-use util::{ResultExt as _, post_inc};
+use util::{ResultExt as _, debug_panic, post_inc};
 use uuid::Uuid;
 use zed_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};

@@ -960,13 +961,14 @@ impl Thread {
        model: Arc<dyn LanguageModel>,
    ) -> Vec<LanguageModelRequestTool> {
        if model.supports_tools() {
-            resolve_tool_name_conflicts(self.profile.enabled_tools(cx).as_slice())
+            self.profile
+                .enabled_tools(cx)
                .into_iter()
                .filter_map(|(name, tool)| {
                    // Skip tools that cannot be supported
                    let input_schema = tool.input_schema(model.tool_input_format()).ok()?;
                    Some(LanguageModelRequestTool {
-                        name,
+                        name: name.into(),
                        description: tool.description(),
                        input_schema,
                    })
@@ -1247,6 +1249,8 @@ impl Thread {

        self.remaining_turns -= 1;

+        self.flush_notifications(model.clone(), intent, cx);
+
        let request = self.to_completion_request(model.clone(), intent, cx);

        self.stream_completion(request, model, intent, window, cx);
@@ -1480,6 +1484,111 @@ impl Thread {
        request
    }

+    /// Insert auto-generated notifications (if any) to the thread
+    fn flush_notifications(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        intent: CompletionIntent,
+        cx: &mut Context<Self>,
+    ) {
+        match intent {
+            CompletionIntent::UserPrompt | CompletionIntent::ToolResults => {
+                if let Some(pending_tool_use) = self.attach_tracked_files_state(model, cx) {
+                    cx.emit(ThreadEvent::ToolFinished {
+                        tool_use_id: pending_tool_use.id.clone(),
+                        pending_tool_use: Some(pending_tool_use),
+                    });
+                }
+            }
+            CompletionIntent::ThreadSummarization
+            | CompletionIntent::ThreadContextSummarization
+            | CompletionIntent::CreateFile
+            | CompletionIntent::EditFile
+            | CompletionIntent::InlineAssist
+            | CompletionIntent::TerminalInlineAssist
+            | CompletionIntent::GenerateGitCommitMessage => {}
+        };
+    }
+
+    fn attach_tracked_files_state(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        cx: &mut App,
+    ) -> Option<PendingToolUse> {
+        let action_log = self.action_log.read(cx);
+
+        action_log.unnotified_stale_buffers(cx).next()?;
+
+        // Represent notification as a simulated `project_notifications` tool call
+        let tool_name = Arc::from("project_notifications");
+        let Some(tool) = self.tools.read(cx).tool(&tool_name, cx) else {
+            debug_panic!("`project_notifications` tool not found");
+            return None;
+        };
+
+        if !self.profile.is_tool_enabled(tool.source(), tool.name(), cx) {
+            return None;
+        }
+
+        let input = serde_json::json!({});
+        let request = Arc::new(LanguageModelRequest::default()); // unused
+        let window = None;
+        let tool_result = tool.run(
+            input,
+            request,
+            self.project.clone(),
+            self.action_log.clone(),
+            model.clone(),
+            window,
+            cx,
+        );
+
+        let tool_use_id =
+            LanguageModelToolUseId::from(format!("project_notifications_{}", self.messages.len()));
+
+        let tool_use = LanguageModelToolUse {
+            id: tool_use_id.clone(),
+            name: tool_name.clone(),
+            raw_input: "{}".to_string(),
+            input: serde_json::json!({}),
+            is_input_complete: true,
+        };
+
+        let tool_output = cx.background_executor().block(tool_result.output);
+
+        // Attach a project_notification tool call to the latest existing
+        // Assistant message. We cannot create a new Assistant message
+        // because thinking models require a `thinking` block that we
+        // cannot mock. We cannot send a notification as a normal
+        // (non-tool-use) User message because this distracts Agent
+        // too much.
+        let tool_message_id = self
+            .messages
+            .iter()
+            .enumerate()
+            .rfind(|(_, message)| message.role == Role::Assistant)
+            .map(|(_, message)| message.id)?;
+
+        let tool_use_metadata = ToolUseMetadata {
+            model: model.clone(),
+            thread_id: self.id.clone(),
+            prompt_id: self.last_prompt_id.clone(),
+        };
+
+        self.tool_use
+            .request_tool_use(tool_message_id, tool_use, tool_use_metadata.clone(), cx);
+
+        let pending_tool_use = self.tool_use.insert_tool_output(
+            tool_use_id.clone(),
+            tool_name,
+            tool_output,
+            self.configured_model.as_ref(),
+            self.completion_mode,
+        );
+
+        pending_tool_use
+    }
+
    pub fn stream_completion(
        &mut self,
        request: LanguageModelRequest,
@@ -1503,6 +1612,10 @@ impl Thread {
            prompt_id: prompt_id.clone(),
        };

+        let completion_mode = request
+            .mode
+            .unwrap_or(zed_llm_client::CompletionMode::Normal);
+
        self.last_received_chunk_at = Some(Instant::now());

        let task = cx.spawn(async move |thread, cx| {
@@ -1852,7 +1965,11 @@ impl Thread {
                                                .unwrap_or(0)
                                                // We know the context window was exceeded in practice, so if our estimate was
                                                // lower than max tokens, the estimate was wrong; return that we exceeded by 1.
-                                                .max(model.max_token_count().saturating_add(1))
+                                                .max(
+                                                    model
+                                                        .max_token_count_for_mode(completion_mode)
+                                                        .saturating_add(1),
+                                                )
                                        });
                                        thread.exceeded_window_error = Some(ExceededWindowError {
                                            model_id: model.id(),
@@ -2386,7 +2503,7 @@ impl Thread {

        let tool_list = available_tools
            .iter()
-            .map(|tool| format!("- {}: {}", tool.name(), tool.description()))
+            .map(|(name, tool)| format!("- {}: {}", name, tool.description()))
            .collect::<Vec<_>>()
            .join("\n");

@@ -2400,6 +2517,7 @@ impl Thread {
            hallucinated_tool_name,
            Err(anyhow!("Missing tool call: {error_message}")),
            self.configured_model.as_ref(),
+            self.completion_mode,
        );

        cx.emit(ThreadEvent::MissingToolUse {
@@ -2426,6 +2544,7 @@ impl Thread {
            tool_name,
            Err(anyhow!("Error parsing input JSON: {error}")),
            self.configured_model.as_ref(),
+            self.completion_mode,
        );
        let ui_text = if let Some(pending_tool_use) = &pending_tool_use {
            pending_tool_use.ui_text.clone()
@@ -2501,6 +2620,7 @@ impl Thread {
                            tool_name,
                            output,
                            thread.configured_model.as_ref(),
+                            thread.completion_mode,
                        );
                        thread.tool_finished(tool_use_id, pending_tool_use, false, window, cx);
                    })
@@ -2606,7 +2726,7 @@ impl Thread {
            .profile
            .enabled_tools(cx)
            .iter()
-            .map(|tool| tool.name())
+            .map(|(name, _)| name.clone().into())
            .collect();

        self.message_feedback.insert(message_id, feedback);
@@ -2977,7 +3097,9 @@ impl Thread {
            return TotalTokenUsage::default();
        };

-        let max = model.model.max_token_count();
+        let max = model
+            .model
+            .max_token_count_for_mode(self.completion_mode().into());

        let index = self
            .messages
@@ -3004,7 +3126,9 @@ impl Thread {
    pub fn total_token_usage(&self) -> Option<TotalTokenUsage> {
        let model = self.configured_model.as_ref()?;

-        let max = model.model.max_token_count();
+        let max = model
+            .model
+            .max_token_count_for_mode(self.completion_mode().into());

        if let Some(exceeded_error) = &self.exceeded_window_error {
            if model.model.id() == exceeded_error.model_id {
@@ -3070,6 +3194,7 @@ impl Thread {
            tool_name,
            err,
            self.configured_model.as_ref(),
+            self.completion_mode,
        );
        self.tool_finished(tool_use_id.clone(), None, true, window, cx);
    }
@@ -3144,85 +3269,6 @@ struct PendingCompletion {
    _task: Task<()>,
 }

-/// Resolves tool name conflicts by ensuring all tool names are unique.
-///
-/// When multiple tools have the same name, this function applies the following rules:
-/// 1. Native tools always keep their original name
-/// 2. Context server tools get prefixed with their server ID and an underscore
-/// 3. All tool names are truncated to MAX_TOOL_NAME_LENGTH (64 characters)
-/// 4. If conflicts still exist after prefixing, the conflicting tools are filtered out
-///
-/// Note: This function assumes that built-in tools occur before MCP tools in the tools list.
-fn resolve_tool_name_conflicts(tools: &[Arc<dyn Tool>]) -> Vec<(String, Arc<dyn Tool>)> {
-    fn resolve_tool_name(tool: &Arc<dyn Tool>) -> String {
-        let mut tool_name = tool.name();
-        tool_name.truncate(MAX_TOOL_NAME_LENGTH);
-        tool_name
-    }
-
-    const MAX_TOOL_NAME_LENGTH: usize = 64;
-
-    let mut duplicated_tool_names = HashSet::default();
-    let mut seen_tool_names = HashSet::default();
-    for tool in tools {
-        let tool_name = resolve_tool_name(tool);
-        if seen_tool_names.contains(&tool_name) {
-            debug_assert!(
-                tool.source() != assistant_tool::ToolSource::Native,
-                "There are two built-in tools with the same name: {}",
-                tool_name
-            );
-            duplicated_tool_names.insert(tool_name);
-        } else {
-            seen_tool_names.insert(tool_name);
-        }
-    }
-
-    if duplicated_tool_names.is_empty() {
-        return tools
-            .into_iter()
-            .map(|tool| (resolve_tool_name(tool), tool.clone()))
-            .collect();
-    }
-
-    tools
-        .into_iter()
-        .filter_map(|tool| {
-            let mut tool_name = resolve_tool_name(tool);
-            if !duplicated_tool_names.contains(&tool_name) {
-                return Some((tool_name, tool.clone()));
-            }
-            match tool.source() {
-                assistant_tool::ToolSource::Native => {
-                    // Built-in tools always keep their original name
-                    Some((tool_name, tool.clone()))
-                }
-                assistant_tool::ToolSource::ContextServer { id } => {
-                    // Context server tools are prefixed with the context server ID, and truncated if necessary
-                    tool_name.insert(0, '_');
-                    if tool_name.len() + id.len() > MAX_TOOL_NAME_LENGTH {
-                        let len = MAX_TOOL_NAME_LENGTH - tool_name.len();
-                        let mut id = id.to_string();
-                        id.truncate(len);
-                        tool_name.insert_str(0, &id);
-                    } else {
-                        tool_name.insert_str(0, &id);
-                    }
-
-                    tool_name.truncate(MAX_TOOL_NAME_LENGTH);
-
-                    if seen_tool_names.contains(&tool_name) {
-                        log::error!("Cannot resolve tool name conflict for tool {}", tool.name());
-                        None
-                    } else {
-                        Some((tool_name, tool.clone()))
-                    }
-                }
-            }
-        })
-        .collect()
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -3234,11 +3280,13 @@ mod tests {
    const TEST_RATE_LIMIT_RETRY_SECS: u64 = 30;
    use agent_settings::{AgentProfileId, AgentSettings, LanguageModelParameters};
    use assistant_tool::ToolRegistry;
+    use assistant_tools;
    use futures::StreamExt;
    use futures::future::BoxFuture;
    use futures::stream::BoxStream;
    use gpui::TestAppContext;
-    use icons::IconName;
+    use http_client;
+    use indoc::indoc;
    use language_model::fake_provider::{FakeLanguageModel, FakeLanguageModelProvider};
    use language_model::{
        LanguageModelCompletionError, LanguageModelName, LanguageModelProviderId,
@@ -3566,6 +3614,134 @@ fn main() {{
        );
    }

+    #[gpui::test]
+    async fn test_stale_buffer_notification(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(
+            cx,
+            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
+        )
+        .await;
+
+        let (_workspace, _thread_store, thread, context_store, model) =
+            setup_test_environment(cx, project.clone()).await;
+
+        // Add a buffer to the context. This will be a tracked buffer
+        let buffer = add_file_to_context(&project, &context_store, "test/code.rs", cx)
+            .await
+            .unwrap();
+
+        let context = context_store
+            .read_with(cx, |store, _| store.context().next().cloned())
+            .unwrap();
+        let loaded_context = cx
+            .update(|cx| load_context(vec![context], &project, &None, cx))
+            .await;
+
+        // Insert user message and assistant response
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message("Explain this code", loaded_context, None, Vec::new(), cx);
+            thread.insert_assistant_message(
+                vec![MessageSegment::Text("This code prints 42.".into())],
+                cx,
+            );
+        });
+
+        // We shouldn't have a stale buffer notification yet
+        let notifications = thread.read_with(cx, |thread, _| {
+            find_tool_uses(thread, "project_notifications")
+        });
+        assert!(
+            notifications.is_empty(),
+            "Should not have stale buffer notification before buffer is modified"
+        );
+
+        // Modify the buffer
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit(
+                [(1..1, "\n    println!(\"Added a new line\");\n")],
+                None,
+                cx,
+            );
+        });
+
+        // Insert another user message
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message(
+                "What does the code do now?",
+                ContextLoadResult::default(),
+                None,
+                Vec::new(),
+                cx,
+            )
+        });
+
+        // Check for the stale buffer warning
+        thread.update(cx, |thread, cx| {
+            thread.flush_notifications(model.clone(), CompletionIntent::UserPrompt, cx)
+        });
+
+        let notifications = thread.read_with(cx, |thread, _cx| {
+            find_tool_uses(thread, "project_notifications")
+        });
+
+        let [notification] = notifications.as_slice() else {
+            panic!("Should have a `project_notifications` tool use");
+        };
+
+        let Some(notification_content) = notification.content.to_str() else {
+            panic!("`project_notifications` should return text");
+        };
+
+        let expected_content = indoc! {"[The following is an auto-generated notification; do not reply]
+
+        These files have changed since the last read:
+        - code.rs
+        "};
+        assert_eq!(notification_content, expected_content);
+
+        // Insert another user message and flush notifications again
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message(
+                "Can you tell me more?",
+                ContextLoadResult::default(),
+                None,
+                Vec::new(),
+                cx,
+            )
+        });
+
+        thread.update(cx, |thread, cx| {
+            thread.flush_notifications(model.clone(), CompletionIntent::UserPrompt, cx)
+        });
+
+        // There should be no new notifications (we already flushed one)
+        let notifications = thread.read_with(cx, |thread, _cx| {
+            find_tool_uses(thread, "project_notifications")
+        });
+
+        assert_eq!(
+            notifications.len(),
+            1,
+            "Should still have only one notification after second flush - no duplicates"
+        );
+    }
+
+    fn find_tool_uses(thread: &Thread, tool_name: &str) -> Vec<LanguageModelToolResult> {
+        thread
+            .messages()
+            .flat_map(|message| {
+                thread
+                    .tool_results_for_message(message.id)
+                    .into_iter()
+                    .filter(|result| result.tool_name == tool_name.into())
+                    .cloned()
+                    .collect::<Vec<_>>()
+            })
+            .collect()
+    }
+
    #[gpui::test]
    async fn test_storing_profile_setting_per_thread(cx: &mut TestAppContext) {
        init_test_settings(cx);
@@ -3883,148 +4059,6 @@ fn main() {{
        });
    }

-    #[gpui::test]
-    fn test_resolve_tool_name_conflicts() {
-        use assistant_tool::{Tool, ToolSource};
-
-        assert_resolve_tool_name_conflicts(
-            vec![
-                TestTool::new("tool1", ToolSource::Native),
-                TestTool::new("tool2", ToolSource::Native),
-                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-1".into() }),
-            ],
-            vec!["tool1", "tool2", "tool3"],
-        );
-
-        assert_resolve_tool_name_conflicts(
-            vec![
-                TestTool::new("tool1", ToolSource::Native),
-                TestTool::new("tool2", ToolSource::Native),
-                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-1".into() }),
-                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-2".into() }),
-            ],
-            vec!["tool1", "tool2", "mcp-1_tool3", "mcp-2_tool3"],
-        );
-
-        assert_resolve_tool_name_conflicts(
-            vec![
-                TestTool::new("tool1", ToolSource::Native),
-                TestTool::new("tool2", ToolSource::Native),
-                TestTool::new("tool3", ToolSource::Native),
-                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-1".into() }),
-                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-2".into() }),
-            ],
-            vec!["tool1", "tool2", "tool3", "mcp-1_tool3", "mcp-2_tool3"],
-        );
-
-        // Test that tool with very long name is always truncated
-        assert_resolve_tool_name_conflicts(
-            vec![TestTool::new(
-                "tool-with-more-then-64-characters-blah-blah-blah-blah-blah-blah-blah-blah",
-                ToolSource::Native,
-            )],
-            vec!["tool-with-more-then-64-characters-blah-blah-blah-blah-blah-blah-"],
-        );
-
-        // Test deduplication of tools with very long names, in this case the mcp server name should be truncated
-        assert_resolve_tool_name_conflicts(
-            vec![
-                TestTool::new("tool-with-very-very-very-long-name", ToolSource::Native),
-                TestTool::new(
-                    "tool-with-very-very-very-long-name",
-                    ToolSource::ContextServer {
-                        id: "mcp-with-very-very-very-long-name".into(),
-                    },
-                ),
-            ],
-            vec![
-                "tool-with-very-very-very-long-name",
-                "mcp-with-very-very-very-long-_tool-with-very-very-very-long-name",
-            ],
-        );
-
-        fn assert_resolve_tool_name_conflicts(
-            tools: Vec<TestTool>,
-            expected: Vec<impl Into<String>>,
-        ) {
-            let tools: Vec<Arc<dyn Tool>> = tools
-                .into_iter()
-                .map(|t| Arc::new(t) as Arc<dyn Tool>)
-                .collect();
-            let tools = resolve_tool_name_conflicts(&tools);
-            assert_eq!(tools.len(), expected.len());
-            for (i, expected_name) in expected.into_iter().enumerate() {
-                let expected_name = expected_name.into();
-                let actual_name = &tools[i].0;
-                assert_eq!(
-                    actual_name, &expected_name,
-                    "Expected '{}' got '{}' at index {}",
-                    expected_name, actual_name, i
-                );
-            }
-        }
-
-        struct TestTool {
-            name: String,
-            source: ToolSource,
-        }
-
-        impl TestTool {
-            fn new(name: impl Into<String>, source: ToolSource) -> Self {
-                Self {
-                    name: name.into(),
-                    source,
-                }
-            }
-        }
-
-        impl Tool for TestTool {
-            fn name(&self) -> String {
-                self.name.clone()
-            }
-
-            fn icon(&self) -> IconName {
-                IconName::Ai
-            }
-
-            fn may_perform_edits(&self) -> bool {
-                false
-            }
-
-            fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-                true
-            }
-
-            fn source(&self) -> ToolSource {
-                self.source.clone()
-            }
-
-            fn description(&self) -> String {
-                "Test tool".to_string()
-            }
-
-            fn ui_text(&self, _input: &serde_json::Value) -> String {
-                "Test tool".to_string()
-            }
-
-            fn run(
-                self: Arc<Self>,
-                _input: serde_json::Value,
-                _request: Arc<LanguageModelRequest>,
-                _project: Entity<Project>,
-                _action_log: Entity<ActionLog>,
-                _model: Arc<dyn LanguageModel>,
-                _window: Option<AnyWindowHandle>,
-                _cx: &mut App,
-            ) -> assistant_tool::ToolResult {
-                assistant_tool::ToolResult {
-                    output: Task::ready(Err(anyhow::anyhow!("No content"))),
-                    card: None,
-                }
-            }
-        }
-    }
-
    // Helper to create a model that returns errors
    enum TestError {
        Overloaded,
@@ -5273,6 +5307,14 @@ fn main() {{
            language_model::init_settings(cx);
            ThemeSettings::register(cx);
            ToolRegistry::default_global(cx);
+            assistant_tool::init(cx);
+
+            let http_client = Arc::new(http_client::HttpClientWithUrl::new(
+                http_client::FakeHttpClient::with_200_response(),
+                "http://localhost".to_string(),
+                None,
+            ));
+            assistant_tools::init(http_client, cx);
        });
    }

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 use agent_settings::{AgentProfileId, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ToolId, ToolWorkingSet};
+use assistant_tool::{Tool, ToolId, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
 use context_server::ContextServerId;
@@ -537,8 +537,8 @@ impl ThreadStore {
                    }
                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
                        if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
-                            tool_working_set.update(cx, |tool_working_set, _| {
-                                tool_working_set.remove(&tool_ids);
+                            tool_working_set.update(cx, |tool_working_set, cx| {
+                                tool_working_set.remove(&tool_ids, cx);
                            });
                        }
                    }
@@ -569,19 +569,17 @@ impl ThreadStore {
                    .log_err()
                {
                    let tool_ids = tool_working_set
-                        .update(cx, |tool_working_set, _| {
-                            response
-                                .tools
-                                .into_iter()
-                                .map(|tool| {
-                                    log::info!("registering context server tool: {:?}", tool.name);
-                                    tool_working_set.insert(Arc::new(ContextServerTool::new(
+                        .update(cx, |tool_working_set, cx| {
+                            tool_working_set.extend(
+                                response.tools.into_iter().map(|tool| {
+                                    Arc::new(ContextServerTool::new(
                                        context_server_store.clone(),
                                        server.id(),
                                        tool,
-                                    )))
-                                })
-                                .collect::<Vec<_>>()
+                                    )) as Arc<dyn Tool>
+                                }),
+                                cx,
+                            )
                        })
                        .log_err();

--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -2,6 +2,7 @@ use crate::{
    thread::{MessageId, PromptId, ThreadId},
    thread_store::SerializedMessage,
 };
+use agent_settings::CompletionMode;
 use anyhow::Result;
 use assistant_tool::{
    AnyToolCard, Tool, ToolResultContent, ToolResultOutput, ToolUseStatus, ToolWorkingSet,
@@ -11,8 +12,9 @@ use futures::{FutureExt as _, future::Shared};
 use gpui::{App, Entity, SharedString, Task, Window};
 use icons::IconName;
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelRequest, LanguageModelToolResult,
-    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, Role,
+    ConfiguredModel, LanguageModel, LanguageModelExt, LanguageModelRequest,
+    LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolUse,
+    LanguageModelToolUseId, Role,
 };
 use project::Project;
 use std::sync::Arc;
@@ -400,6 +402,7 @@ impl ToolUseState {
        tool_name: Arc<str>,
        output: Result<ToolResultOutput>,
        configured_model: Option<&ConfiguredModel>,
+        completion_mode: CompletionMode,
    ) -> Option<PendingToolUse> {
        let metadata = self.tool_use_metadata_by_id.remove(&tool_use_id);

@@ -426,7 +429,10 @@ impl ToolUseState {

                // Protect from overly large output
                let tool_output_limit = configured_model
-                    .map(|model| model.model.max_token_count() as usize * BYTES_PER_TOKEN_ESTIMATE)
+                    .map(|model| {
+                        model.model.max_token_count_for_mode(completion_mode.into()) as usize
+                            * BYTES_PER_TOKEN_ESTIMATE
+                    })
                    .unwrap_or(usize::MAX);

                let content = match tool_result {
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -67,6 +67,8 @@ pub struct AgentSettings {
    pub model_parameters: Vec<LanguageModelParameters>,
    pub preferred_completion_mode: CompletionMode,
    pub enable_feedback: bool,
+    pub expand_edit_card: bool,
+    pub expand_terminal_card: bool,
 }

 impl AgentSettings {
@@ -291,6 +293,14 @@ pub struct AgentSettingsContent {
    ///
    /// Default: true
    enable_feedback: Option<bool>,
+    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
+    ///
+    /// Default: true
+    expand_edit_card: Option<bool>,
+    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
+    ///
+    /// Default: true
+    expand_terminal_card: Option<bool>,
 }

 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
@@ -441,6 +451,11 @@ impl Settings for AgentSettings {
                value.preferred_completion_mode,
            );
            merge(&mut settings.enable_feedback, value.enable_feedback);
+            merge(&mut settings.expand_edit_card, value.expand_edit_card);
+            merge(
+                &mut settings.expand_terminal_card,
+                value.expand_terminal_card,
+            );

            settings
                .model_parameters
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -1,9 +1,7 @@
 use crate::context_picker::{ContextPicker, MentionLink};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::message_editor::{extract_message_creases, insert_message_creases};
-use crate::ui::{
-    AddedContext, AgentNotification, AgentNotificationEvent, AnimatedLabel, ContextPill,
-};
+use crate::ui::{AddedContext, AgentNotification, AgentNotificationEvent, ContextPill};
 use crate::{AgentPanel, ModelUsageContext};
 use agent::{
    ContextStore, LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, TextThreadStore,
@@ -1026,6 +1024,7 @@ impl ActiveThread {
                }
            }
            ThreadEvent::MessageAdded(message_id) => {
+                self.clear_last_error();
                if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
                    thread.message(*message_id).map(|message| {
                        RenderedMessage::from_segments(
@@ -1042,6 +1041,7 @@ impl ActiveThread {
                cx.notify();
            }
            ThreadEvent::MessageEdited(message_id) => {
+                self.clear_last_error();
                if let Some(index) = self.messages.iter().position(|id| id == message_id) {
                    if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
                        thread.message(*message_id).map(|message| {
@@ -1818,7 +1818,7 @@ impl ActiveThread {
                .my_3()
                .mx_5()
                .when(is_generating_stale || message.is_hidden, |this| {
-                    this.child(AnimatedLabel::new("").size(LabelSize::Small))
+                    this.child(LoadingLabel::new("").size(LabelSize::Small))
                })
        });

@@ -2584,7 +2584,7 @@ impl ActiveThread {
                                            .size(IconSize::XSmall)
                                            .color(Color::Muted),
                                    )
-                                    .child(AnimatedLabel::new("Thinking").size(LabelSize::Small)),
+                                    .child(LoadingLabel::new("Thinking").size(LabelSize::Small)),
                            )
                            .child(
                                h_flex()
@@ -3153,7 +3153,7 @@ impl ActiveThread {
                                .border_color(self.tool_card_border_color(cx))
                                .rounded_b_lg()
                                .child(
-                                    AnimatedLabel::new("Waiting for Confirmation").size(LabelSize::Small)
+                                    LoadingLabel::new("Waiting for Confirmation").size(LabelSize::Small)
                                )
                                .child(
                                    h_flex()
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -26,8 +26,8 @@ use project::{
 };
 use settings::{Settings, update_settings_file};
 use ui::{
-    ContextMenu, Disclosure, ElevationIndex, Indicator, PopoverMenu, Scrollbar, ScrollbarState,
-    Switch, SwitchColor, Tooltip, prelude::*,
+    ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
+    Scrollbar, ScrollbarState, Switch, SwitchColor, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::Workspace;
@@ -172,19 +172,29 @@ impl AgentConfiguration {
            .unwrap_or(false);

        v_flex()
-            .py_2()
-            .gap_1p5()
-            .border_t_1()
-            .border_color(cx.theme().colors().border.opacity(0.6))
+            .when(is_expanded, |this| this.mb_2())
+            .child(
+                div()
+                    .opacity(0.6)
+                    .px_2()
+                    .child(Divider::horizontal().color(DividerColor::Border)),
+            )
            .child(
                h_flex()
+                    .map(|this| {
+                        if is_expanded {
+                            this.mt_2().mb_1()
+                        } else {
+                            this.my_2()
+                        }
+                    })
                    .w_full()
-                    .gap_1()
                    .justify_between()
                    .child(
                        h_flex()
                            .id(provider_id_string.clone())
                            .cursor_pointer()
+                            .px_2()
                            .py_0p5()
                            .w_full()
                            .justify_between()
@@ -247,12 +257,16 @@ impl AgentConfiguration {
                        )
                    }),
            )
-            .when(is_expanded, |parent| match configuration_view {
-                Some(configuration_view) => parent.child(configuration_view),
-                None => parent.child(Label::new(format!(
-                    "No configuration view for {provider_name}",
-                ))),
-            })
+            .child(
+                div()
+                    .px_2()
+                    .when(is_expanded, |parent| match configuration_view {
+                        Some(configuration_view) => parent.child(configuration_view),
+                        None => parent.child(Label::new(format!(
+                            "No configuration view for {provider_name}",
+                        ))),
+                    }),
+            )
    }

    fn render_provider_configuration_section(
@@ -262,12 +276,11 @@ impl AgentConfiguration {
        let providers = LanguageModelRegistry::read_global(cx).providers();

        v_flex()
-            .p(DynamicSpacing::Base16.rems(cx))
-            .pr(DynamicSpacing::Base20.rems(cx))
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
            .child(
                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .pr(DynamicSpacing::Base20.rems(cx))
+                    .pb_0()
                    .mb_2p5()
                    .gap_0p5()
                    .child(Headline::new("LLM Providers"))
@@ -276,10 +289,15 @@ impl AgentConfiguration {
                            .color(Color::Muted),
                    ),
            )
-            .children(
-                providers
-                    .into_iter()
-                    .map(|provider| self.render_provider_configuration_block(&provider, cx)),
+            .child(
+                div()
+                    .pl(DynamicSpacing::Base08.rems(cx))
+                    .pr(DynamicSpacing::Base20.rems(cx))
+                    .children(
+                        providers.into_iter().map(|provider| {
+                            self.render_provider_configuration_block(&provider, cx)
+                        }),
+                    ),
            )
    }

@@ -418,7 +436,7 @@ impl AgentConfiguration {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let context_server_ids = self.context_server_store.read(cx).all_server_ids().clone();
+        let context_server_ids = self.context_server_store.read(cx).configured_server_ids();

        v_flex()
            .p(DynamicSpacing::Base16.rems(cx))
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -379,6 +379,14 @@ impl ConfigureContextServerModal {
        };

        self.state = State::Waiting;
+
+        let existing_server = self.context_server_store.read(cx).get_running_server(&id);
+        if existing_server.is_some() {
+            self.context_server_store.update(cx, |store, cx| {
+                store.stop_server(&id, cx).log_err();
+            });
+        }
+
        let wait_for_context_server_task =
            wait_for_context_server(&self.context_server_store, id.clone(), cx);
        cx.spawn({
@@ -399,13 +407,21 @@ impl ConfigureContextServerModal {
        })
        .detach();

-        // When we write the settings to the file, the context server will be restarted.
-        workspace.update(cx, |workspace, cx| {
-            let fs = workspace.app_state().fs.clone();
-            update_settings_file::<ProjectSettings>(fs.clone(), cx, |project_settings, _| {
-                project_settings.context_servers.insert(id.0, settings);
+        let settings_changed =
+            ProjectSettings::get_global(cx).context_servers.get(&id.0) != Some(&settings);
+
+        if settings_changed {
+            // When we write the settings to the file, the context server will be restarted.
+            workspace.update(cx, |workspace, cx| {
+                let fs = workspace.app_state().fs.clone();
+                update_settings_file::<ProjectSettings>(fs.clone(), cx, |project_settings, _| {
+                    project_settings.context_servers.insert(id.0, settings);
+                });
            });
-        });
+        } else if let Some(existing_server) = existing_server {
+            self.context_server_store
+                .update(cx, |store, cx| store.start_server(existing_server, cx));
+        }
    }

    fn cancel(&mut self, _: &menu::Cancel, cx: &mut Context<Self>) {
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -54,42 +54,76 @@ pub use ui::preview::{all_agent_previews, get_agent_preview};
 actions!(
    agent,
    [
+        /// Creates a new text-based conversation thread.
        NewTextThread,
+        /// Toggles the context picker interface for adding files, symbols, or other context.
        ToggleContextPicker,
+        /// Toggles the navigation menu for switching between threads and views.
        ToggleNavigationMenu,
+        /// Toggles the options menu for agent settings and preferences.
        ToggleOptionsMenu,
+        /// Deletes the recently opened thread from history.
        DeleteRecentlyOpenThread,
+        /// Toggles the profile selector for switching between agent profiles.
        ToggleProfileSelector,
+        /// Removes all added context from the current conversation.
        RemoveAllContext,
+        /// Expands the message editor to full size.
        ExpandMessageEditor,
+        /// Opens the conversation history view.
        OpenHistory,
+        /// Adds a context server to the configuration.
        AddContextServer,
+        /// Removes the currently selected thread.
        RemoveSelectedThread,
+        /// Starts a chat conversation with the agent.
        Chat,
+        /// Starts a chat conversation with follow-up enabled.
        ChatWithFollow,
+        /// Cycles to the next inline assist suggestion.
        CycleNextInlineAssist,
+        /// Cycles to the previous inline assist suggestion.
        CyclePreviousInlineAssist,
+        /// Moves focus up in the interface.
        FocusUp,
+        /// Moves focus down in the interface.
        FocusDown,
+        /// Moves focus left in the interface.
        FocusLeft,
+        /// Moves focus right in the interface.
        FocusRight,
+        /// Removes the currently focused context item.
        RemoveFocusedContext,
+        /// Accepts the suggested context item.
        AcceptSuggestedContext,
+        /// Opens the active thread as a markdown file.
        OpenActiveThreadAsMarkdown,
+        /// Opens the agent diff view to review changes.
        OpenAgentDiff,
+        /// Keeps the current suggestion or change.
        Keep,
+        /// Rejects the current suggestion or change.
        Reject,
+        /// Rejects all suggestions or changes.
        RejectAll,
+        /// Keeps all suggestions or changes.
        KeepAll,
+        /// Follows the agent's suggestions.
        Follow,
+        /// Resets the trial upsell notification.
        ResetTrialUpsell,
+        /// Resets the trial end upsell notification.
        ResetTrialEndUpsell,
+        /// Continues the current thread.
        ContinueThread,
+        /// Continues the thread with burn mode enabled.
        ContinueWithBurnMode,
+        /// Toggles burn mode for faster responses.
        ToggleBurnMode,
    ]
 );

+/// Creates a new conversation thread, optionally based on an existing thread.
 #[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
 #[serde(deny_unknown_fields)]
@@ -98,6 +132,7 @@ pub struct NewThread {
    from_thread_id: Option<ThreadId>,
 }

+/// Opens the profile management interface for configuring agent tools and settings.
 #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
 #[serde(deny_unknown_fields)]
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -426,6 +426,7 @@ impl ContextPicker {
                            this.add_recent_file(project_path.clone(), window, cx);
                        })
                    },
+                    None,
                )
            }
            RecentEntry::Thread(thread) => {
@@ -443,6 +444,7 @@ impl ContextPicker {
                                .detach_and_log_err(cx);
                        })
                    },
+                    None,
                )
            }
        }
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -686,6 +686,7 @@ impl ContextPickerCompletionProvider {
        let mut label = CodeLabel::plain(symbol.name.clone(), None);
        label.push_str(" ", None);
        label.push_str(&file_name, comment_id);
+        label.push_str(&format!(" L{}", symbol.range.start.0.row + 1), comment_id);

        let new_text = format!("{} ", MentionLink::for_symbol(&symbol.name, &full_path));
        let new_text_len = new_text.len();
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -18,6 +18,7 @@ use ui::{ListItem, ListItemSpacing, prelude::*};
 actions!(
    agent,
    [
+        /// Toggles the language model selector dropdown.
        #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
        ToggleModelSelector
    ]
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -1160,7 +1160,7 @@ impl MessageEditor {
                                })
                                .child(
                                    h_flex()
-                                        .id("file-name")
+                                        .id(("file-name", index))
                                        .pr_8()
                                        .gap_1p5()
                                        .max_w_full()
@@ -1171,9 +1171,16 @@ impl MessageEditor {
                                                .gap_0p5()
                                                .children(file_name)
                                                .children(file_path),
-                                        ), // TODO: Implement line diff
-                                           // .child(Label::new("+").color(Color::Created))
-                                           // .child(Label::new("-").color(Color::Deleted)),
+                                        )
+                                        .on_click({
+                                            let buffer = buffer.clone();
+                                            cx.listener(move |this, _, window, cx| {
+                                                this.handle_file_click(buffer.clone(), window, cx);
+                                            })
+                                        }), // TODO: Implement line diff
+                                            // .child(Label::new("+").color(Color::Created))
+                                            // .child(Label::new("-").color(Color::Deleted)),
+                                            //
                                )
                                .child(
                                    h_flex()
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -38,8 +38,8 @@ use language::{
    language_settings::{SoftWrap, all_language_settings},
 };
 use language_model::{
-    ConfigurationError, LanguageModelImage, LanguageModelProviderTosView, LanguageModelRegistry,
-    Role,
+    ConfigurationError, LanguageModelExt, LanguageModelImage, LanguageModelProviderTosView,
+    LanguageModelRegistry, Role,
 };
 use multi_buffer::MultiBufferRow;
 use picker::{Picker, popover_menu::PickerPopoverMenu};
@@ -85,16 +85,24 @@ use assistant_context::{
 actions!(
    assistant,
    [
+        /// Sends the current message to the assistant.
        Assist,
+        /// Confirms and executes the entered slash command.
        ConfirmCommand,
+        /// Copies code from the assistant's response to the clipboard.
        CopyCode,
+        /// Cycles between user and assistant message roles.
        CycleMessageRole,
+        /// Inserts the selected text into the active editor.
        InsertIntoEditor,
+        /// Quotes the current selection in the assistant conversation.
        QuoteSelection,
+        /// Splits the conversation at the current cursor position.
        Split,
    ]
 );

+/// Inserts files that were dragged and dropped into the assistant conversation.
 #[derive(PartialEq, Clone, Action)]
 #[action(namespace = assistant, no_json, no_register)]
 pub enum InsertDraggedFiles {
@@ -3055,7 +3063,7 @@ fn token_state(context: &Entity<AssistantContext>, cx: &App) -> Option<TokenStat
        .default_model()?
        .model;
    let token_count = context.read(cx).token_count()?;
-    let max_token_count = model.max_token_count();
+    let max_token_count = model.max_token_count_for_mode(context.read(cx).completion_mode().into());
    let token_state = if max_token_count.saturating_sub(token_count) == 0 {
        TokenState::NoTokensLeft {
            max_token_count,
--- a/crates/agent_ui/src/tool_compatibility.rs
+++ b/crates/agent_ui/src/tool_compatibility.rs
@@ -42,8 +42,8 @@ impl IncompatibleToolsState {
                    .profile()
                    .enabled_tools(cx)
                    .iter()
-                    .filter(|tool| tool.input_schema(model.tool_input_format()).is_err())
-                    .cloned()
+                    .filter(|(_, tool)| tool.input_schema(model.tool_input_format()).is_err())
+                    .map(|(_, tool)| tool.clone())
                    .collect()
            })
    }
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -1,5 +1,4 @@
 mod agent_notification;
-mod animated_label;
 mod burn_mode_tooltip;
 mod context_pill;
 mod onboarding_modal;
@@ -7,7 +6,6 @@ pub mod preview;
 mod upsell;

 pub use agent_notification::*;
-pub use animated_label::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
 pub use onboarding_modal::*;
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -15,6 +15,8 @@ path = "src/askpass.rs"
 anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
+net.workspace = true
+parking_lot.workspace = true
 smol.workspace = true
 tempfile.workspace = true
 util.workspace = true
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -1,21 +1,14 @@
-use std::path::{Path, PathBuf};
-use std::time::Duration;
+use std::{ffi::OsStr, time::Duration};

-#[cfg(unix)]
-use anyhow::Context as _;
+use anyhow::{Context as _, Result};
 use futures::channel::{mpsc, oneshot};
-#[cfg(unix)]
-use futures::{AsyncBufReadExt as _, io::BufReader};
-#[cfg(unix)]
-use futures::{AsyncWriteExt as _, FutureExt as _, select_biased};
-use futures::{SinkExt, StreamExt};
+use futures::{
+    AsyncBufReadExt as _, AsyncWriteExt as _, FutureExt as _, SinkExt, StreamExt, io::BufReader,
+    select_biased,
+};
 use gpui::{AsyncApp, BackgroundExecutor, Task};
-#[cfg(unix)]
 use smol::fs;
-#[cfg(unix)]
-use smol::net::unix::UnixListener;
-#[cfg(unix)]
-use util::{ResultExt as _, fs::make_file_executable, get_shell_safe_zed_path};
+use util::ResultExt as _;

 #[derive(PartialEq, Eq)]
 pub enum AskPassResult {
@@ -42,41 +35,56 @@ impl AskPassDelegate {
        Self { tx, _task: task }
    }

-    pub async fn ask_password(&mut self, prompt: String) -> anyhow::Result<String> {
+    pub async fn ask_password(&mut self, prompt: String) -> Result<String> {
        let (tx, rx) = oneshot::channel();
        self.tx.send((prompt, tx)).await?;
        Ok(rx.await?)
    }
 }

-#[cfg(unix)]
 pub struct AskPassSession {
-    script_path: PathBuf,
+    #[cfg(not(target_os = "windows"))]
+    script_path: std::path::PathBuf,
+    #[cfg(target_os = "windows")]
+    askpass_helper: String,
+    #[cfg(target_os = "windows")]
+    secret: std::sync::Arc<parking_lot::Mutex<String>>,
    _askpass_task: Task<()>,
    askpass_opened_rx: Option<oneshot::Receiver<()>>,
    askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
 }

-#[cfg(unix)]
+#[cfg(not(target_os = "windows"))]
+const ASKPASS_SCRIPT_NAME: &str = "askpass.sh";
+#[cfg(target_os = "windows")]
+const ASKPASS_SCRIPT_NAME: &str = "askpass.ps1";
+
 impl AskPassSession {
    /// This will create a new AskPassSession.
    /// You must retain this session until the master process exits.
    #[must_use]
-    pub async fn new(
-        executor: &BackgroundExecutor,
-        mut delegate: AskPassDelegate,
-    ) -> anyhow::Result<Self> {
+    pub async fn new(executor: &BackgroundExecutor, mut delegate: AskPassDelegate) -> Result<Self> {
+        use net::async_net::UnixListener;
+        use util::fs::make_file_executable;
+
+        #[cfg(target_os = "windows")]
+        let secret = std::sync::Arc::new(parking_lot::Mutex::new(String::new()));
        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
        let askpass_socket = temp_dir.path().join("askpass.sock");
-        let askpass_script_path = temp_dir.path().join("askpass.sh");
+        let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
-        let listener =
-            UnixListener::bind(&askpass_socket).context("failed to create askpass socket")?;
-        let zed_path = get_shell_safe_zed_path()?;
+        let listener = UnixListener::bind(&askpass_socket).context("creating askpass socket")?;
+        #[cfg(not(target_os = "windows"))]
+        let zed_path = util::get_shell_safe_zed_path()?;
+        #[cfg(target_os = "windows")]
+        let zed_path = std::env::current_exe()
+            .context("finding current executable path for use in askpass")?;

        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
        let mut kill_tx = Some(askpass_kill_master_tx);

+        #[cfg(target_os = "windows")]
+        let askpass_secret = secret.clone();
        let askpass_task = executor.spawn(async move {
            let mut askpass_opened_tx = Some(askpass_opened_tx);

@@ -93,10 +101,14 @@ impl AskPassSession {
                if let Some(password) = delegate
                    .ask_password(prompt.to_string())
                    .await
-                    .context("failed to get askpass password")
+                    .context("getting askpass password")
                    .log_err()
                {
                    stream.write_all(password.as_bytes()).await.log_err();
+                    #[cfg(target_os = "windows")]
+                    {
+                        *askpass_secret.lock() = password;
+                    }
                } else {
                    if let Some(kill_tx) = kill_tx.take() {
                        kill_tx.send(()).log_err();
@@ -112,34 +124,49 @@ impl AskPassSession {
        });

        // Create an askpass script that communicates back to this process.
-        let askpass_script = format!(
-            "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
-            zed_exe = zed_path,
-            askpass_socket = askpass_socket.display(),
-            print_args = "printf '%s\\0' \"$@\"",
-            shebang = "#!/bin/sh",
-        );
-        fs::write(&askpass_script_path, askpass_script).await?;
+        let askpass_script = generate_askpass_script(&zed_path, &askpass_socket);
+        fs::write(&askpass_script_path, askpass_script)
+            .await
+            .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
        make_file_executable(&askpass_script_path).await?;
+        #[cfg(target_os = "windows")]
+        let askpass_helper = format!(
+            "powershell.exe -ExecutionPolicy Bypass -File {}",
+            askpass_script_path.display()
+        );

        Ok(Self {
+            #[cfg(not(target_os = "windows"))]
            script_path: askpass_script_path,
+
+            #[cfg(target_os = "windows")]
+            secret,
+            #[cfg(target_os = "windows")]
+            askpass_helper,
+
            _askpass_task: askpass_task,
            askpass_kill_master_rx: Some(askpass_kill_master_rx),
            askpass_opened_rx: Some(askpass_opened_rx),
        })
    }

-    pub fn script_path(&self) -> &Path {
+    #[cfg(not(target_os = "windows"))]
+    pub fn script_path(&self) -> impl AsRef<OsStr> {
        &self.script_path
    }

+    #[cfg(target_os = "windows")]
+    pub fn script_path(&self) -> impl AsRef<OsStr> {
+        &self.askpass_helper
+    }
+
    // This will run the askpass task forever, resolving as many authentication requests as needed.
    // The caller is responsible for examining the result of their own commands and cancelling this
    // future when this is no longer needed. Note that this can only be called once, but due to the
    // drop order this takes an &mut, so you can `drop()` it after you're done with the master process.
    pub async fn run(&mut self) -> AskPassResult {
-        let connection_timeout = Duration::from_secs(10);
+        // This is the default timeout setting used by VSCode.
+        let connection_timeout = Duration::from_secs(17);
        let askpass_opened_rx = self.askpass_opened_rx.take().expect("Only call run once");
        let askpass_kill_master_rx = self
            .askpass_kill_master_rx
@@ -158,14 +185,19 @@ impl AskPassSession {
            }
        }
    }
+
+    /// This will return the password that was last set by the askpass script.
+    #[cfg(target_os = "windows")]
+    pub fn get_password(&self) -> String {
+        self.secret.lock().clone()
+    }
 }

 /// The main function for when Zed is running in netcat mode for use in askpass.
 /// Called from both the remote server binary and the zed binary in their respective main functions.
-#[cfg(unix)]
 pub fn main(socket: &str) {
+    use net::UnixStream;
    use std::io::{self, Read, Write};
-    use std::os::unix::net::UnixStream;
    use std::process::exit;

    let mut stream = match UnixStream::connect(socket) {
@@ -182,6 +214,10 @@ pub fn main(socket: &str) {
        exit(1);
    }

+    #[cfg(target_os = "windows")]
+    while buffer.last().map_or(false, |&b| b == b'\n' || b == b'\r') {
+        buffer.pop();
+    }
    if buffer.last() != Some(&b'\0') {
        buffer.push(b'\0');
    }
@@ -202,28 +238,28 @@ pub fn main(socket: &str) {
        exit(1);
    }
 }
-#[cfg(not(unix))]
-pub fn main(_socket: &str) {}

-#[cfg(not(unix))]
-pub struct AskPassSession {
-    path: PathBuf,
+#[inline]
+#[cfg(not(target_os = "windows"))]
+fn generate_askpass_script(zed_path: &str, askpass_socket: &std::path::Path) -> String {
+    format!(
+        "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
+        zed_exe = zed_path,
+        askpass_socket = askpass_socket.display(),
+        print_args = "printf '%s\\0' \"$@\"",
+        shebang = "#!/bin/sh",
+    )
 }

-#[cfg(not(unix))]
-impl AskPassSession {
-    pub async fn new(_: &BackgroundExecutor, _: AskPassDelegate) -> anyhow::Result<Self> {
-        Ok(Self {
-            path: PathBuf::new(),
-        })
-    }
-
-    pub fn script_path(&self) -> &Path {
-        &self.path
-    }
-
-    pub async fn run(&mut self) -> AskPassResult {
-        futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(20))).await;
-        AskPassResult::Timedout
-    }
+#[inline]
+#[cfg(target_os = "windows")]
+fn generate_askpass_script(zed_path: &std::path::Path, askpass_socket: &std::path::Path) -> String {
+    format!(
+        r#"
+        $ErrorActionPreference = 'Stop';
+        ($args -join [char]0) | & "{zed_exe}" --askpass={askpass_socket} 2> $null
+        "#,
+        zed_exe = zed_path.display(),
+        askpass_socket = askpass_socket.display(),
+    )
 }
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -22,6 +22,7 @@ gpui.workspace = true
 icons.workspace = true
 language.workspace = true
 language_model.workspace = true
+log.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 regex.workspace = true
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -1,5 +1,6 @@
 use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiff;
+use clock;
 use collections::BTreeMap;
 use futures::{FutureExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
@@ -17,6 +18,8 @@ pub struct ActionLog {
    edited_since_project_diagnostics_check: bool,
    /// The project this action log is associated with
    project: Entity<Project>,
+    /// Tracks which buffer versions have already been notified as changed externally
+    notified_versions: BTreeMap<Entity<Buffer>, clock::Global>,
 }

 impl ActionLog {
@@ -26,6 +29,7 @@ impl ActionLog {
            tracked_buffers: BTreeMap::default(),
            edited_since_project_diagnostics_check: false,
            project,
+            notified_versions: BTreeMap::default(),
        }
    }

@@ -51,6 +55,7 @@ impl ActionLog {
    ) -> &mut TrackedBuffer {
        let status = if is_created {
            if let Some(tracked) = self.tracked_buffers.remove(&buffer) {
+                self.notified_versions.remove(&buffer);
                match tracked.status {
                    TrackedBufferStatus::Created {
                        existing_file_content,
@@ -106,7 +111,7 @@ impl ActionLog {
                TrackedBuffer {
                    buffer: buffer.clone(),
                    diff_base,
-                    unreviewed_edits: unreviewed_edits,
+                    unreviewed_edits,
                    snapshot: text_snapshot.clone(),
                    status,
                    version: buffer.read(cx).version(),
@@ -165,6 +170,7 @@ impl ActionLog {
                    // If the buffer had been edited by a tool, but it got
                    // deleted externally, we want to stop tracking it.
                    self.tracked_buffers.remove(&buffer);
+                    self.notified_versions.remove(&buffer);
                }
                cx.notify();
            }
@@ -178,6 +184,7 @@ impl ActionLog {
                    // resurrected externally, we want to clear the edits we
                    // were tracking and reset the buffer's state.
                    self.tracked_buffers.remove(&buffer);
+                    self.notified_versions.remove(&buffer);
                    self.track_buffer_internal(buffer, false, cx);
                }
                cx.notify();
@@ -483,6 +490,7 @@ impl ActionLog {
        match tracked_buffer.status {
            TrackedBufferStatus::Created { .. } => {
                self.tracked_buffers.remove(&buffer);
+                self.notified_versions.remove(&buffer);
                cx.notify();
            }
            TrackedBufferStatus::Modified => {
@@ -508,6 +516,7 @@ impl ActionLog {
        match tracked_buffer.status {
            TrackedBufferStatus::Deleted => {
                self.tracked_buffers.remove(&buffer);
+                self.notified_versions.remove(&buffer);
                cx.notify();
            }
            _ => {
@@ -616,6 +625,7 @@ impl ActionLog {
                };

                self.tracked_buffers.remove(&buffer);
+                self.notified_versions.remove(&buffer);
                cx.notify();
                task
            }
@@ -629,6 +639,7 @@ impl ActionLog {

                // Clear all tracked edits for this buffer and start over as if we just read it.
                self.tracked_buffers.remove(&buffer);
+                self.notified_versions.remove(&buffer);
                self.buffer_read(buffer.clone(), cx);
                cx.notify();
                save
@@ -713,6 +724,33 @@ impl ActionLog {
            .collect()
    }

+    /// Returns stale buffers that haven't been notified yet
+    pub fn unnotified_stale_buffers<'a>(
+        &'a self,
+        cx: &'a App,
+    ) -> impl Iterator<Item = &'a Entity<Buffer>> {
+        self.stale_buffers(cx).filter(|buffer| {
+            let buffer_entity = buffer.read(cx);
+            self.notified_versions
+                .get(buffer)
+                .map_or(true, |notified_version| {
+                    *notified_version != buffer_entity.version
+                })
+        })
+    }
+
+    /// Marks the given buffers as notified at their current versions
+    pub fn mark_buffers_as_notified(
+        &mut self,
+        buffers: impl IntoIterator<Item = Entity<Buffer>>,
+        cx: &App,
+    ) {
+        for buffer in buffers {
+            let version = buffer.read(cx).version.clone();
+            self.notified_versions.insert(buffer, version);
+        }
+    }
+
    /// Iterate over buffers changed since last read or edited by the model
    pub fn stale_buffers<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = &'a Entity<Buffer>> {
        self.tracked_buffers
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -25,10 +25,15 @@ fn preprocess_json_schema(json: &mut Value) -> Result<()> {
    // `additionalProperties` defaults to `false` unless explicitly specified.
    // This prevents models from hallucinating tool parameters.
    if let Value::Object(obj) = json {
-        if let Some(Value::String(type_str)) = obj.get("type") {
-            if type_str == "object" && !obj.contains_key("additionalProperties") {
+        if matches!(obj.get("type"), Some(Value::String(s)) if s == "object") {
+            if !obj.contains_key("additionalProperties") {
                obj.insert("additionalProperties".to_string(), Value::Bool(false));
            }
+
+            // OpenAI API requires non-missing `properties`
+            if !obj.contains_key("properties") {
+                obj.insert("properties".to_string(), Value::Object(Default::default()));
+            }
        }
    }
    Ok(())
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -1,18 +1,52 @@
-use std::sync::Arc;
-
-use collections::{HashMap, IndexMap};
-use gpui::App;
+use std::{borrow::Borrow, sync::Arc};

 use crate::{Tool, ToolRegistry, ToolSource};
+use collections::{HashMap, HashSet, IndexMap};
+use gpui::{App, SharedString};
+use util::debug_panic;

 #[derive(Copy, Clone, PartialEq, Eq, Hash, Default)]
 pub struct ToolId(usize);

+/// A unique identifier for a tool within a working set.
+#[derive(Clone, PartialEq, Eq, Hash, Default)]
+pub struct UniqueToolName(SharedString);
+
+impl Borrow<str> for UniqueToolName {
+    fn borrow(&self) -> &str {
+        &self.0
+    }
+}
+
+impl From<String> for UniqueToolName {
+    fn from(value: String) -> Self {
+        UniqueToolName(SharedString::new(value))
+    }
+}
+
+impl Into<String> for UniqueToolName {
+    fn into(self) -> String {
+        self.0.into()
+    }
+}
+
+impl std::fmt::Debug for UniqueToolName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl std::fmt::Display for UniqueToolName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0.as_ref())
+    }
+}
+
 /// A working set of tools for use in one instance of the Assistant Panel.
 #[derive(Default)]
 pub struct ToolWorkingSet {
    context_server_tools_by_id: HashMap<ToolId, Arc<dyn Tool>>,
-    context_server_tools_by_name: HashMap<String, Arc<dyn Tool>>,
+    context_server_tools_by_name: HashMap<UniqueToolName, Arc<dyn Tool>>,
    next_tool_id: ToolId,
 }

@@ -24,16 +58,20 @@ impl ToolWorkingSet {
            .or_else(|| ToolRegistry::global(cx).tool(name))
    }

-    pub fn tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        let mut tools = ToolRegistry::global(cx).tools();
-        tools.extend(self.context_server_tools_by_id.values().cloned());
+    pub fn tools(&self, cx: &App) -> Vec<(UniqueToolName, Arc<dyn Tool>)> {
+        let mut tools = ToolRegistry::global(cx)
+            .tools()
+            .into_iter()
+            .map(|tool| (UniqueToolName(tool.name().into()), tool))
+            .collect::<Vec<_>>();
+        tools.extend(self.context_server_tools_by_name.clone());
        tools
    }

    pub fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
        let mut tools_by_source = IndexMap::default();

-        for tool in self.tools(cx) {
+        for (_, tool) in self.tools(cx) {
            tools_by_source
                .entry(tool.source())
                .or_insert_with(Vec::new)
@@ -49,27 +87,324 @@ impl ToolWorkingSet {
        tools_by_source
    }

-    pub fn insert(&mut self, tool: Arc<dyn Tool>) -> ToolId {
+    pub fn insert(&mut self, tool: Arc<dyn Tool>, cx: &App) -> ToolId {
+        let tool_id = self.register_tool(tool);
+        self.tools_changed(cx);
+        tool_id
+    }
+
+    pub fn extend(&mut self, tools: impl Iterator<Item = Arc<dyn Tool>>, cx: &App) -> Vec<ToolId> {
+        let ids = tools.map(|tool| self.register_tool(tool)).collect();
+        self.tools_changed(cx);
+        ids
+    }
+
+    pub fn remove(&mut self, tool_ids_to_remove: &[ToolId], cx: &App) {
+        self.context_server_tools_by_id
+            .retain(|id, _| !tool_ids_to_remove.contains(id));
+        self.tools_changed(cx);
+    }
+
+    fn register_tool(&mut self, tool: Arc<dyn Tool>) -> ToolId {
        let tool_id = self.next_tool_id;
        self.next_tool_id.0 += 1;
        self.context_server_tools_by_id
            .insert(tool_id, tool.clone());
-        self.tools_changed();
        tool_id
    }

-    pub fn remove(&mut self, tool_ids_to_remove: &[ToolId]) {
-        self.context_server_tools_by_id
-            .retain(|id, _| !tool_ids_to_remove.contains(id));
-        self.tools_changed();
-    }
-
-    fn tools_changed(&mut self) {
-        self.context_server_tools_by_name.clear();
-        self.context_server_tools_by_name.extend(
-            self.context_server_tools_by_id
+    fn tools_changed(&mut self, cx: &App) {
+        self.context_server_tools_by_name = resolve_context_server_tool_name_conflicts(
+            &self
+                .context_server_tools_by_id
                .values()
-                .map(|tool| (tool.name(), tool.clone())),
+                .cloned()
+                .collect::<Vec<_>>(),
+            &ToolRegistry::global(cx).tools(),
        );
    }
 }
+
+fn resolve_context_server_tool_name_conflicts(
+    context_server_tools: &[Arc<dyn Tool>],
+    native_tools: &[Arc<dyn Tool>],
+) -> HashMap<UniqueToolName, Arc<dyn Tool>> {
+    fn resolve_tool_name(tool: &Arc<dyn Tool>) -> String {
+        let mut tool_name = tool.name();
+        tool_name.truncate(MAX_TOOL_NAME_LENGTH);
+        tool_name
+    }
+
+    const MAX_TOOL_NAME_LENGTH: usize = 64;
+
+    let mut duplicated_tool_names = HashSet::default();
+    let mut seen_tool_names = HashSet::default();
+    seen_tool_names.extend(native_tools.iter().map(|tool| tool.name()));
+    for tool in context_server_tools {
+        let tool_name = resolve_tool_name(tool);
+        if seen_tool_names.contains(&tool_name) {
+            debug_assert!(
+                tool.source() != ToolSource::Native,
+                "Expected MCP tool but got a native tool: {}",
+                tool_name
+            );
+            duplicated_tool_names.insert(tool_name);
+        } else {
+            seen_tool_names.insert(tool_name);
+        }
+    }
+
+    if duplicated_tool_names.is_empty() {
+        return context_server_tools
+            .into_iter()
+            .map(|tool| (resolve_tool_name(tool).into(), tool.clone()))
+            .collect();
+    }
+
+    context_server_tools
+        .into_iter()
+        .filter_map(|tool| {
+            let mut tool_name = resolve_tool_name(tool);
+            if !duplicated_tool_names.contains(&tool_name) {
+                return Some((tool_name.into(), tool.clone()));
+            }
+            match tool.source() {
+                ToolSource::Native => {
+                    debug_panic!("Expected MCP tool but got a native tool: {}", tool_name);
+                    // Built-in tools always keep their original name
+                    Some((tool_name.into(), tool.clone()))
+                }
+                ToolSource::ContextServer { id } => {
+                    // Context server tools are prefixed with the context server ID, and truncated if necessary
+                    tool_name.insert(0, '_');
+                    if tool_name.len() + id.len() > MAX_TOOL_NAME_LENGTH {
+                        let len = MAX_TOOL_NAME_LENGTH - tool_name.len();
+                        let mut id = id.to_string();
+                        id.truncate(len);
+                        tool_name.insert_str(0, &id);
+                    } else {
+                        tool_name.insert_str(0, &id);
+                    }
+
+                    tool_name.truncate(MAX_TOOL_NAME_LENGTH);
+
+                    if seen_tool_names.contains(&tool_name) {
+                        log::error!("Cannot resolve tool name conflict for tool {}", tool.name());
+                        None
+                    } else {
+                        Some((tool_name.into(), tool.clone()))
+                    }
+                }
+            }
+        })
+        .collect()
+}
+#[cfg(test)]
+mod tests {
+    use gpui::{AnyWindowHandle, Entity, Task, TestAppContext};
+    use language_model::{LanguageModel, LanguageModelRequest};
+    use project::Project;
+
+    use crate::{ActionLog, ToolResult};
+
+    use super::*;
+
+    #[gpui::test]
+    fn test_unique_tool_names(cx: &mut TestAppContext) {
+        fn assert_tool(
+            tool_working_set: &ToolWorkingSet,
+            unique_name: &str,
+            expected_name: &str,
+            expected_source: ToolSource,
+            cx: &App,
+        ) {
+            let tool = tool_working_set.tool(unique_name, cx).unwrap();
+            assert_eq!(tool.name(), expected_name);
+            assert_eq!(tool.source(), expected_source);
+        }
+
+        let tool_registry = cx.update(ToolRegistry::default_global);
+        tool_registry.register_tool(TestTool::new("tool1", ToolSource::Native));
+        tool_registry.register_tool(TestTool::new("tool2", ToolSource::Native));
+
+        let mut tool_working_set = ToolWorkingSet::default();
+        cx.update(|cx| {
+            tool_working_set.extend(
+                vec![
+                    Arc::new(TestTool::new(
+                        "tool2",
+                        ToolSource::ContextServer { id: "mcp-1".into() },
+                    )) as Arc<dyn Tool>,
+                    Arc::new(TestTool::new(
+                        "tool2",
+                        ToolSource::ContextServer { id: "mcp-2".into() },
+                    )) as Arc<dyn Tool>,
+                ]
+                .into_iter(),
+                cx,
+            );
+        });
+
+        cx.update(|cx| {
+            assert_tool(&tool_working_set, "tool1", "tool1", ToolSource::Native, cx);
+            assert_tool(&tool_working_set, "tool2", "tool2", ToolSource::Native, cx);
+            assert_tool(
+                &tool_working_set,
+                "mcp-1_tool2",
+                "tool2",
+                ToolSource::ContextServer { id: "mcp-1".into() },
+                cx,
+            );
+            assert_tool(
+                &tool_working_set,
+                "mcp-2_tool2",
+                "tool2",
+                ToolSource::ContextServer { id: "mcp-2".into() },
+                cx,
+            );
+        })
+    }
+
+    #[gpui::test]
+    fn test_resolve_context_server_tool_name_conflicts() {
+        assert_resolve_context_server_tool_name_conflicts(
+            vec![
+                TestTool::new("tool1", ToolSource::Native),
+                TestTool::new("tool2", ToolSource::Native),
+            ],
+            vec![TestTool::new(
+                "tool3",
+                ToolSource::ContextServer { id: "mcp-1".into() },
+            )],
+            vec!["tool3"],
+        );
+
+        assert_resolve_context_server_tool_name_conflicts(
+            vec![
+                TestTool::new("tool1", ToolSource::Native),
+                TestTool::new("tool2", ToolSource::Native),
+            ],
+            vec![
+                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-1".into() }),
+                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-2".into() }),
+            ],
+            vec!["mcp-1_tool3", "mcp-2_tool3"],
+        );
+
+        assert_resolve_context_server_tool_name_conflicts(
+            vec![
+                TestTool::new("tool1", ToolSource::Native),
+                TestTool::new("tool2", ToolSource::Native),
+                TestTool::new("tool3", ToolSource::Native),
+            ],
+            vec![
+                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-1".into() }),
+                TestTool::new("tool3", ToolSource::ContextServer { id: "mcp-2".into() }),
+            ],
+            vec!["mcp-1_tool3", "mcp-2_tool3"],
+        );
+
+        // Test deduplication of tools with very long names, in this case the mcp server name should be truncated
+        assert_resolve_context_server_tool_name_conflicts(
+            vec![TestTool::new(
+                "tool-with-very-very-very-long-name",
+                ToolSource::Native,
+            )],
+            vec![TestTool::new(
+                "tool-with-very-very-very-long-name",
+                ToolSource::ContextServer {
+                    id: "mcp-with-very-very-very-long-name".into(),
+                },
+            )],
+            vec!["mcp-with-very-very-very-long-_tool-with-very-very-very-long-name"],
+        );
+
+        fn assert_resolve_context_server_tool_name_conflicts(
+            builtin_tools: Vec<TestTool>,
+            context_server_tools: Vec<TestTool>,
+            expected: Vec<&'static str>,
+        ) {
+            let context_server_tools: Vec<Arc<dyn Tool>> = context_server_tools
+                .into_iter()
+                .map(|t| Arc::new(t) as Arc<dyn Tool>)
+                .collect();
+            let builtin_tools: Vec<Arc<dyn Tool>> = builtin_tools
+                .into_iter()
+                .map(|t| Arc::new(t) as Arc<dyn Tool>)
+                .collect();
+            let tools =
+                resolve_context_server_tool_name_conflicts(&context_server_tools, &builtin_tools);
+            assert_eq!(tools.len(), expected.len());
+            for (i, (name, _)) in tools.into_iter().enumerate() {
+                assert_eq!(
+                    name.0.as_ref(),
+                    expected[i],
+                    "Expected '{}' got '{}' at index {}",
+                    expected[i],
+                    name,
+                    i
+                );
+            }
+        }
+    }
+
+    struct TestTool {
+        name: String,
+        source: ToolSource,
+    }
+
+    impl TestTool {
+        fn new(name: impl Into<String>, source: ToolSource) -> Self {
+            Self {
+                name: name.into(),
+                source,
+            }
+        }
+    }
+
+    impl Tool for TestTool {
+        fn name(&self) -> String {
+            self.name.clone()
+        }
+
+        fn icon(&self) -> icons::IconName {
+            icons::IconName::Ai
+        }
+
+        fn may_perform_edits(&self) -> bool {
+            false
+        }
+
+        fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
+            true
+        }
+
+        fn source(&self) -> ToolSource {
+            self.source.clone()
+        }
+
+        fn description(&self) -> String {
+            "Test tool".to_string()
+        }
+
+        fn ui_text(&self, _input: &serde_json::Value) -> String {
+            "Test tool".to_string()
+        }
+
+        fn run(
+            self: Arc<Self>,
+            _input: serde_json::Value,
+            _request: Arc<LanguageModelRequest>,
+            _project: Entity<Project>,
+            _action_log: Entity<ActionLog>,
+            _model: Arc<dyn LanguageModel>,
+            _window: Option<AnyWindowHandle>,
+            _cx: &mut App,
+        ) -> ToolResult {
+            ToolResult {
+                output: Task::ready(Err(anyhow::anyhow!("No content"))),
+                card: None,
+            }
+        }
+    }
+}
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -11,6 +11,7 @@ mod list_directory_tool;
 mod move_path_tool;
 mod now_tool;
 mod open_tool;
+mod project_notifications_tool;
 mod read_file_tool;
 mod schema;
 mod templates;
@@ -45,6 +46,7 @@ pub use edit_file_tool::{EditFileMode, EditFileToolInput};
 pub use find_path_tool::FindPathToolInput;
 pub use grep_tool::{GrepTool, GrepToolInput};
 pub use open_tool::OpenTool;
+pub use project_notifications_tool::ProjectNotificationsTool;
 pub use read_file_tool::{ReadFileTool, ReadFileToolInput};
 pub use terminal_tool::TerminalTool;

@@ -61,6 +63,7 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    registry.register_tool(ListDirectoryTool);
    registry.register_tool(NowTool);
    registry.register_tool(OpenTool);
+    registry.register_tool(ProjectNotificationsTool);
    registry.register_tool(FindPathTool);
    registry.register_tool(ReadFileTool);
    registry.register_tool(GrepTool);
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
@@ -9132,7 +9132,7 @@ impl Editor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.sort())
+        self.manipulate_lines(window, cx, |lines| lines.sort())
    }

    pub fn sort_lines_case_insensitive(
@@ -9141,7 +9141,7 @@ impl Editor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
+        self.manipulate_lines(window, cx, |lines| {
            lines.sort_by_key(|line| line.to_lowercase())
        })
    }
@@ -9152,7 +9152,7 @@ impl Editor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
+        self.manipulate_lines(window, cx, |lines| {
            let mut seen = HashSet::default();
            lines.retain(|line| seen.insert(line.to_lowercase()));
        })
@@ -9164,7 +9164,7 @@ impl Editor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
+        self.manipulate_lines(window, cx, |lines| {
            let mut seen = HashSet::default();
            lines.retain(|line| seen.insert(*line));
        })
@@ -9606,20 +9606,20 @@ impl Editor {
    }

    pub fn reverse_lines(&mut self, _: &ReverseLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.reverse())
+        self.manipulate_lines(window, cx, |lines| lines.reverse())
    }

    pub fn shuffle_lines(&mut self, _: &ShuffleLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.shuffle(&mut thread_rng()))
+        self.manipulate_lines(window, cx, |lines| lines.shuffle(&mut thread_rng()))
    }

-    fn manipulate_lines<M>(
+    fn manipulate_lines<Fn>(
        &mut self,
        window: &mut Window,
        cx: &mut Context<Self>,
-        mut manipulate: M,
+        mut callback: Fn,
    ) where
-        M: FnMut(&str) -> LineManipulationResult,
+        Fn: FnMut(&mut Vec<&str>),
    {
        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);

@@ -9652,14 +9652,18 @@ impl Editor {
                .text_for_range(start_point..end_point)
                .collect::<String>();

-            let LineManipulationResult { new_text, line_count_before, line_count_after} = manipulate(&text);
+            let mut lines = text.split('\n').collect_vec();

-            edits.push((start_point..end_point, new_text));
+            let lines_before = lines.len();
+            callback(&mut lines);
+            let lines_after = lines.len();
+
+            edits.push((start_point..end_point, lines.join("\n")));

            // Selections must change based on added and removed line count
            let start_row =
                MultiBufferRow(start_point.row + added_lines as u32 - removed_lines as u32);
-            let end_row = MultiBufferRow(start_row.0 + line_count_after.saturating_sub(1) as u32);
+            let end_row = MultiBufferRow(start_row.0 + lines_after.saturating_sub(1) as u32);
            new_selections.push(Selection {
                id: selection.id,
                start: start_row,
@@ -9668,10 +9672,10 @@ impl Editor {
                reversed: selection.reversed,
            });

-            if line_count_after > line_count_before {
-                added_lines += line_count_after - line_count_before;
-            } else if line_count_before > line_count_after {
-                removed_lines += line_count_before - line_count_after;
+            if lines_after > lines_before {
+                added_lines += lines_after - lines_before;
+            } else if lines_before > lines_after {
+                removed_lines += lines_before - lines_after;
            }
        }

@@ -9716,171 +9720,6 @@ impl Editor {
        })
    }

-    fn manipulate_immutable_lines<Fn>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut callback: Fn,
-    ) where
-        Fn: FnMut(&mut Vec<&str>),
-    {
-        self.manipulate_lines(window, cx, |text| {
-            let mut lines: Vec<&str> = text.split('\n').collect();
-            let line_count_before = lines.len();
-
-            callback(&mut lines);
-
-            LineManipulationResult {
-                new_text: lines.join("\n"),
-                line_count_before,
-                line_count_after: lines.len(),
-            }
-        });
-    }
-
-    fn manipulate_mutable_lines<Fn>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut callback: Fn,
-    ) where
-        Fn: FnMut(&mut Vec<Cow<'_, str>>),
-    {
-        self.manipulate_lines(window, cx, |text| {
-            let mut lines: Vec<Cow<str>> = text.split('\n').map(Cow::from).collect();
-            let line_count_before = lines.len();
-
-            callback(&mut lines);
-
-            LineManipulationResult {
-                new_text: lines.join("\n"),
-                line_count_before,
-                line_count_after: lines.len(),
-            }
-        });
-    }
-
-    pub fn convert_indentation_to_spaces(
-        &mut self,
-        _: &ConvertIndentationToSpaces,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let tab_size = settings.tab_size.get() as usize;
-
-        self.manipulate_mutable_lines(window, cx, |lines| {
-            // Allocates a reasonably sized scratch buffer once for the whole loop
-            let mut reindented_line = String::with_capacity(MAX_LINE_LEN);
-            // Avoids recomputing spaces that could be inserted many times
-            let space_cache: Vec<Vec<char>> = (1..=tab_size)
-                .map(|n| IndentSize::spaces(n as u32).chars().collect())
-                .collect();
-
-            for line in lines.iter_mut().filter(|line| !line.is_empty()) {
-                let mut chars = line.as_ref().chars();
-                let mut col = 0;
-                let mut changed = false;
-
-                while let Some(ch) = chars.next() {
-                    match ch {
-                        ' ' => {
-                            reindented_line.push(' ');
-                            col += 1;
-                        }
-                        '\t' => {
-                            // \t are converted to spaces depending on the current column
-                            let spaces_len = tab_size - (col % tab_size);
-                            reindented_line.extend(&space_cache[spaces_len - 1]);
-                            col += spaces_len;
-                            changed = true;
-                        }
-                        _ => {
-                            // If we dont append before break, the character is consumed
-                            reindented_line.push(ch);
-                            break;
-                        }
-                    }
-                }
-
-                if !changed {
-                    reindented_line.clear();
-                    continue;
-                }
-                // Append the rest of the line and replace old reference with new one
-                reindented_line.extend(chars);
-                *line = Cow::Owned(reindented_line.clone());
-                reindented_line.clear();
-            }
-        });
-    }
-
-    pub fn convert_indentation_to_tabs(
-        &mut self,
-        _: &ConvertIndentationToTabs,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let tab_size = settings.tab_size.get() as usize;
-
-        self.manipulate_mutable_lines(window, cx, |lines| {
-            // Allocates a reasonably sized buffer once for the whole loop
-            let mut reindented_line = String::with_capacity(MAX_LINE_LEN);
-            // Avoids recomputing spaces that could be inserted many times
-            let space_cache: Vec<Vec<char>> = (1..=tab_size)
-                .map(|n| IndentSize::spaces(n as u32).chars().collect())
-                .collect();
-
-            for line in lines.iter_mut().filter(|line| !line.is_empty()) {
-                let mut chars = line.chars();
-                let mut spaces_count = 0;
-                let mut first_non_indent_char = None;
-                let mut changed = false;
-
-                while let Some(ch) = chars.next() {
-                    match ch {
-                        ' ' => {
-                            // Keep track of spaces. Append \t when we reach tab_size
-                            spaces_count += 1;
-                            changed = true;
-                            if spaces_count == tab_size {
-                                reindented_line.push('\t');
-                                spaces_count = 0;
-                            }
-                        }
-                        '\t' => {
-                            reindented_line.push('\t');
-                            spaces_count = 0;
-                        }
-                        _ => {
-                            // Dont append it yet, we might have remaining spaces
-                            first_non_indent_char = Some(ch);
-                            break;
-                        }
-                    }
-                }
-
-                if !changed {
-                    reindented_line.clear();
-                    continue;
-                }
-                // Remaining spaces that didn't make a full tab stop
-                if spaces_count > 0 {
-                    reindented_line.extend(&space_cache[spaces_count - 1]);
-                }
-                // If we consume an extra character that was not indentation, add it back
-                if let Some(extra_char) = first_non_indent_char {
-                    reindented_line.push(extra_char);
-                }
-                // Append the rest of the line and replace old reference with new one
-                reindented_line.extend(chars);
-                *line = Cow::Owned(reindented_line.clone());
-                reindented_line.clear();
-            }
-        });
-    }
-
    pub fn convert_to_upper_case(
        &mut self,
        _: &ConvertToUpperCase,
@@ -21318,13 +21157,6 @@ pub struct LineHighlight {
    pub type_id: Option<TypeId>,
 }

-struct LineManipulationResult {
-    pub new_text: String,
-    pub line_count_before: usize,
-    pub line_count_after: usize,
-}
-
-
 fn render_diff_hunk_controls(
    row: u32,
    status: &DiffHunkStatus,
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -4,6 +4,7 @@ use crate::{
    schema::json_schema_for,
    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
+use agent_settings;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{
    ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolResultContent, ToolResultOutput,
@@ -14,7 +15,7 @@ use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, WeakEntity, pulsating_between, px,
+    TextStyleRefinement, Transformation, WeakEntity, percentage, pulsating_between, px,
 };
 use indoc::formatdoc;
 use language::{
@@ -515,7 +516,9 @@ pub struct EditFileToolCard {

 impl EditFileToolCard {
    pub fn new(path: PathBuf, project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
+        let expand_edit_card = agent_settings::AgentSettings::get_global(cx).expand_edit_card;
        let multibuffer = cx.new(|_| MultiBuffer::without_headers(Capability::ReadOnly));
+
        let editor = cx.new(|cx| {
            let mut editor = Editor::new(
                EditorMode::Full {
@@ -556,7 +559,7 @@ impl EditFileToolCard {
            diff_task: None,
            preview_expanded: true,
            error_expanded: None,
-            full_height_expanded: true,
+            full_height_expanded: expand_edit_card,
            total_lines: None,
        }
    }
@@ -755,6 +758,13 @@ impl ToolCard for EditFileToolCard {
            _ => None,
        };

+        let running_or_pending = match status {
+            ToolUseStatus::Running | ToolUseStatus::Pending => Some(()),
+            _ => None,
+        };
+
+        let should_show_loading = running_or_pending.is_some() && !self.full_height_expanded;
+
        let path_label_button = h_flex()
            .id(("edit-tool-path-label-button", self.editor.entity_id()))
            .w_full()
@@ -863,6 +873,18 @@ impl ToolCard for EditFileToolCard {
                header.bg(codeblock_header_bg)
            })
            .child(path_label_button)
+            .when(should_show_loading, |header| {
+                header.pr_1p5().child(
+                    Icon::new(IconName::ArrowCircle)
+                        .size(IconSize::XSmall)
+                        .color(Color::Info)
+                        .with_animation(
+                            "arrow-circle",
+                            Animation::new(Duration::from_secs(2)).repeat(),
+                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                        ),
+                )
+            })
            .when_some(error_message, |header, error_message| {
                header.child(
                    h_flex()
--- a/crates/assistant_tools/src/project_notifications_tool.rs
+++ b/crates/assistant_tools/src/project_notifications_tool.rs
@@ -0,0 +1,224 @@
+use crate::schema::json_schema_for;
+use anyhow::Result;
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use gpui::{AnyWindowHandle, App, Entity, Task};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::fmt::Write as _;
+use std::sync::Arc;
+use ui::IconName;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ProjectUpdatesToolInput {}
+
+pub struct ProjectNotificationsTool;
+
+impl Tool for ProjectNotificationsTool {
+    fn name(&self) -> String {
+        "project_notifications".to_string()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+    fn description(&self) -> String {
+        include_str!("./project_notifications_tool/description.md").to_string()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Envelope
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<ProjectUpdatesToolInput>(format)
+    }
+
+    fn ui_text(&self, _input: &serde_json::Value) -> String {
+        "Check project notifications".into()
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _input: serde_json::Value,
+        _request: Arc<LanguageModelRequest>,
+        _project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
+        _window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let mut stale_files = String::new();
+        let mut notified_buffers = Vec::new();
+
+        for stale_file in action_log.read(cx).unnotified_stale_buffers(cx) {
+            if let Some(file) = stale_file.read(cx).file() {
+                writeln!(&mut stale_files, "- {}", file.path().display()).ok();
+                notified_buffers.push(stale_file.clone());
+            }
+        }
+
+        if !notified_buffers.is_empty() {
+            action_log.update(cx, |log, cx| {
+                log.mark_buffers_as_notified(notified_buffers, cx);
+            });
+        }
+
+        let response = if stale_files.is_empty() {
+            "No new notifications".to_string()
+        } else {
+            // NOTE: Changes to this prompt require a symmetric update in the LLM Worker
+            const HEADER: &str = include_str!("./project_notifications_tool/prompt_header.txt");
+            format!("{HEADER}{stale_files}").replace("\r\n", "\n")
+        };
+
+        Task::ready(Ok(response.into())).into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use assistant_tool::ToolResultContent;
+    use gpui::{AppContext, TestAppContext};
+    use language_model::{LanguageModelRequest, fake_provider::FakeLanguageModelProvider};
+    use project::{FakeFs, Project};
+    use serde_json::json;
+    use settings::SettingsStore;
+    use std::sync::Arc;
+    use util::path;
+
+    #[gpui::test]
+    async fn test_stale_buffer_notification(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/test"),
+            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
+        )
+        .await;
+
+        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
+        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+
+        let buffer_path = project
+            .read_with(cx, |project, cx| {
+                project.find_project_path("test/code.rs", cx)
+            })
+            .unwrap();
+
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_buffer(buffer_path.clone(), cx)
+            })
+            .await
+            .unwrap();
+
+        // Start tracking the buffer
+        action_log.update(cx, |log, cx| {
+            log.buffer_read(buffer.clone(), cx);
+        });
+
+        // Run the tool before any changes
+        let tool = Arc::new(ProjectNotificationsTool);
+        let provider = Arc::new(FakeLanguageModelProvider);
+        let model: Arc<dyn LanguageModel> = Arc::new(provider.test_model());
+        let request = Arc::new(LanguageModelRequest::default());
+        let tool_input = json!({});
+
+        let result = cx.update(|cx| {
+            tool.clone().run(
+                tool_input.clone(),
+                request.clone(),
+                project.clone(),
+                action_log.clone(),
+                model.clone(),
+                None,
+                cx,
+            )
+        });
+
+        let response = result.output.await.unwrap();
+        let response_text = match &response.content {
+            ToolResultContent::Text(text) => text.clone(),
+            _ => panic!("Expected text response"),
+        };
+        assert_eq!(
+            response_text.as_str(),
+            "No new notifications",
+            "Tool should return 'No new notifications' when no stale buffers"
+        );
+
+        // Modify the buffer (makes it stale)
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit([(1..1, "\nChange!\n")], None, cx);
+        });
+
+        // Run the tool again
+        let result = cx.update(|cx| {
+            tool.clone().run(
+                tool_input.clone(),
+                request.clone(),
+                project.clone(),
+                action_log.clone(),
+                model.clone(),
+                None,
+                cx,
+            )
+        });
+
+        // This time the buffer is stale, so the tool should return a notification
+        let response = result.output.await.unwrap();
+        let response_text = match &response.content {
+            ToolResultContent::Text(text) => text.clone(),
+            _ => panic!("Expected text response"),
+        };
+
+        let expected_content = "[The following is an auto-generated notification; do not reply]\n\nThese files have changed since the last read:\n- code.rs\n";
+        assert_eq!(
+            response_text.as_str(),
+            expected_content,
+            "Tool should return the stale buffer notification"
+        );
+
+        // Run the tool once more without any changes - should get no new notifications
+        let result = cx.update(|cx| {
+            tool.run(
+                tool_input.clone(),
+                request.clone(),
+                project.clone(),
+                action_log,
+                model.clone(),
+                None,
+                cx,
+            )
+        });
+
+        let response = result.output.await.unwrap();
+        let response_text = match &response.content {
+            ToolResultContent::Text(text) => text.clone(),
+            _ => panic!("Expected text response"),
+        };
+
+        assert_eq!(
+            response_text.as_str(),
+            "No new notifications",
+            "Tool should return 'No new notifications' when running again without changes"
+        );
+    }
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            Project::init_settings(cx);
+            assistant_tool::init(cx);
+        });
+    }
+}
--- a/crates/assistant_tools/src/project_notifications_tool/description.md
+++ b/crates/assistant_tools/src/project_notifications_tool/description.md
@@ -0,0 +1,3 @@
+This tool reports which files have been modified by the user since the agent last accessed them.
+
+It serves as a notification mechanism to inform the agent of recent changes. No immediate action is required in response to these updates.
--- a/crates/assistant_tools/src/project_notifications_tool/prompt_header.txt
+++ b/crates/assistant_tools/src/project_notifications_tool/prompt_header.txt
@@ -0,0 +1,3 @@
+[The following is an auto-generated notification; do not reply]
+
+These files have changed since the last read:
--- a/crates/assistant_tools/src/schema.rs
+++ b/crates/assistant_tools/src/schema.rs
@@ -25,9 +25,7 @@ fn schema_to_json(
 fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> Schema {
    let mut generator = match format {
        LanguageModelToolSchemaFormat::JsonSchema => SchemaSettings::draft07().into_generator(),
-        // TODO: Gemini docs mention using a subset of OpenAPI 3, so this may benefit from using
-        // `SchemaSettings::openapi3()`.
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => SchemaSettings::draft07()
+        LanguageModelToolSchemaFormat::JsonSchemaSubset => SchemaSettings::openapi3()
            .with(|settings| {
                settings.meta_schema = None;
                settings.inline_subschemas = true;
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -2,12 +2,13 @@ use crate::{
    schema::json_schema_for,
    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
+use agent_settings;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
 use gpui::{
-    AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, TextStyleRefinement,
-    WeakEntity, Window,
+    Animation, AnimationExt, AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task,
+    TextStyleRefinement, Transformation, WeakEntity, Window, percentage,
 };
 use language::LineEnding;
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
@@ -218,7 +219,7 @@ impl Tool for TerminalTool {
                    .update(cx, |project, cx| {
                        project.create_terminal(
                            TerminalKind::Task(task::SpawnInTerminal {
-                                command: program,
+                                command: Some(program),
                                args,
                                cwd,
                                env,
@@ -247,6 +248,7 @@ impl Tool for TerminalTool {
                command_markdown.clone(),
                working_dir.clone(),
                cx.entity_id(),
+                cx,
            )
        });

@@ -441,7 +443,10 @@ impl TerminalToolCard {
        input_command: Entity<Markdown>,
        working_dir: Option<PathBuf>,
        entity_id: EntityId,
+        cx: &mut Context<Self>,
    ) -> Self {
+        let expand_terminal_card =
+            agent_settings::AgentSettings::get_global(cx).expand_terminal_card;
        Self {
            input_command,
            working_dir,
@@ -453,7 +458,7 @@ impl TerminalToolCard {
            finished_with_empty_output: false,
            original_content_len: 0,
            content_line_count: 0,
-            preview_expanded: true,
+            preview_expanded: expand_terminal_card,
            start_instant: Instant::now(),
            elapsed_time: None,
        }
@@ -518,6 +523,46 @@ impl ToolCard for TerminalToolCard {
                            .color(Color::Muted),
                    ),
            )
+            .when(!self.command_finished, |header| {
+                header.child(
+                    Icon::new(IconName::ArrowCircle)
+                        .size(IconSize::XSmall)
+                        .color(Color::Info)
+                        .with_animation(
+                            "arrow-circle",
+                            Animation::new(Duration::from_secs(2)).repeat(),
+                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                        ),
+                )
+            })
+            .when(tool_failed || command_failed, |header| {
+                header.child(
+                    div()
+                        .id(("terminal-tool-error-code-indicator", self.entity_id))
+                        .child(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::Small)
+                                .color(Color::Error),
+                        )
+                        .when(command_failed && self.exit_status.is_some(), |this| {
+                            this.tooltip(Tooltip::text(format!(
+                                "Exited with code {}",
+                                self.exit_status
+                                    .and_then(|status| status.code())
+                                    .unwrap_or(-1),
+                            )))
+                        })
+                        .when(
+                            !command_failed && tool_failed && status.error().is_some(),
+                            |this| {
+                                this.tooltip(Tooltip::text(format!(
+                                    "Error: {}",
+                                    status.error().unwrap(),
+                                )))
+                            },
+                        ),
+                )
+            })
            .when(self.was_content_truncated, |header| {
                let tooltip = if self.content_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
                    "Output exceeded terminal max lines and was \
@@ -555,34 +600,6 @@ impl ToolCard for TerminalToolCard {
                        .size(LabelSize::Small),
                )
            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", self.entity_id))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when(command_failed && self.exit_status.is_some(), |this| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                self.exit_status
-                                    .and_then(|status| status.code())
-                                    .unwrap_or(-1),
-                            )))
-                        })
-                        .when(
-                            !command_failed && tool_failed && status.error().is_some(),
-                            |this| {
-                                this.tooltip(Tooltip::text(format!(
-                                    "Error: {}",
-                                    status.error().unwrap(),
-                                )))
-                            },
-                        ),
-                )
-            })
            .when(!self.finished_with_empty_output, |header| {
                header.child(
                    Disclosure::new(
@@ -634,6 +651,7 @@ impl ToolCard for TerminalToolCard {
                        div()
                            .pt_2()
                            .border_t_1()
+                            .when(tool_failed || command_failed, |card| card.border_dashed())
                            .border_color(border_color)
                            .bg(cx.theme().colors().editor_background)
                            .rounded_b_md()
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -28,7 +28,17 @@ use workspace::Workspace;
 const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
 const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);

-actions!(auto_update, [Check, DismissErrorMessage, ViewReleaseNotes,]);
+actions!(
+    auto_update,
+    [
+        /// Checks for available updates.
+        Check,
+        /// Dismisses the update error message.
+        DismissErrorMessage,
+        /// Opens the release notes for the current version in a browser.
+        ViewReleaseNotes,
+    ]
+);

 #[derive(Serialize)]
 struct UpdateRequestBody {
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -12,7 +12,13 @@ use workspace::Workspace;
 use workspace::notifications::simple_message_notification::MessageNotification;
 use workspace::notifications::{NotificationId, show_app_notification};

-actions!(auto_update, [ViewReleaseNotesLocally]);
+actions!(
+    auto_update,
+    [
+        /// Opens the release notes for the current version in a new tab.
+        ViewReleaseNotesLocally
+    ]
+);

 pub fn init(cx: &mut App) {
    notify_if_app_was_updated(cx);
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -29,7 +29,7 @@ client.workspace = true
 collections.workspace = true
 fs.workspace = true
 futures.workspace = true
-gpui.workspace = true
+gpui = { workspace = true, features = ["screen-capture"] }
 language.workspace = true
 log.workspace = true
 postage.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -81,7 +81,17 @@ pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(500);
 pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(10);
 pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(20);

-actions!(client, [SignIn, SignOut, Reconnect]);
+actions!(
+    client,
+    [
+        /// Signs in to Zed account.
+        SignIn,
+        /// Signs out of Zed account.
+        SignOut,
+        /// Reconnects to the collaboration server.
+        Reconnect
+    ]
+);

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
 pub struct ClientSettingsContent {
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -35,6 +35,7 @@ dashmap.workspace = true
 derive_more.workspace = true
 envy = "0.4.2"
 futures.workspace = true
+gpui = { workspace = true, features = ["screen-capture"] }
 hex.workspace = true
 http_client.workspace = true
 jsonwebtoken.workspace = true
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -26,7 +26,7 @@ CREATE UNIQUE INDEX "index_users_on_github_user_id" ON "users" ("github_user_id"

 CREATE TABLE "access_tokens" (
    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "user_id" INTEGER REFERENCES users (id),
+    "user_id" INTEGER REFERENCES users (id) ON DELETE CASCADE,
    "impersonated_user_id" INTEGER REFERENCES users (id),
    "hash" VARCHAR(128)
 );
@@ -107,7 +107,7 @@ CREATE INDEX "index_worktree_entries_on_project_id" ON "worktree_entries" ("proj
 CREATE INDEX "index_worktree_entries_on_project_id_and_worktree_id" ON "worktree_entries" ("project_id", "worktree_id");

 CREATE TABLE "project_repositories" (
-    "project_id" INTEGER NOT NULL,
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
    "abs_path" VARCHAR,
    "id" INTEGER NOT NULL,
    "entry_ids" VARCHAR,
@@ -124,7 +124,7 @@ CREATE TABLE "project_repositories" (
 CREATE INDEX "index_project_repositories_on_project_id" ON "project_repositories" ("project_id");

 CREATE TABLE "project_repository_statuses" (
-    "project_id" INTEGER NOT NULL,
+    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
    "repository_id" INTEGER NOT NULL,
    "repo_path" VARCHAR NOT NULL,
    "status" INT8 NOT NULL,
--- a/crates/collab/migrations/20250702185129_add_cascading_delete_to_repository_entries.sql
+++ b/crates/collab/migrations/20250702185129_add_cascading_delete_to_repository_entries.sql
@@ -0,0 +1,25 @@
+DELETE FROM project_repositories
+WHERE project_id NOT IN (SELECT id FROM projects);
+
+ALTER TABLE project_repositories
+    ADD CONSTRAINT fk_project_repositories_project_id
+        FOREIGN KEY (project_id)
+        REFERENCES projects (id)
+        ON DELETE CASCADE
+        NOT VALID;
+
+ALTER TABLE project_repositories
+    VALIDATE CONSTRAINT fk_project_repositories_project_id;
+
+DELETE FROM project_repository_statuses
+WHERE project_id NOT IN (SELECT id FROM projects);
+
+ALTER TABLE project_repository_statuses
+    ADD CONSTRAINT fk_project_repository_statuses_project_id
+        FOREIGN KEY (project_id)
+        REFERENCES projects (id)
+        ON DELETE CASCADE
+        NOT VALID;
+
+ALTER TABLE project_repository_statuses
+    VALIDATE CONSTRAINT fk_project_repository_statuses_project_id;
--- a/crates/collab/migrations/20250707182700_add_access_tokens_cascade_delete_on_user.sql
+++ b/crates/collab/migrations/20250707182700_add_access_tokens_cascade_delete_on_user.sql
@@ -0,0 +1,3 @@
+ALTER TABLE access_tokens DROP CONSTRAINT access_tokens_user_id_fkey;
+ALTER TABLE access_tokens ADD CONSTRAINT access_tokens_user_id_fkey
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -1404,6 +1404,9 @@ async fn sync_model_request_usage_with_stripe(
    llm_db: &Arc<LlmDatabase>,
    stripe_billing: &Arc<StripeBilling>,
 ) -> anyhow::Result<()> {
+    log::info!("Stripe usage sync: Starting");
+    let started_at = Utc::now();
+
    let staff_users = app.db.get_staff_users().await?;
    let staff_user_ids = staff_users
        .iter()
@@ -1448,6 +1451,10 @@ async fn sync_model_request_usage_with_stripe(
        .find_price_by_lookup_key("claude-3-7-sonnet-requests-max")
        .await?;

+    let usage_meter_count = usage_meters.len();
+
+    log::info!("Stripe usage sync: Syncing {usage_meter_count} usage meters");
+
    for (usage_meter, usage) in usage_meters {
        maybe!(async {
            let Some((billing_customer, billing_subscription)) =
@@ -1504,5 +1511,10 @@ async fn sync_model_request_usage_with_stripe(
        .log_err();
    }

+    log::info!(
+        "Stripe usage sync: Synced {usage_meter_count} usage meters in {:?}",
+        Utc::now() - started_at
+    );
+
    Ok(())
 }
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -4,20 +4,19 @@ mod tables;
 #[cfg(test)]
 pub mod tests;

-use crate::{Error, Result, executor::Executor};
+use crate::{Error, Result};
 use anyhow::{Context as _, anyhow};
 use collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use dashmap::DashMap;
 use futures::StreamExt;
 use project_repository_statuses::StatusKind;
-use rand::{Rng, SeedableRng, prelude::StdRng};
 use rpc::ExtensionProvides;
 use rpc::{
    ConnectionId, ExtensionMetadata,
    proto::{self},
 };
 use sea_orm::{
-    ActiveValue, Condition, ConnectionTrait, DatabaseConnection, DatabaseTransaction, DbErr,
+    ActiveValue, Condition, ConnectionTrait, DatabaseConnection, DatabaseTransaction,
    FromQueryResult, IntoActiveModel, IsolationLevel, JoinType, QueryOrder, QuerySelect, Statement,
    TransactionTrait,
    entity::prelude::*,
@@ -33,7 +32,6 @@ use std::{
    ops::{Deref, DerefMut},
    rc::Rc,
    sync::Arc,
-    time::Duration,
 };
 use time::PrimitiveDateTime;
 use tokio::sync::{Mutex, OwnedMutexGuard};
@@ -58,6 +56,7 @@ pub use tables::*;

 #[cfg(test)]
 pub struct DatabaseTestOptions {
+    pub executor: gpui::BackgroundExecutor,
    pub runtime: tokio::runtime::Runtime,
    pub query_failure_probability: parking_lot::Mutex<f64>,
 }
@@ -69,8 +68,6 @@ pub struct Database {
    pool: DatabaseConnection,
    rooms: DashMap<RoomId, Arc<Mutex<()>>>,
    projects: DashMap<ProjectId, Arc<Mutex<()>>>,
-    rng: Mutex<StdRng>,
-    executor: Executor,
    notification_kinds_by_id: HashMap<NotificationKindId, &'static str>,
    notification_kinds_by_name: HashMap<String, NotificationKindId>,
    #[cfg(test)]
@@ -81,17 +78,15 @@ pub struct Database {
 // separate files in the `queries` folder.
 impl Database {
    /// Connects to the database with the given options
-    pub async fn new(options: ConnectOptions, executor: Executor) -> Result<Self> {
+    pub async fn new(options: ConnectOptions) -> Result<Self> {
        sqlx::any::install_default_drivers();
        Ok(Self {
            options: options.clone(),
            pool: sea_orm::Database::connect(options).await?,
            rooms: DashMap::with_capacity(16384),
            projects: DashMap::with_capacity(16384),
-            rng: Mutex::new(StdRng::seed_from_u64(0)),
            notification_kinds_by_id: HashMap::default(),
            notification_kinds_by_name: HashMap::default(),
-            executor,
            #[cfg(test)]
            test_options: None,
        })
@@ -107,48 +102,13 @@ impl Database {
        self.projects.clear();
    }

-    /// Transaction runs things in a transaction. If you want to call other methods
-    /// and pass the transaction around you need to reborrow the transaction at each
-    /// call site with: `&*tx`.
    pub async fn transaction<F, Fut, T>(&self, f: F) -> Result<T>
    where
        F: Send + Fn(TransactionHandle) -> Fut,
        Fut: Send + Future<Output = Result<T>>,
    {
        let body = async {
-            let mut i = 0;
-            loop {
-                let (tx, result) = self.with_transaction(&f).await?;
-                match result {
-                    Ok(result) => match tx.commit().await.map_err(Into::into) {
-                        Ok(()) => return Ok(result),
-                        Err(error) => {
-                            if !self.retry_on_serialization_error(&error, i).await {
-                                return Err(error);
-                            }
-                        }
-                    },
-                    Err(error) => {
-                        tx.rollback().await?;
-                        if !self.retry_on_serialization_error(&error, i).await {
-                            return Err(error);
-                        }
-                    }
-                }
-                i += 1;
-            }
-        };
-
-        self.run(body).await
-    }
-
-    pub async fn weak_transaction<F, Fut, T>(&self, f: F) -> Result<T>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let body = async {
-            let (tx, result) = self.with_weak_transaction(&f).await?;
+            let (tx, result) = self.with_transaction(&f).await?;
            match result {
                Ok(result) => match tx.commit().await.map_err(Into::into) {
                    Ok(()) => Ok(result),
@@ -174,44 +134,28 @@ impl Database {
        Fut: Send + Future<Output = Result<Option<(RoomId, T)>>>,
    {
        let body = async {
-            let mut i = 0;
-            loop {
-                let (tx, result) = self.with_transaction(&f).await?;
-                match result {
-                    Ok(Some((room_id, data))) => {
-                        let lock = self.rooms.entry(room_id).or_default().clone();
-                        let _guard = lock.lock_owned().await;
-                        match tx.commit().await.map_err(Into::into) {
-                            Ok(()) => {
-                                return Ok(Some(TransactionGuard {
-                                    data,
-                                    _guard,
-                                    _not_send: PhantomData,
-                                }));
-                            }
-                            Err(error) => {
-                                if !self.retry_on_serialization_error(&error, i).await {
-                                    return Err(error);
-                                }
-                            }
-                        }
-                    }
-                    Ok(None) => match tx.commit().await.map_err(Into::into) {
-                        Ok(()) => return Ok(None),
-                        Err(error) => {
-                            if !self.retry_on_serialization_error(&error, i).await {
-                                return Err(error);
-                            }
-                        }
-                    },
-                    Err(error) => {
-                        tx.rollback().await?;
-                        if !self.retry_on_serialization_error(&error, i).await {
-                            return Err(error);
-                        }
+            let (tx, result) = self.with_transaction(&f).await?;
+            match result {
+                Ok(Some((room_id, data))) => {
+                    let lock = self.rooms.entry(room_id).or_default().clone();
+                    let _guard = lock.lock_owned().await;
+                    match tx.commit().await.map_err(Into::into) {
+                        Ok(()) => Ok(Some(TransactionGuard {
+                            data,
+                            _guard,
+                            _not_send: PhantomData,
+                        })),
+                        Err(error) => Err(error),
                    }
                }
-                i += 1;
+                Ok(None) => match tx.commit().await.map_err(Into::into) {
+                    Ok(()) => Ok(None),
+                    Err(error) => Err(error),
+                },
+                Err(error) => {
+                    tx.rollback().await?;
+                    Err(error)
+                }
            }
        };

@@ -229,38 +173,26 @@ impl Database {
    {
        let room_id = Database::room_id_for_project(self, project_id).await?;
        let body = async {
-            let mut i = 0;
-            loop {
-                let lock = if let Some(room_id) = room_id {
-                    self.rooms.entry(room_id).or_default().clone()
-                } else {
-                    self.projects.entry(project_id).or_default().clone()
-                };
-                let _guard = lock.lock_owned().await;
-                let (tx, result) = self.with_transaction(&f).await?;
-                match result {
-                    Ok(data) => match tx.commit().await.map_err(Into::into) {
-                        Ok(()) => {
-                            return Ok(TransactionGuard {
-                                data,
-                                _guard,
-                                _not_send: PhantomData,
-                            });
-                        }
-                        Err(error) => {
-                            if !self.retry_on_serialization_error(&error, i).await {
-                                return Err(error);
-                            }
-                        }
-                    },
-                    Err(error) => {
-                        tx.rollback().await?;
-                        if !self.retry_on_serialization_error(&error, i).await {
-                            return Err(error);
-                        }
-                    }
+            let lock = if let Some(room_id) = room_id {
+                self.rooms.entry(room_id).or_default().clone()
+            } else {
+                self.projects.entry(project_id).or_default().clone()
+            };
+            let _guard = lock.lock_owned().await;
+            let (tx, result) = self.with_transaction(&f).await?;
+            match result {
+                Ok(data) => match tx.commit().await.map_err(Into::into) {
+                    Ok(()) => Ok(TransactionGuard {
+                        data,
+                        _guard,
+                        _not_send: PhantomData,
+                    }),
+                    Err(error) => Err(error),
+                },
+                Err(error) => {
+                    tx.rollback().await?;
+                    Err(error)
                }
-                i += 1;
            }
        };

@@ -280,34 +212,22 @@ impl Database {
        Fut: Send + Future<Output = Result<T>>,
    {
        let body = async {
-            let mut i = 0;
-            loop {
-                let lock = self.rooms.entry(room_id).or_default().clone();
-                let _guard = lock.lock_owned().await;
-                let (tx, result) = self.with_transaction(&f).await?;
-                match result {
-                    Ok(data) => match tx.commit().await.map_err(Into::into) {
-                        Ok(()) => {
-                            return Ok(TransactionGuard {
-                                data,
-                                _guard,
-                                _not_send: PhantomData,
-                            });
-                        }
-                        Err(error) => {
-                            if !self.retry_on_serialization_error(&error, i).await {
-                                return Err(error);
-                            }
-                        }
-                    },
-                    Err(error) => {
-                        tx.rollback().await?;
-                        if !self.retry_on_serialization_error(&error, i).await {
-                            return Err(error);
-                        }
-                    }
+            let lock = self.rooms.entry(room_id).or_default().clone();
+            let _guard = lock.lock_owned().await;
+            let (tx, result) = self.with_transaction(&f).await?;
+            match result {
+                Ok(data) => match tx.commit().await.map_err(Into::into) {
+                    Ok(()) => Ok(TransactionGuard {
+                        data,
+                        _guard,
+                        _not_send: PhantomData,
+                    }),
+                    Err(error) => Err(error),
+                },
+                Err(error) => {
+                    tx.rollback().await?;
+                    Err(error)
                }
-                i += 1;
            }
        };

@@ -315,28 +235,6 @@ impl Database {
    }

    async fn with_transaction<F, Fut, T>(&self, f: &F) -> Result<(DatabaseTransaction, Result<T>)>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let tx = self
-            .pool
-            .begin_with_config(Some(IsolationLevel::Serializable), None)
-            .await?;
-
-        let mut tx = Arc::new(Some(tx));
-        let result = f(TransactionHandle(tx.clone())).await;
-        let tx = Arc::get_mut(&mut tx)
-            .and_then(|tx| tx.take())
-            .context("couldn't complete transaction because it's still in use")?;
-
-        Ok((tx, result))
-    }
-
-    async fn with_weak_transaction<F, Fut, T>(
-        &self,
-        f: &F,
-    ) -> Result<(DatabaseTransaction, Result<T>)>
    where
        F: Send + Fn(TransactionHandle) -> Fut,
        Fut: Send + Future<Output = Result<T>>,
@@ -361,13 +259,13 @@ impl Database {
    {
        #[cfg(test)]
        {
+            use rand::prelude::*;
+
            let test_options = self.test_options.as_ref().unwrap();
-            if let Executor::Deterministic(executor) = &self.executor {
-                executor.simulate_random_delay().await;
-                let fail_probability = *test_options.query_failure_probability.lock();
-                if executor.rng().gen_bool(fail_probability) {
-                    return Err(anyhow!("simulated query failure"))?;
-                }
+            test_options.executor.simulate_random_delay().await;
+            let fail_probability = *test_options.query_failure_probability.lock();
+            if test_options.executor.rng().gen_bool(fail_probability) {
+                return Err(anyhow!("simulated query failure"))?;
            }

            test_options.runtime.block_on(future)
@@ -378,46 +276,6 @@ impl Database {
            future.await
        }
    }
-
-    async fn retry_on_serialization_error(&self, error: &Error, prev_attempt_count: usize) -> bool {
-        // If the error is due to a failure to serialize concurrent transactions, then retry
-        // this transaction after a delay. With each subsequent retry, double the delay duration.
-        // Also vary the delay randomly in order to ensure different database connections retry
-        // at different times.
-        const SLEEPS: [f32; 10] = [10., 20., 40., 80., 160., 320., 640., 1280., 2560., 5120.];
-        if is_serialization_error(error) && prev_attempt_count < SLEEPS.len() {
-            let base_delay = SLEEPS[prev_attempt_count];
-            let randomized_delay = base_delay * self.rng.lock().await.gen_range(0.5..=2.0);
-            log::warn!(
-                "retrying transaction after serialization error. delay: {} ms.",
-                randomized_delay
-            );
-            self.executor
-                .sleep(Duration::from_millis(randomized_delay as u64))
-                .await;
-            true
-        } else {
-            false
-        }
-    }
-}
-
-fn is_serialization_error(error: &Error) -> bool {
-    const SERIALIZATION_FAILURE_CODE: &str = "40001";
-    match error {
-        Error::Database(
-            DbErr::Exec(sea_orm::RuntimeErr::SqlxError(error))
-            | DbErr::Query(sea_orm::RuntimeErr::SqlxError(error)),
-        ) if error
-            .as_database_error()
-            .and_then(|error| error.code())
-            .as_deref()
-            == Some(SERIALIZATION_FAILURE_CODE) =>
-        {
-            true
-        }
-        _ => false,
-    }
 }

 /// A handle to a [`DatabaseTransaction`].
--- a/crates/collab/src/db/queries/billing_customers.rs
+++ b/crates/collab/src/db/queries/billing_customers.rs
@@ -20,7 +20,7 @@ impl Database {
        &self,
        params: &CreateBillingCustomerParams,
    ) -> Result<billing_customer::Model> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let customer = billing_customer::Entity::insert(billing_customer::ActiveModel {
                user_id: ActiveValue::set(params.user_id),
                stripe_customer_id: ActiveValue::set(params.stripe_customer_id.clone()),
@@ -40,7 +40,7 @@ impl Database {
        id: BillingCustomerId,
        params: &UpdateBillingCustomerParams,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            billing_customer::Entity::update(billing_customer::ActiveModel {
                id: ActiveValue::set(id),
                user_id: params.user_id.clone(),
@@ -61,7 +61,7 @@ impl Database {
        &self,
        id: BillingCustomerId,
    ) -> Result<Option<billing_customer::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_customer::Entity::find()
                .filter(billing_customer::Column::Id.eq(id))
                .one(&*tx)
@@ -75,7 +75,7 @@ impl Database {
        &self,
        user_id: UserId,
    ) -> Result<Option<billing_customer::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_customer::Entity::find()
                .filter(billing_customer::Column::UserId.eq(user_id))
                .one(&*tx)
@@ -89,7 +89,7 @@ impl Database {
        &self,
        stripe_customer_id: &str,
    ) -> Result<Option<billing_customer::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_customer::Entity::find()
                .filter(billing_customer::Column::StripeCustomerId.eq(stripe_customer_id))
                .one(&*tx)
--- a/crates/collab/src/db/queries/billing_preferences.rs
+++ b/crates/collab/src/db/queries/billing_preferences.rs
@@ -22,7 +22,7 @@ impl Database {
        &self,
        user_id: UserId,
    ) -> Result<Option<billing_preference::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_preference::Entity::find()
                .filter(billing_preference::Column::UserId.eq(user_id))
                .one(&*tx)
@@ -37,7 +37,7 @@ impl Database {
        user_id: UserId,
        params: &CreateBillingPreferencesParams,
    ) -> Result<billing_preference::Model> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let preferences = billing_preference::Entity::insert(billing_preference::ActiveModel {
                user_id: ActiveValue::set(user_id),
                max_monthly_llm_usage_spending_in_cents: ActiveValue::set(
@@ -65,7 +65,7 @@ impl Database {
        user_id: UserId,
        params: &UpdateBillingPreferencesParams,
    ) -> Result<billing_preference::Model> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let preferences = billing_preference::Entity::update_many()
                .set(billing_preference::ActiveModel {
                    max_monthly_llm_usage_spending_in_cents: params
--- a/crates/collab/src/db/queries/billing_subscriptions.rs
+++ b/crates/collab/src/db/queries/billing_subscriptions.rs
@@ -35,7 +35,7 @@ impl Database {
        &self,
        params: &CreateBillingSubscriptionParams,
    ) -> Result<billing_subscription::Model> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let id = billing_subscription::Entity::insert(billing_subscription::ActiveModel {
                billing_customer_id: ActiveValue::set(params.billing_customer_id),
                kind: ActiveValue::set(params.kind),
@@ -64,7 +64,7 @@ impl Database {
        id: BillingSubscriptionId,
        params: &UpdateBillingSubscriptionParams,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            billing_subscription::Entity::update(billing_subscription::ActiveModel {
                id: ActiveValue::set(id),
                billing_customer_id: params.billing_customer_id.clone(),
@@ -90,7 +90,7 @@ impl Database {
        &self,
        id: BillingSubscriptionId,
    ) -> Result<Option<billing_subscription::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_subscription::Entity::find_by_id(id)
                .one(&*tx)
                .await?)
@@ -103,7 +103,7 @@ impl Database {
        &self,
        stripe_subscription_id: &str,
    ) -> Result<Option<billing_subscription::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_subscription::Entity::find()
                .filter(
                    billing_subscription::Column::StripeSubscriptionId.eq(stripe_subscription_id),
@@ -118,7 +118,7 @@ impl Database {
        &self,
        user_id: UserId,
    ) -> Result<Option<billing_subscription::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(billing_subscription::Entity::find()
                .inner_join(billing_customer::Entity)
                .filter(billing_customer::Column::UserId.eq(user_id))
@@ -152,7 +152,7 @@ impl Database {
        &self,
        user_id: UserId,
    ) -> Result<Vec<billing_subscription::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let subscriptions = billing_subscription::Entity::find()
                .inner_join(billing_customer::Entity)
                .filter(billing_customer::Column::UserId.eq(user_id))
@@ -169,7 +169,7 @@ impl Database {
        &self,
        user_ids: HashSet<UserId>,
    ) -> Result<HashMap<UserId, (billing_customer::Model, billing_subscription::Model)>> {
-        self.weak_transaction(|tx| {
+        self.transaction(|tx| {
            let user_ids = user_ids.clone();
            async move {
                let mut rows = billing_subscription::Entity::find()
@@ -201,7 +201,7 @@ impl Database {
        &self,
        user_ids: HashSet<UserId>,
    ) -> Result<HashMap<UserId, (billing_customer::Model, billing_subscription::Model)>> {
-        self.weak_transaction(|tx| {
+        self.transaction(|tx| {
            let user_ids = user_ids.clone();
            async move {
                let mut rows = billing_subscription::Entity::find()
@@ -236,7 +236,7 @@ impl Database {

    /// Returns the count of the active billing subscriptions for the user with the specified ID.
    pub async fn count_active_billing_subscriptions(&self, user_id: UserId) -> Result<usize> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let count = billing_subscription::Entity::find()
                .inner_join(billing_customer::Entity)
                .filter(
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -501,10 +501,8 @@ impl Database {

    /// Returns all channels for the user with the given ID.
    pub async fn get_channels_for_user(&self, user_id: UserId) -> Result<ChannelsForUser> {
-        self.weak_transaction(
-            |tx| async move { self.get_user_channels(user_id, None, true, &tx).await },
-        )
-        .await
+        self.transaction(|tx| async move { self.get_user_channels(user_id, None, true, &tx).await })
+            .await
    }

    /// Returns all channels for the user with the given ID that are descendants
--- a/crates/collab/src/db/queries/contacts.rs
+++ b/crates/collab/src/db/queries/contacts.rs
@@ -15,7 +15,7 @@ impl Database {
            user_b_busy: bool,
        }

-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let user_a_participant = Alias::new("user_a_participant");
            let user_b_participant = Alias::new("user_b_participant");
            let mut db_contacts = contact::Entity::find()
@@ -91,7 +91,7 @@ impl Database {

    /// Returns whether the given user is a busy (on a call).
    pub async fn is_user_busy(&self, user_id: UserId) -> Result<bool> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let participant = room_participant::Entity::find()
                .filter(room_participant::Column::UserId.eq(user_id))
                .one(&*tx)
--- a/crates/collab/src/db/queries/contributors.rs
+++ b/crates/collab/src/db/queries/contributors.rs
@@ -9,7 +9,7 @@ pub enum ContributorSelector {
 impl Database {
    /// Retrieves the GitHub logins of all users who have signed the CLA.
    pub async fn get_contributors(&self) -> Result<Vec<String>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
            enum QueryGithubLogin {
                GithubLogin,
@@ -32,7 +32,7 @@ impl Database {
        &self,
        selector: &ContributorSelector,
    ) -> Result<Option<DateTime>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let condition = match selector {
                ContributorSelector::GitHubUserId { github_user_id } => {
                    user::Column::GithubUserId.eq(*github_user_id)
@@ -69,7 +69,7 @@ impl Database {
        github_user_created_at: DateTimeUtc,
        initial_channel_id: Option<ChannelId>,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let user = self
                .update_or_create_user_by_github_account_tx(
                    github_login,
--- a/crates/collab/src/db/queries/embeddings.rs
+++ b/crates/collab/src/db/queries/embeddings.rs
@@ -8,7 +8,7 @@ impl Database {
        model: &str,
        digests: &[Vec<u8>],
    ) -> Result<HashMap<Vec<u8>, Vec<f32>>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let embeddings = {
                let mut db_embeddings = embedding::Entity::find()
                    .filter(
@@ -52,7 +52,7 @@ impl Database {
        model: &str,
        embeddings: &HashMap<Vec<u8>, Vec<f32>>,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            embedding::Entity::insert_many(embeddings.iter().map(|(digest, dimensions)| {
                let now_offset_datetime = OffsetDateTime::now_utc();
                let retrieved_at =
@@ -78,7 +78,7 @@ impl Database {
    }

    pub async fn purge_old_embeddings(&self) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            embedding::Entity::delete_many()
                .filter(
                    embedding::Column::RetrievedAt
--- a/crates/collab/src/db/queries/extensions.rs
+++ b/crates/collab/src/db/queries/extensions.rs
@@ -15,7 +15,7 @@ impl Database {
        max_schema_version: i32,
        limit: usize,
    ) -> Result<Vec<ExtensionMetadata>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let mut condition = Condition::all()
                .add(
                    extension::Column::LatestVersion
@@ -43,7 +43,7 @@ impl Database {
        ids: &[&str],
        constraints: Option<&ExtensionVersionConstraints>,
    ) -> Result<Vec<ExtensionMetadata>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let extensions = extension::Entity::find()
                .filter(extension::Column::ExternalId.is_in(ids.iter().copied()))
                .all(&*tx)
@@ -123,7 +123,7 @@ impl Database {
        &self,
        extension_id: &str,
    ) -> Result<Vec<ExtensionMetadata>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let condition = extension::Column::ExternalId
                .eq(extension_id)
                .into_condition();
@@ -162,7 +162,7 @@ impl Database {
        extension_id: &str,
        constraints: Option<&ExtensionVersionConstraints>,
    ) -> Result<Option<ExtensionMetadata>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let extension = extension::Entity::find()
                .filter(extension::Column::ExternalId.eq(extension_id))
                .one(&*tx)
@@ -187,7 +187,7 @@ impl Database {
        extension_id: &str,
        version: &str,
    ) -> Result<Option<ExtensionMetadata>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let extension = extension::Entity::find()
                .filter(extension::Column::ExternalId.eq(extension_id))
                .filter(extension_version::Column::Version.eq(version))
@@ -204,7 +204,7 @@ impl Database {
    }

    pub async fn get_known_extension_versions(&self) -> Result<HashMap<String, Vec<String>>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let mut extension_external_ids_by_id = HashMap::default();

            let mut rows = extension::Entity::find().stream(&*tx).await?;
@@ -242,7 +242,7 @@ impl Database {
        &self,
        versions_by_extension_id: &HashMap<&str, Vec<NewExtensionVersion>>,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            for (external_id, versions) in versions_by_extension_id {
                if versions.is_empty() {
                    continue;
@@ -349,7 +349,7 @@ impl Database {
    }

    pub async fn record_extension_download(&self, extension: &str, version: &str) -> Result<bool> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
            enum QueryId {
                Id,
--- a/crates/collab/src/db/queries/processed_stripe_events.rs
+++ b/crates/collab/src/db/queries/processed_stripe_events.rs
@@ -13,7 +13,7 @@ impl Database {
        &self,
        params: &CreateProcessedStripeEventParams,
    ) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            processed_stripe_event::Entity::insert(processed_stripe_event::ActiveModel {
                stripe_event_id: ActiveValue::set(params.stripe_event_id.clone()),
                stripe_event_type: ActiveValue::set(params.stripe_event_type.clone()),
@@ -35,7 +35,7 @@ impl Database {
        &self,
        event_id: &str,
    ) -> Result<Option<processed_stripe_event::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(processed_stripe_event::Entity::find_by_id(event_id)
                .one(&*tx)
                .await?)
@@ -48,7 +48,7 @@ impl Database {
        &self,
        event_ids: &[&str],
    ) -> Result<Vec<processed_stripe_event::Model>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            Ok(processed_stripe_event::Entity::find()
                .filter(
                    processed_stripe_event::Column::StripeEventId.is_in(event_ids.iter().copied()),
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -112,7 +112,7 @@ impl Database {
    }

    pub async fn delete_project(&self, project_id: ProjectId) -> Result<()> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            project::Entity::delete_by_id(project_id).exec(&*tx).await?;
            Ok(())
        })
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -80,7 +80,7 @@ impl Database {
        &self,
        user_id: UserId,
    ) -> Result<Option<proto::IncomingCall>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            let pending_participant = room_participant::Entity::find()
                .filter(
                    room_participant::Column::UserId
--- a/crates/collab/src/db/queries/servers.rs
+++ b/crates/collab/src/db/queries/servers.rs
@@ -142,6 +142,50 @@ impl Database {
                }
            }

+            loop {
+                let delete_query = Query::delete()
+                    .from_table(project_repository_statuses::Entity)
+                    .and_where(
+                        Expr::tuple([Expr::col((
+                            project_repository_statuses::Entity,
+                            project_repository_statuses::Column::ProjectId,
+                        ))
+                        .into()])
+                        .in_subquery(
+                            Query::select()
+                                .columns([(
+                                    project_repository_statuses::Entity,
+                                    project_repository_statuses::Column::ProjectId,
+                                )])
+                                .from(project_repository_statuses::Entity)
+                                .inner_join(
+                                    project::Entity,
+                                    Expr::col((project::Entity, project::Column::Id)).equals((
+                                        project_repository_statuses::Entity,
+                                        project_repository_statuses::Column::ProjectId,
+                                    )),
+                                )
+                                .and_where(project::Column::HostConnectionServerId.ne(server_id))
+                                .limit(10000)
+                                .to_owned(),
+                        ),
+                    )
+                    .to_owned();
+
+                let statement = Statement::from_sql_and_values(
+                    tx.get_database_backend(),
+                    delete_query
+                        .to_string(sea_orm::sea_query::PostgresQueryBuilder)
+                        .as_str(),
+                    vec![],
+                );
+
+                let result = tx.execute(statement).await?;
+                if result.rows_affected() == 0 {
+                    break;
+                }
+            }
+
            Ok(())
        })
        .await
--- a/crates/collab/src/db/queries/users.rs
+++ b/crates/collab/src/db/queries/users.rs
@@ -382,7 +382,7 @@ impl Database {

    /// Returns the active flags for the user.
    pub async fn get_user_flags(&self, user: UserId) -> Result<Vec<String>> {
-        self.weak_transaction(|tx| async move {
+        self.transaction(|tx| async move {
            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
            enum QueryAs {
                Flag,
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -17,11 +17,15 @@ use crate::migrations::run_database_migrations;
 use super::*;
 use gpui::BackgroundExecutor;
 use parking_lot::Mutex;
+use rand::prelude::*;
 use sea_orm::ConnectionTrait;
 use sqlx::migrate::MigrateDatabase;
-use std::sync::{
-    Arc,
-    atomic::{AtomicI32, AtomicU32, Ordering::SeqCst},
+use std::{
+    sync::{
+        Arc,
+        atomic::{AtomicI32, AtomicU32, Ordering::SeqCst},
+    },
+    time::Duration,
 };

 pub struct TestDb {
@@ -41,9 +45,7 @@ impl TestDb {
        let mut db = runtime.block_on(async {
            let mut options = ConnectOptions::new(url);
            options.max_connections(5);
-            let mut db = Database::new(options, Executor::Deterministic(executor.clone()))
-                .await
-                .unwrap();
+            let mut db = Database::new(options).await.unwrap();
            let sql = include_str!(concat!(
                env!("CARGO_MANIFEST_DIR"),
                "/migrations.sqlite/20221109000000_test_schema.sql"
@@ -60,6 +62,7 @@ impl TestDb {
        });

        db.test_options = Some(DatabaseTestOptions {
+            executor,
            runtime,
            query_failure_probability: parking_lot::Mutex::new(0.0),
        });
@@ -93,9 +96,7 @@ impl TestDb {
            options
                .max_connections(5)
                .idle_timeout(Duration::from_secs(0));
-            let mut db = Database::new(options, Executor::Deterministic(executor.clone()))
-                .await
-                .unwrap();
+            let mut db = Database::new(options).await.unwrap();
            let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations");
            run_database_migrations(db.options(), migrations_path)
                .await
@@ -105,6 +106,7 @@ impl TestDb {
        });

        db.test_options = Some(DatabaseTestOptions {
+            executor,
            runtime,
            query_failure_probability: parking_lot::Mutex::new(0.0),
        });
--- a/crates/collab/src/db/tests/embedding_tests.rs
+++ b/crates/collab/src/db/tests/embedding_tests.rs
@@ -49,7 +49,7 @@ async fn test_purge_old_embeddings(cx: &mut gpui::TestAppContext) {
    db.save_embeddings(model, &embeddings).await.unwrap();

    // Reach into the DB and change the retrieved at to be > 60 days
-    db.weak_transaction(|tx| {
+    db.transaction(|tx| {
        let digest = digest.clone();
        async move {
            let sixty_days_ago = OffsetDateTime::now_utc().sub(Duration::days(61));
--- a/crates/collab/src/db/tests/user_tests.rs
+++ b/crates/collab/src/db/tests/user_tests.rs
@@ -44,3 +44,53 @@ async fn test_accepted_tos(db: &Arc<Database>) {
    let user = db.get_user_by_id(user_id).await.unwrap().unwrap();
    assert!(user.accepted_tos_at.is_none());
 }
+
+test_both_dbs!(
+    test_destroy_user_cascade_deletes_access_tokens,
+    test_destroy_user_cascade_deletes_access_tokens_postgres,
+    test_destroy_user_cascade_deletes_access_tokens_sqlite
+);
+
+async fn test_destroy_user_cascade_deletes_access_tokens(db: &Arc<Database>) {
+    let user_id = db
+        .create_user(
+            "user1@example.com",
+            Some("user1"),
+            false,
+            NewUserParams {
+                github_login: "user1".to_string(),
+                github_user_id: 12345,
+            },
+        )
+        .await
+        .unwrap()
+        .user_id;
+
+    let user = db.get_user_by_id(user_id).await.unwrap();
+    assert!(user.is_some());
+
+    let token_1_id = db
+        .create_access_token(user_id, None, "token-1", 10)
+        .await
+        .unwrap();
+
+    let token_2_id = db
+        .create_access_token(user_id, None, "token-2", 10)
+        .await
+        .unwrap();
+
+    let token_1 = db.get_access_token(token_1_id).await;
+    let token_2 = db.get_access_token(token_2_id).await;
+    assert!(token_1.is_ok());
+    assert!(token_2.is_ok());
+
+    db.destroy_user(user_id).await.unwrap();
+
+    let user = db.get_user_by_id(user_id).await.unwrap();
+    assert!(user.is_none());
+
+    let token_1 = db.get_access_token(token_1_id).await;
+    let token_2 = db.get_access_token(token_2_id).await;
+    assert!(token_1.is_err());
+    assert!(token_2.is_err());
+}
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -285,7 +285,7 @@ impl AppState {
    pub async fn new(config: Config, executor: Executor) -> Result<Arc<Self>> {
        let mut db_options = db::ConnectOptions::new(config.database_url.clone());
        db_options.max_connections(config.database_max_connections);
-        let mut db = Database::new(db_options, Executor::Production).await?;
+        let mut db = Database::new(db_options).await?;
        db.initialize_notification_kinds().await?;

        let llm_db = if let Some((llm_database_url, llm_database_max_connections)) = config
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -59,7 +59,7 @@ async fn main() -> Result<()> {
            let config = envy::from_env::<Config>().expect("error loading config");
            let db_options = db::ConnectOptions::new(config.database_url.clone());

-            let mut db = Database::new(db_options, Executor::Production).await?;
+            let mut db = Database::new(db_options).await?;
            db.initialize_notification_kinds().await?;

            collab::seed::seed(&config, &db, false).await?;
@@ -253,7 +253,7 @@ async fn main() -> Result<()> {

 async fn setup_app_database(config: &Config) -> Result<()> {
    let db_options = db::ConnectOptions::new(config.database_url.clone());
-    let mut db = Database::new(db_options, Executor::Production).await?;
+    let mut db = Database::new(db_options).await?;

    let migrations_path = config.migrations_path.as_deref().unwrap_or_else(|| {
        #[cfg(feature = "sqlite")]
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -22,7 +22,9 @@ use gpui::{
 use language::{
    Diagnostic, DiagnosticEntry, DiagnosticSourceKind, FakeLspAdapter, Language, LanguageConfig,
    LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
-    language_settings::{AllLanguageSettings, Formatter, PrettierSettings, SelectedFormatter},
+    language_settings::{
+        AllLanguageSettings, Formatter, FormatterList, PrettierSettings, SelectedFormatter,
+    },
    tree_sitter_rust, tree_sitter_typescript,
 };
 use lsp::{LanguageServerId, OneOf};
@@ -4589,13 +4591,14 @@ async fn test_formatting_buffer(
        cx_a.update(|cx| {
            SettingsStore::update_global(cx, |store, cx| {
                store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                    file.defaults.formatter =
-                        Some(SelectedFormatter::List(vec![Formatter::External {
+                    file.defaults.formatter = Some(SelectedFormatter::List(FormatterList::Single(
+                        Formatter::External {
                            command: "awk".into(),
                            arguments: Some(
                                vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()].into(),
                            ),
-                        }]));
+                        },
+                    )));
                });
            });
        });
@@ -4695,10 +4698,9 @@ async fn test_prettier_formatting_buffer(
    cx_b.update(|cx| {
        SettingsStore::update_global(cx, |store, cx| {
            store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                file.defaults.formatter =
-                    Some(SelectedFormatter::List(vec![Formatter::LanguageServer {
-                        name: None,
-                    }]));
+                file.defaults.formatter = Some(SelectedFormatter::List(FormatterList::Single(
+                    Formatter::LanguageServer { name: None },
+                )));
                file.defaults.prettier = Some(PrettierSettings {
                    allowed: true,
                    ..PrettierSettings::default()
@@ -4819,7 +4821,7 @@ async fn test_definition(
    );

    let definitions_1 = project_b
-        .update(cx_b, |p, cx| p.definition(&buffer_b, 23, cx))
+        .update(cx_b, |p, cx| p.definitions(&buffer_b, 23, cx))
        .await
        .unwrap();
    cx_b.read(|cx| {
@@ -4850,7 +4852,7 @@ async fn test_definition(
    );

    let definitions_2 = project_b
-        .update(cx_b, |p, cx| p.definition(&buffer_b, 33, cx))
+        .update(cx_b, |p, cx| p.definitions(&buffer_b, 33, cx))
        .await
        .unwrap();
    cx_b.read(|cx| {
@@ -4887,7 +4889,7 @@ async fn test_definition(
    );

    let type_definitions = project_b
-        .update(cx_b, |p, cx| p.type_definition(&buffer_b, 7, cx))
+        .update(cx_b, |p, cx| p.type_definitions(&buffer_b, 7, cx))
        .await
        .unwrap();
    cx_b.read(|cx| {
@@ -5055,7 +5057,7 @@ async fn test_references(
    lsp_response_tx
        .unbounded_send(Err(anyhow!("can't find references")))
        .unwrap();
-    references.await.unwrap_err();
+    assert_eq!(references.await.unwrap(), []);

    // User is informed that the request is no longer pending.
    executor.run_until_parked();
@@ -5639,7 +5641,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
    let definitions;
    let buffer_b2;
    if rng.r#gen() {
-        definitions = project_b.update(cx_b, |p, cx| p.definition(&buffer_b1, 23, cx));
+        definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
        (buffer_b2, _) = project_b
            .update(cx_b, |p, cx| {
                p.open_buffer_with_lsp((worktree_id, "b.rs"), cx)
@@ -5653,7 +5655,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
            })
            .await
            .unwrap();
-        definitions = project_b.update(cx_b, |p, cx| p.definition(&buffer_b1, 23, cx));
+        definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
    }

    let definitions = definitions.await.unwrap();
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -838,7 +838,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                        .map(|_| Ok(()))
                        .boxed(),
                    LspRequestKind::Definition => project
-                        .definition(&buffer, offset, cx)
+                        .definitions(&buffer, offset, cx)
                        .map_ok(|_| ())
                        .boxed(),
                    LspRequestKind::Highlights => project
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -14,7 +14,8 @@ use http_client::BlockedHttpClient;
 use language::{
    FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageRegistry,
    language_settings::{
-        AllLanguageSettings, Formatter, PrettierSettings, SelectedFormatter, language_settings,
+        AllLanguageSettings, Formatter, FormatterList, PrettierSettings, SelectedFormatter,
+        language_settings,
    },
    tree_sitter_typescript,
 };
@@ -504,10 +505,9 @@ async fn test_ssh_collaboration_formatting_with_prettier(
    cx_b.update(|cx| {
        SettingsStore::update_global(cx, |store, cx| {
            store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                file.defaults.formatter =
-                    Some(SelectedFormatter::List(vec![Formatter::LanguageServer {
-                        name: None,
-                    }]));
+                file.defaults.formatter = Some(SelectedFormatter::List(FormatterList::Single(
+                    Formatter::LanguageServer { name: None },
+                )));
                file.defaults.prettier = Some(PrettierSettings {
                    allowed: true,
                    ..PrettierSettings::default()
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -30,7 +30,13 @@ use workspace::{
 };
 use workspace::{item::Dedup, notifications::NotificationId};

-actions!(collab, [CopyLink]);
+actions!(
+    collab,
+    [
+        /// Copies a link to the current position in the channel buffer.
+        CopyLink
+    ]
+);

 pub fn init(cx: &mut App) {
    workspace::FollowableViewRegistry::register::<ChannelView>(cx)
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -71,7 +71,13 @@ struct SerializedChatPanel {
    width: Option<Pixels>,
 }

-actions!(chat_panel, [ToggleFocus]);
+actions!(
+    chat_panel,
+    [
+        /// Toggles focus on the chat panel.
+        ToggleFocus
+    ]
+);

 impl ChatPanel {
    pub fn new(
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -44,15 +44,25 @@ use workspace::{
 actions!(
    collab_panel,
    [
+        /// Toggles focus on the collaboration panel.
        ToggleFocus,
+        /// Removes the selected channel or contact.
        Remove,
+        /// Opens the context menu for the selected item.
        Secondary,
+        /// Collapses the selected channel in the tree view.
        CollapseSelectedChannel,
+        /// Expands the selected channel in the tree view.
        ExpandSelectedChannel,
+        /// Starts moving a channel to a new location.
        StartMoveChannel,
+        /// Moves the selected item to the current location.
        MoveSelected,
+        /// Inserts a space character in the filter input.
        InsertSpace,
+        /// Moves the selected channel up in the list.
        MoveChannelUp,
+        /// Moves the selected channel down in the list.
        MoveChannelDown,
    ]
 );
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ b/crates/collab_ui/src/collab_panel/channel_modal.rs
@@ -17,9 +17,13 @@ use workspace::{ModalView, notifications::DetachAndPromptErr};
 actions!(
    channel_modal,
    [
+        /// Selects the next control in the channel modal.
        SelectNextControl,
+        /// Toggles between invite members and manage members mode.
        ToggleMode,
+        /// Toggles admin status for the selected member.
        ToggleMemberAdmin,
+        /// Removes the selected member from the channel.
        RemoveMember
    ]
 );
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -74,7 +74,13 @@ pub struct NotificationPresenter {
    pub can_navigate: bool,
 }

-actions!(notification_panel, [ToggleFocus]);
+actions!(
+    notification_panel,
+    [
+        /// Toggles focus on the notification panel.
+        ToggleFocus
+    ]
+);

 pub fn init(cx: &mut App) {
    cx.observe_new(|workspace: &mut Workspace, _, _| {
--- a/crates/component/src/component_layout.rs
+++ b/crates/component/src/component_layout.rs
@@ -61,7 +61,7 @@ impl RenderOnce for ComponentExample {
                        12.0,
                        12.0,
                    ))
-                    .shadow_sm()
+                    .shadow_xs()
                    .child(self.element),
            )
            .into_any_element()
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -46,11 +46,17 @@ pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in, reinstall_an
 actions!(
    copilot,
    [
+        /// Requests a code completion suggestion from Copilot.
        Suggest,
+        /// Cycles to the next Copilot suggestion.
        NextSuggestion,
+        /// Cycles to the previous Copilot suggestion.
        PreviousSuggestion,
+        /// Reinstalls the Copilot language server.
        Reinstall,
+        /// Signs in to GitHub Copilot.
        SignIn,
+        /// Signs out of GitHub Copilot.
        SignOut
    ]
 );
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -528,6 +528,7 @@ impl CopilotChat {

    pub async fn stream_completion(
        request: Request,
+        is_user_initiated: bool,
        mut cx: AsyncApp,
    ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
        let this = cx
@@ -562,7 +563,14 @@ impl CopilotChat {
        };

        let api_url = configuration.api_url_from_endpoint(&token.api_endpoint);
-        stream_completion(client.clone(), token.api_key, api_url.into(), request).await
+        stream_completion(
+            client.clone(),
+            token.api_key,
+            api_url.into(),
+            request,
+            is_user_initiated,
+        )
+        .await
    }

    pub fn set_configuration(
@@ -697,6 +705,7 @@ async fn stream_completion(
    api_key: String,
    completion_url: Arc<str>,
    request: Request,
+    is_user_initiated: bool,
 ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
    let is_vision_request = request.messages.iter().any(|message| match message {
      ChatMessage::User { content }
@@ -707,6 +716,8 @@ async fn stream_completion(
      _ => false,
  });

+    let request_initiator = if is_user_initiated { "user" } else { "agent" };
+
    let mut request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(completion_url.as_ref())
@@ -719,7 +730,8 @@ async fn stream_completion(
        )
        .header("Authorization", format!("Bearer {}", api_key))
        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat");
+        .header("Copilot-Integration-Id", "vscode-chat")
+        .header("X-Initiator", request_initiator);

    if is_vision_request {
        request_builder =
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -2,7 +2,7 @@ use crate::{
    adapters::DebugAdapterBinary,
    transport::{IoKind, LogKind, TransportDelegate},
 };
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use dap_types::{
    messages::{Message, Response},
    requests::Request,
@@ -108,7 +108,11 @@ impl DebugAdapterClient {
            arguments: Some(serialized_arguments),
        };
        self.transport_delegate
-            .add_pending_request(sequence_id, callback_tx);
+            .pending_requests
+            .lock()
+            .as_mut()
+            .context("client is closed")?
+            .insert(sequence_id, callback_tx);

        log::debug!(
            "Client {} send `{}` request with sequence_id: {}",
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -49,7 +49,6 @@ pub enum IoKind {
    StdErr,
 }

-type Requests = Arc<Mutex<HashMap<u64, oneshot::Sender<Result<Response>>>>>;
 type LogHandlers = Arc<Mutex<SmallVec<[(LogKind, IoHandler); 2]>>>;

 pub trait Transport: Send + Sync {
@@ -93,18 +92,14 @@ async fn start(

 pub(crate) struct TransportDelegate {
    log_handlers: LogHandlers,
-    pub(crate) pending_requests: Requests,
+    // TODO this should really be some kind of associative channel
+    pub(crate) pending_requests:
+        Arc<Mutex<Option<HashMap<u64, oneshot::Sender<Result<Response>>>>>>,
    pub(crate) transport: Mutex<Box<dyn Transport>>,
    pub(crate) server_tx: smol::lock::Mutex<Option<Sender<Message>>>,
    tasks: Mutex<Vec<Task<()>>>,
 }

-impl Drop for TransportDelegate {
-    fn drop(&mut self) {
-        self.transport.lock().kill()
-    }
-}
-
 impl TransportDelegate {
    pub(crate) async fn start(binary: &DebugAdapterBinary, cx: &mut AsyncApp) -> Result<Self> {
        let log_handlers: LogHandlers = Default::default();
@@ -113,7 +108,7 @@ impl TransportDelegate {
            transport: Mutex::new(transport),
            log_handlers,
            server_tx: Default::default(),
-            pending_requests: Default::default(),
+            pending_requests: Arc::new(Mutex::new(Some(HashMap::default()))),
            tasks: Default::default(),
        })
    }
@@ -154,16 +149,26 @@ impl TransportDelegate {
                .await
                {
                    Ok(()) => {
-                        pending_requests.lock().drain().for_each(|(_, request)| {
-                            request
-                                .send(Err(anyhow!("debugger shutdown unexpectedly")))
-                                .ok();
-                        });
+                        pending_requests
+                            .lock()
+                            .take()
+                            .into_iter()
+                            .flatten()
+                            .for_each(|(_, request)| {
+                                request
+                                    .send(Err(anyhow!("debugger shutdown unexpectedly")))
+                                    .ok();
+                            });
                    }
                    Err(e) => {
-                        pending_requests.lock().drain().for_each(|(_, request)| {
-                            request.send(Err(e.cloned())).ok();
-                        });
+                        pending_requests
+                            .lock()
+                            .take()
+                            .into_iter()
+                            .flatten()
+                            .for_each(|(_, request)| {
+                                request.send(Err(e.cloned())).ok();
+                            });
                    }
                }
            }));
@@ -188,15 +193,6 @@ impl TransportDelegate {
        self.transport.lock().tcp_arguments()
    }

-    pub(crate) fn add_pending_request(
-        &self,
-        sequence_id: u64,
-        request: oneshot::Sender<Result<Response>>,
-    ) {
-        let mut pending_requests = self.pending_requests.lock();
-        pending_requests.insert(sequence_id, request);
-    }
-
    pub(crate) async fn send_message(&self, message: Message) -> Result<()> {
        if let Some(server_tx) = self.server_tx.lock().await.as_ref() {
            server_tx.send(message).await.context("sending message")
@@ -290,7 +286,7 @@ impl TransportDelegate {
    async fn recv_from_server<Stdout>(
        server_stdout: Stdout,
        mut message_handler: DapMessageHandler,
-        pending_requests: Requests,
+        pending_requests: Arc<Mutex<Option<HashMap<u64, oneshot::Sender<Result<Response>>>>>>,
        log_handlers: Option<LogHandlers>,
    ) -> Result<()>
    where
@@ -300,16 +296,21 @@ impl TransportDelegate {
        let mut reader = BufReader::new(server_stdout);

        let result = loop {
-            match Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
-                .await
-            {
+            let result =
+                Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
+                    .await;
+            match result {
                ConnectionResult::Timeout => anyhow::bail!("Timed out when connecting to debugger"),
                ConnectionResult::ConnectionReset => {
                    log::info!("Debugger closed the connection");
-                    return Ok(());
+                    break Ok(());
                }
                ConnectionResult::Result(Ok(Message::Response(res))) => {
-                    let tx = pending_requests.lock().remove(&res.request_seq);
+                    let tx = pending_requests
+                        .lock()
+                        .as_mut()
+                        .context("client is closed")?
+                        .remove(&res.request_seq);
                    if let Some(tx) = tx {
                        if let Err(e) = tx.send(Self::process_response(res)) {
                            log::trace!("Did not send response `{:?}` for a cancelled", e);
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ b/crates/dap_adapters/src/dap_adapters.rs
@@ -2,7 +2,6 @@ mod codelldb;
 mod gdb;
 mod go;
 mod javascript;
-mod php;
 mod python;

 use std::sync::Arc;
@@ -22,7 +21,6 @@ use gdb::GdbDebugAdapter;
 use go::GoDebugAdapter;
 use gpui::{App, BorrowAppContext};
 use javascript::JsDebugAdapter;
-use php::PhpDebugAdapter;
 use python::PythonDebugAdapter;
 use serde_json::json;
 use task::{DebugScenario, ZedDebugConfig};
@@ -31,7 +29,6 @@ pub fn init(cx: &mut App) {
    cx.update_default_global(|registry: &mut DapRegistry, _cx| {
        registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
        registry.add_adapter(Arc::from(PythonDebugAdapter::default()));
-        registry.add_adapter(Arc::from(PhpDebugAdapter::default()));
        registry.add_adapter(Arc::from(JsDebugAdapter::default()));
        registry.add_adapter(Arc::from(GoDebugAdapter::default()));
        registry.add_adapter(Arc::from(GdbDebugAdapter));
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -1,9 +1,10 @@
 use adapters::latest_github_release;
 use anyhow::Context as _;
+use collections::HashMap;
 use dap::{StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
 use gpui::AsyncApp;
 use serde_json::Value;
-use std::{collections::HashMap, path::PathBuf, sync::OnceLock};
+use std::{path::PathBuf, sync::OnceLock};
 use task::DebugRequest;
 use util::{ResultExt, maybe};

@@ -70,6 +71,8 @@ impl JsDebugAdapter {
        let tcp_connection = task_definition.tcp_connection.clone().unwrap_or_default();
        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;

+        let mut envs = HashMap::default();
+
        let mut configuration = task_definition.config.clone();
        if let Some(configuration) = configuration.as_object_mut() {
            maybe!({
@@ -79,9 +82,9 @@ impl JsDebugAdapter {
                let command = configuration.get("command")?.as_str()?.to_owned();
                let mut args = shlex::split(&command)?.into_iter();
                let program = args.next()?;
-                configuration.insert("program".to_owned(), program.into());
+                configuration.insert("runtimeExecutable".to_owned(), program.into());
                configuration.insert(
-                    "args".to_owned(),
+                    "runtimeArgs".to_owned(),
                    args.map(Value::from).collect::<Vec<_>>().into(),
                );
                configuration.insert("console".to_owned(), "externalTerminal".into());
@@ -110,6 +113,12 @@ impl JsDebugAdapter {
                }
            }

+            if let Some(env) = configuration.get("env").cloned() {
+                if let Ok(env) = serde_json::from_value(env) {
+                    envs = env;
+                }
+            }
+
            configuration
                .entry("cwd")
                .or_insert(delegate.worktree_root_path().to_string_lossy().into());
@@ -158,7 +167,7 @@ impl JsDebugAdapter {
            ),
            arguments,
            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            envs: HashMap::default(),
+            envs,
            connection: Some(adapters::TcpArguments {
                host,
                port,
@@ -245,7 +254,7 @@ impl DebugAdapter for JsDebugAdapter {
                            "properties": {
                                "type": {
                                    "type": "string",
-                                    "enum": ["pwa-node", "node", "chrome", "pwa-chrome", "msedge", "pwa-msedge"],
+                                    "enum": ["pwa-node", "node", "chrome", "pwa-chrome", "msedge", "pwa-msedge", "node-terminal"],
                                    "description": "The type of debug session",
                                    "default": "pwa-node"
                                },
@@ -379,10 +388,6 @@ impl DebugAdapter for JsDebugAdapter {
                                    }
                                }
                            },
-                            "oneOf": [
-                                { "required": ["program"] },
-                                { "required": ["url"] }
-                            ]
                        }
                    ]
                },
@@ -522,7 +527,11 @@ impl DebugAdapter for JsDebugAdapter {
    }

    fn label_for_child_session(&self, args: &StartDebuggingRequestArguments) -> Option<String> {
-        let label = args.configuration.get("name")?.as_str()?;
+        let label = args
+            .configuration
+            .get("name")?
+            .as_str()
+            .filter(|name| !name.is_empty())?;
        Some(label.to_owned())
    }
 }
--- a/crates/dap_adapters/src/php.rs
+++ b/crates/dap_adapters/src/php.rs
@@ -1,368 +0,0 @@
-use adapters::latest_github_release;
-use anyhow::Context as _;
-use anyhow::bail;
-use dap::StartDebuggingRequestArguments;
-use dap::StartDebuggingRequestArgumentsRequest;
-use dap::adapters::{DebugTaskDefinition, TcpArguments};
-use gpui::{AsyncApp, SharedString};
-use language::LanguageName;
-use std::{collections::HashMap, path::PathBuf, sync::OnceLock};
-use util::ResultExt;
-
-use crate::*;
-
-#[derive(Default)]
-pub(crate) struct PhpDebugAdapter {
-    checked: OnceLock<()>,
-}
-
-impl PhpDebugAdapter {
-    const ADAPTER_NAME: &'static str = "PHP";
-    const ADAPTER_PACKAGE_NAME: &'static str = "vscode-php-debug";
-    const ADAPTER_PATH: &'static str = "extension/out/phpDebug.js";
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<AdapterVersion> {
-        let release = latest_github_release(
-            &format!("{}/{}", "xdebug", Self::ADAPTER_PACKAGE_NAME),
-            true,
-            false,
-            delegate.http_client(),
-        )
-        .await?;
-
-        let asset_name = format!("php-debug-{}.vsix", release.tag_name.replace("v", ""));
-
-        Ok(AdapterVersion {
-            tag_name: release.tag_name,
-            url: release
-                .assets
-                .iter()
-                .find(|asset| asset.name == asset_name)
-                .with_context(|| format!("no asset found matching {asset_name:?}"))?
-                .browser_download_url
-                .clone(),
-        })
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let adapter_path = if let Some(user_installed_path) = user_installed_path {
-            user_installed_path
-        } else {
-            let adapter_path = paths::debug_adapters_dir().join(self.name().as_ref());
-
-            let file_name_prefix = format!("{}_", self.name());
-
-            util::fs::find_file_name_in_dir(adapter_path.as_path(), |file_name| {
-                file_name.starts_with(&file_name_prefix)
-            })
-            .await
-            .context("Couldn't find PHP dap directory")?
-        };
-
-        let tcp_connection = task_definition.tcp_connection.clone().unwrap_or_default();
-        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;
-
-        let mut configuration = task_definition.config.clone();
-        if let Some(obj) = configuration.as_object_mut() {
-            obj.entry("cwd")
-                .or_insert_with(|| delegate.worktree_root_path().to_string_lossy().into());
-        }
-
-        let arguments = if let Some(mut args) = user_args {
-            args.insert(
-                0,
-                adapter_path
-                    .join(Self::ADAPTER_PATH)
-                    .to_string_lossy()
-                    .to_string(),
-            );
-            args
-        } else {
-            vec![
-                adapter_path
-                    .join(Self::ADAPTER_PATH)
-                    .to_string_lossy()
-                    .to_string(),
-                format!("--server={}", port),
-            ]
-        };
-
-        Ok(DebugAdapterBinary {
-            command: Some(
-                delegate
-                    .node_runtime()
-                    .binary_path()
-                    .await?
-                    .to_string_lossy()
-                    .into_owned(),
-            ),
-            arguments,
-            connection: Some(TcpArguments {
-                port,
-                host,
-                timeout,
-            }),
-            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            envs: HashMap::default(),
-            request_args: StartDebuggingRequestArguments {
-                configuration,
-                request: <Self as DebugAdapter>::request_kind(self, &task_definition.config)
-                    .await?,
-            },
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for PhpDebugAdapter {
-    fn dap_schema(&self) -> serde_json::Value {
-        json!({
-            "properties": {
-                "request": {
-                    "type": "string",
-                    "enum": ["launch"],
-                    "description": "The request type for the PHP debug adapter, always \"launch\"",
-                    "default": "launch"
-                },
-                "hostname": {
-                    "type": "string",
-                    "description": "The address to bind to when listening for Xdebug (default: all IPv6 connections if available, else all IPv4 connections) or Unix Domain socket (prefix with unix://) or Windows Pipe (\\\\?\\pipe\\name) - cannot be combined with port"
-                },
-                "port": {
-                    "type": "integer",
-                    "description": "The port on which to listen for Xdebug (default: 9003). If port is set to 0 a random port is chosen by the system and a placeholder ${port} is replaced with the chosen port in env and runtimeArgs.",
-                    "default": 9003
-                },
-                "program": {
-                    "type": "string",
-                    "description": "The PHP script to debug (typically a path to a file)",
-                    "default": "${file}"
-                },
-                "cwd": {
-                    "type": "string",
-                    "description": "Working directory for the debugged program"
-                },
-                "args": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    },
-                    "description": "Command line arguments to pass to the program"
-                },
-                "env": {
-                    "type": "object",
-                    "description": "Environment variables to pass to the program",
-                    "additionalProperties": {
-                        "type": "string"
-                    }
-                },
-                "stopOnEntry": {
-                    "type": "boolean",
-                    "description": "Whether to break at the beginning of the script",
-                    "default": false
-                },
-                "pathMappings": {
-                    "type": "object",
-                    "description": "A mapping of server paths to local paths.",
-                },
-                "log": {
-                    "type": "boolean",
-                    "description": "Whether to log all communication between editor and the adapter to the debug console",
-                    "default": false
-                },
-                "ignore": {
-                    "type": "array",
-                    "description": "An array of glob patterns that errors should be ignored from (for example **/vendor/**/*.php)",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "ignoreExceptions": {
-                    "type": "array",
-                    "description": "An array of exception class names that should be ignored (for example BaseException, \\NS1\\Exception, \\*\\Exception or \\**\\Exception*)",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "skipFiles": {
-                    "type": "array",
-                    "description": "An array of glob patterns to skip when debugging. Star patterns and negations are allowed.",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "skipEntryPaths": {
-                    "type": "array",
-                    "description": "An array of glob patterns to immediately detach from and ignore for debugging if the entry script matches",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "maxConnections": {
-                    "type": "integer",
-                    "description": "Accept only this number of parallel debugging sessions. Additional connections will be dropped.",
-                    "default": 1
-                },
-                "proxy": {
-                    "type": "object",
-                    "description": "DBGp Proxy settings",
-                    "properties": {
-                        "enable": {
-                            "type": "boolean",
-                            "description": "To enable proxy registration",
-                            "default": false
-                        },
-                        "host": {
-                            "type": "string",
-                            "description": "The address of the proxy. Supports host name, IP address, or Unix domain socket.",
-                            "default": "127.0.0.1"
-                        },
-                        "port": {
-                            "type": "integer",
-                            "description": "The port where the adapter will register with the proxy",
-                            "default": 9001
-                        },
-                        "key": {
-                            "type": "string",
-                            "description": "A unique key that allows the proxy to match requests to your editor",
-                            "default": "vsc"
-                        },
-                        "timeout": {
-                            "type": "integer",
-                            "description": "The number of milliseconds to wait before giving up on the connection to proxy",
-                            "default": 3000
-                        },
-                        "allowMultipleSessions": {
-                            "type": "boolean",
-                            "description": "If the proxy should forward multiple sessions/connections at the same time or not",
-                            "default": true
-                        }
-                    }
-                },
-                "xdebugSettings": {
-                    "type": "object",
-                    "description": "Allows you to override Xdebug's remote debugging settings to fine tune Xdebug to your needs",
-                    "properties": {
-                        "max_children": {
-                            "type": "integer",
-                            "description": "Max number of array or object children to initially retrieve"
-                        },
-                        "max_data": {
-                            "type": "integer",
-                            "description": "Max amount of variable data to initially retrieve"
-                        },
-                        "max_depth": {
-                            "type": "integer",
-                            "description": "Maximum depth that the debugger engine may return when sending arrays, hashes or object structures to the IDE"
-                        },
-                        "show_hidden": {
-                            "type": "integer",
-                            "description": "Whether to show detailed internal information on properties (e.g. private members of classes). Zero means hidden members are not shown.",
-                            "enum": [0, 1]
-                        },
-                        "breakpoint_include_return_value": {
-                            "type": "boolean",
-                            "description": "Determines whether to enable an additional \"return from function\" debugging step, allowing inspection of the return value when a function call returns"
-                        }
-                    }
-                },
-                "xdebugCloudToken": {
-                    "type": "string",
-                    "description": "Instead of listening locally, open a connection and register with Xdebug Cloud and accept debugging sessions on that connection"
-                },
-                "stream": {
-                    "type": "object",
-                    "description": "Allows to influence DBGp streams. Xdebug only supports stdout",
-                    "properties": {
-                        "stdout": {
-                            "type": "integer",
-                            "description": "Redirect stdout stream: 0 (disable), 1 (copy), 2 (redirect)",
-                            "enum": [0, 1, 2],
-                            "default": 0
-                        }
-                    }
-                }
-            },
-            "required": ["request", "program"]
-        })
-    }
-
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    fn adapter_language_name(&self) -> Option<LanguageName> {
-        Some(SharedString::new_static("PHP").into())
-    }
-
-    async fn request_kind(
-        &self,
-        _: &serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        Ok(StartDebuggingRequestArgumentsRequest::Launch)
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let obj = match &zed_scenario.request {
-            dap::DebugRequest::Attach(_) => {
-                bail!("Php adapter doesn't support attaching")
-            }
-            dap::DebugRequest::Launch(launch_config) => json!({
-                "program": launch_config.program,
-                "cwd": launch_config.cwd,
-                "args": launch_config.args,
-                "env": launch_config.env_json(),
-                "stopOnEntry": zed_scenario.stop_on_entry.unwrap_or_default(),
-            }),
-        };
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            build: None,
-            config: obj,
-            tcp_connection: None,
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        if self.checked.set(()).is_ok() {
-            delegate.output_to_console(format!("Checking latest version of {}...", self.name()));
-            if let Some(version) = self.fetch_latest_adapter_version(delegate).await.log_err() {
-                adapters::download_adapter_from_github(
-                    self.name(),
-                    version,
-                    adapters::DownloadedFileType::Vsix,
-                    delegate.as_ref(),
-                )
-                .await?;
-            }
-        }
-
-        self.get_installed_binary(
-            delegate,
-            &task_definition,
-            user_installed_path,
-            user_args,
-            cx,
-        )
-        .await
-    }
-}
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -660,6 +660,15 @@ impl DebugAdapter for PythonDebugAdapter {
        self.get_installed_binary(delegate, &config, None, user_args, toolchain, false)
            .await
    }
+
+    fn label_for_child_session(&self, args: &StartDebuggingRequestArguments) -> Option<String> {
+        let label = args
+            .configuration
+            .get("name")?
+            .as_str()
+            .filter(|label| !label.is_empty())?;
+        Some(label.to_owned())
+    }
 }

 async fn fetch_latest_adapter_version_from_github(
--- a/crates/debug_adapter_extension/src/extension_locator_adapter.rs
+++ b/crates/debug_adapter_extension/src/extension_locator_adapter.rs
@@ -44,7 +44,9 @@ impl DapLocator for ExtensionLocatorAdapter {
            .flatten()
    }

-    async fn run(&self, _build_config: SpawnInTerminal) -> Result<DebugRequest> {
-        Err(anyhow::anyhow!("Not implemented"))
+    async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest> {
+        self.extension
+            .run_dap_locator(self.locator_name.as_ref().to_owned(), build_config)
+            .await
    }
 }
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -918,7 +918,13 @@ impl Render for DapLogView {
    }
 }

-actions!(dev, [OpenDebugAdapterLogs]);
+actions!(
+    dev,
+    [
+        /// Opens the debug adapter protocol logs viewer.
+        OpenDebugAdapterLogs
+    ]
+);

 pub fn init(cx: &mut App) {
    let log_store = cx.new(|cx| LogStore::new(cx));
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -40,6 +40,7 @@ file_icons.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
+indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
 log.workspace = true
@@ -60,6 +61,7 @@ task.workspace = true
 tasks_ui.workspace = true
 telemetry.workspace = true
 terminal_view.workspace = true
+text.workspace = true
 theme.workspace = true
 tree-sitter.workspace = true
 tree-sitter-json.workspace = true
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -206,7 +206,7 @@ impl PickerDelegate for AttachModalDelegate {
        })
    }

-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
        let candidate = self
            .matches
            .get(self.selected_index())
@@ -229,30 +229,44 @@ impl PickerDelegate for AttachModalDelegate {
            }
        }

+        let workspace = self.workspace.clone();
+        let Some(panel) = workspace
+            .update(cx, |workspace, cx| workspace.panel::<DebugPanel>(cx))
+            .ok()
+            .flatten()
+        else {
+            return;
+        };
+
+        if secondary {
+            // let Some(id) = worktree_id else { return };
+            // cx.spawn_in(window, async move |_, cx| {
+            //     panel
+            //         .update_in(cx, |debug_panel, window, cx| {
+            //             debug_panel.save_scenario(&debug_scenario, id, window, cx)
+            //         })?
+            //         .await?;
+            //     anyhow::Ok(())
+            // })
+            // .detach_and_log_err(cx);
+        }
        let Some(adapter) = cx.read_global::<DapRegistry, _>(|registry, _| {
            registry.adapter(&self.definition.adapter)
        }) else {
            return;
        };

-        let workspace = self.workspace.clone();
        let definition = self.definition.clone();
        cx.spawn_in(window, async move |this, cx| {
            let Ok(scenario) = adapter.config_from_zed_format(definition).await else {
                return;
            };

-            let panel = workspace
-                .update(cx, |workspace, cx| workspace.panel::<DebugPanel>(cx))
-                .ok()
-                .flatten();
-            if let Some(panel) = panel {
-                panel
-                    .update_in(cx, |panel, window, cx| {
-                        panel.start_session(scenario, Default::default(), None, None, window, cx);
-                    })
-                    .ok();
-            }
+            panel
+                .update_in(cx, |panel, window, cx| {
+                    panel.start_session(scenario, Default::default(), None, None, window, cx);
+                })
+                .ok();
            this.update(cx, |_, cx| {
                cx.emit(DismissEvent);
            })
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -5,7 +5,7 @@ use crate::session::running::breakpoint_list::BreakpointList;
 use crate::{
    ClearAllBreakpoints, Continue, CopyDebugAdapterArguments, Detach, FocusBreakpointList,
    FocusConsole, FocusFrames, FocusLoadedSources, FocusModules, FocusTerminal, FocusVariables,
-    NewProcessModal, NewProcessMode, Pause, Restart, StepInto, StepOut, StepOver, Stop,
+    NewProcessModal, NewProcessMode, Pause, RerunSession, StepInto, StepOut, StepOver, Stop,
    ToggleExpandItem, ToggleSessionPicker, ToggleThreadPicker, persistence, spawn_task_or_modal,
 };
 use anyhow::{Context as _, Result, anyhow};
@@ -16,16 +16,18 @@ use dap::{
    client::SessionId, debugger_settings::DebuggerSettings,
 };
 use dap::{DapRegistry, StartDebuggingRequestArguments};
+use editor::Editor;
 use gpui::{
    Action, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity, EntityId,
    EventEmitter, FocusHandle, Focusable, MouseButton, MouseDownEvent, Point, Subscription, Task,
    WeakEntity, anchored, deferred,
 };
+use text::ToPoint as _;

 use itertools::Itertools as _;
 use language::Buffer;
 use project::debugger::session::{Session, SessionStateEvent};
-use project::{Fs, ProjectPath, WorktreeId};
+use project::{DebugScenarioContext, Fs, ProjectPath, TaskSourceKind, WorktreeId};
 use project::{Project, debugger::session::ThreadStatus};
 use rpc::proto::{self};
 use settings::Settings;
@@ -33,10 +35,11 @@ use std::sync::{Arc, LazyLock};
 use task::{DebugScenario, TaskContext};
 use tree_sitter::{Query, StreamingIterator as _};
 use ui::{ContextMenu, Divider, PopoverMenuHandle, Tooltip, prelude::*};
-use util::maybe;
+use util::{ResultExt, maybe};
 use workspace::SplitDirection;
+use workspace::item::SaveOptions;
 use workspace::{
-    Pane, Workspace,
+    Item, Pane, Workspace,
    dock::{DockPosition, Panel, PanelEvent},
 };
 use zed_actions::ToggleFocus;
@@ -197,6 +200,7 @@ impl DebugPanel {
                .and_then(|buffer| buffer.read(cx).file())
                .map(|f| f.worktree_id(cx))
        });
+
        let Some(worktree) = worktree
            .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
            .or_else(|| self.project.read(cx).visible_worktrees(cx).next())
@@ -204,6 +208,7 @@ impl DebugPanel {
            log::debug!("Could not find a worktree to spawn the debug session in");
            return;
        };
+
        self.debug_scenario_scheduled_last = true;
        if let Some(inventory) = self
            .project
@@ -214,7 +219,15 @@ impl DebugPanel {
            .cloned()
        {
            inventory.update(cx, |inventory, _| {
-                inventory.scenario_scheduled(scenario.clone());
+                inventory.scenario_scheduled(
+                    scenario.clone(),
+                    // todo(debugger): Task context is cloned three times
+                    // once in Session,inventory, and in resolve scenario
+                    // we should wrap it in an RC instead to save some memory
+                    task_context.clone(),
+                    worktree_id,
+                    active_buffer.as_ref().map(|buffer| buffer.downgrade()),
+                );
            })
        }
        let task = cx.spawn_in(window, {
@@ -225,6 +238,16 @@ impl DebugPanel {
                let definition = debug_session
                    .update_in(cx, |debug_session, window, cx| {
                        debug_session.running_state().update(cx, |running, cx| {
+                            if scenario.build.is_some() {
+                                running.scenario = Some(scenario.clone());
+                                running.scenario_context = Some(DebugScenarioContext {
+                                    active_buffer: active_buffer
+                                        .as_ref()
+                                        .map(|entity| entity.downgrade()),
+                                    task_context: task_context.clone(),
+                                    worktree_id: worktree_id,
+                                });
+                            };
                            running.resolve_scenario(
                                scenario,
                                task_context,
@@ -273,7 +296,8 @@ impl DebugPanel {
            return;
        };
        let workspace = self.workspace.clone();
-        let Some(scenario) = task_inventory.read(cx).last_scheduled_scenario().cloned() else {
+        let Some((scenario, context)) = task_inventory.read(cx).last_scheduled_scenario().cloned()
+        else {
            window.defer(cx, move |window, cx| {
                workspace
                    .update(cx, |workspace, cx| {
@@ -284,28 +308,22 @@ impl DebugPanel {
            return;
        };

-        cx.spawn_in(window, async move |this, cx| {
-            let task_contexts = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    tasks_ui::task_contexts(workspace, window, cx)
-                })?
-                .await;
+        let DebugScenarioContext {
+            task_context,
+            worktree_id,
+            active_buffer,
+        } = context;

-            let task_context = task_contexts.active_context().cloned().unwrap_or_default();
-            let worktree_id = task_contexts.worktree();
+        let active_buffer = active_buffer.and_then(|buffer| buffer.upgrade());

-            this.update_in(cx, |this, window, cx| {
-                this.start_session(
-                    scenario.clone(),
-                    task_context,
-                    None,
-                    worktree_id,
-                    window,
-                    cx,
-                );
-            })
-        })
-        .detach();
+        self.start_session(
+            scenario,
+            task_context,
+            active_buffer,
+            worktree_id,
+            window,
+            cx,
+        );
    }

    pub(crate) async fn register_session(
@@ -348,11 +366,17 @@ impl DebugPanel {
        let label = curr_session.read(cx).label().clone();
        let adapter = curr_session.read(cx).adapter().clone();
        let binary = curr_session.read(cx).binary().cloned().unwrap();
-        let task = curr_session.update(cx, |session, cx| session.shutdown(cx));
        let task_context = curr_session.read(cx).task_context().clone();

+        let curr_session_id = curr_session.read(cx).session_id();
+        self.sessions
+            .retain(|session| session.read(cx).session_id(cx) != curr_session_id);
+        let task = dap_store_handle.update(cx, |dap_store, cx| {
+            dap_store.shutdown_session(curr_session_id, cx)
+        });
+
        cx.spawn_in(window, async move |this, cx| {
-            task.await;
+            task.await.log_err();

            let (session, task) = dap_store_handle.update(cx, |dap_store, cx| {
                let session = dap_store.new_session(label, adapter, task_context, None, cx);
@@ -758,16 +782,16 @@ impl DebugPanel {
                                            .icon_size(IconSize::XSmall)
                                            .on_click(window.listener_for(
                                                &running_state,
-                                                |this, _, _window, cx| {
-                                                    this.restart_session(cx);
+                                                |this, _, window, cx| {
+                                                    this.rerun_session(window, cx);
                                                },
                                            ))
                                            .tooltip({
                                                let focus_handle = focus_handle.clone();
                                                move |window, cx| {
                                                    Tooltip::for_action_in(
-                                                        "Restart",
-                                                        &Restart,
+                                                        "Rerun Session",
+                                                        &RerunSession,
                                                        &focus_handle,
                                                        window,
                                                        cx,
@@ -967,13 +991,90 @@ impl DebugPanel {
        cx.notify();
    }

-    pub(crate) fn save_scenario(
+    pub(crate) fn go_to_scenario_definition(
        &self,
-        scenario: &DebugScenario,
+        kind: TaskSourceKind,
+        scenario: DebugScenario,
        worktree_id: WorktreeId,
        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectPath>> {
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let Some(workspace) = self.workspace.upgrade() else {
+            return Task::ready(Ok(()));
+        };
+        let project_path = match kind {
+            TaskSourceKind::AbsPath { abs_path, .. } => {
+                let Some(project_path) = workspace
+                    .read(cx)
+                    .project()
+                    .read(cx)
+                    .project_path_for_absolute_path(&abs_path, cx)
+                else {
+                    return Task::ready(Err(anyhow!("no abs path")));
+                };
+
+                project_path
+            }
+            TaskSourceKind::Worktree {
+                id,
+                directory_in_worktree: dir,
+                ..
+            } => {
+                let relative_path = if dir.ends_with(".vscode") {
+                    dir.join("launch.json")
+                } else {
+                    dir.join("debug.json")
+                };
+                ProjectPath {
+                    worktree_id: id,
+                    path: Arc::from(relative_path),
+                }
+            }
+            _ => return self.save_scenario(scenario, worktree_id, window, cx),
+        };
+
+        let editor = workspace.update(cx, |workspace, cx| {
+            workspace.open_path(project_path, None, true, window, cx)
+        });
+        cx.spawn_in(window, async move |_, cx| {
+            let editor = editor.await?;
+            let editor = cx
+                .update(|_, cx| editor.act_as::<Editor>(cx))?
+                .context("expected editor")?;
+
+            // unfortunately debug tasks don't have an easy way to globally
+            // identify them. to jump to the one that you just created or an
+            // old one that you're choosing to edit we use a heuristic of searching for a line with `label:  <your label>` from the end rather than the start so we bias towards more renctly
+            editor.update_in(cx, |editor, window, cx| {
+                let row = editor.text(cx).lines().enumerate().find_map(|(row, text)| {
+                    if text.contains(scenario.label.as_ref()) && text.contains("\"label\": ") {
+                        Some(row)
+                    } else {
+                        None
+                    }
+                });
+                if let Some(row) = row {
+                    editor.go_to_singleton_buffer_point(
+                        text::Point::new(row as u32, 4),
+                        window,
+                        cx,
+                    );
+                }
+            })?;
+
+            Ok(())
+        })
+    }
+
+    pub(crate) fn save_scenario(
+        &self,
+        scenario: DebugScenario,
+        worktree_id: WorktreeId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let this = cx.weak_entity();
+        let project = self.project.clone();
        self.workspace
            .update(cx, |workspace, cx| {
                let Some(mut path) = workspace.absolute_path_of_worktree(worktree_id, cx) else {
@@ -1006,47 +1107,7 @@ impl DebugPanel {
                        )
                        .await?;
                    }
-
-                    let mut content = fs.load(path).await?;
-                    let new_scenario = serde_json_lenient::to_string_pretty(&serialized_scenario)?
-                        .lines()
-                        .map(|l| format!("  {l}"))
-                        .join("\n");
-
-                    static ARRAY_QUERY: LazyLock<Query> = LazyLock::new(|| {
-                        Query::new(
-                            &tree_sitter_json::LANGUAGE.into(),
-                            "(document (array (object) @object))", // TODO: use "." anchor to only match last object
-                        )
-                        .expect("Failed to create ARRAY_QUERY")
-                    });
-
-                    let mut parser = tree_sitter::Parser::new();
-                    parser
-                        .set_language(&tree_sitter_json::LANGUAGE.into())
-                        .unwrap();
-                    let mut cursor = tree_sitter::QueryCursor::new();
-                    let syntax_tree = parser.parse(&content, None).unwrap();
-                    let mut matches =
-                        cursor.matches(&ARRAY_QUERY, syntax_tree.root_node(), content.as_bytes());
-
-                    // we don't have `.last()` since it's a lending iterator, so loop over
-                    // the whole thing to find the last one
-                    let mut last_offset = None;
-                    while let Some(mat) = matches.next() {
-                        if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end) {
-                            last_offset = Some(pos)
-                        }
-                    }
-
-                    if let Some(pos) = last_offset {
-                        content.insert_str(pos, &new_scenario);
-                        content.insert_str(pos, ",\n");
-                    }
-
-                    fs.write(path, content.as_bytes()).await?;
-
-                    workspace.update(cx, |workspace, cx| {
+                    let project_path = workspace.update(cx, |workspace, cx| {
                        workspace
                            .project()
                            .read(cx)
@@ -1054,12 +1115,113 @@ impl DebugPanel {
                            .context(
                                "Couldn't get project path for .zed/debug.json in active worktree",
                            )
-                    })?
+                    })??;
+
+                    let editor = this
+                        .update_in(cx, |this, window, cx| {
+                            this.workspace.update(cx, |workspace, cx| {
+                                workspace.open_path(project_path, None, true, window, cx)
+                            })
+                        })??
+                        .await?;
+                    let editor = cx
+                        .update(|_, cx| editor.act_as::<Editor>(cx))?
+                        .context("expected editor")?;
+
+                    let new_scenario = serde_json_lenient::to_string_pretty(&serialized_scenario)?
+                        .lines()
+                        .map(|l| format!("  {l}"))
+                        .join("\n");
+
+                    editor
+                        .update_in(cx, |editor, window, cx| {
+                            Self::insert_task_into_editor(editor, new_scenario, project, window, cx)
+                        })??
+                        .await
                })
            })
            .unwrap_or_else(|err| Task::ready(Err(err)))
    }

+    pub fn insert_task_into_editor(
+        editor: &mut Editor,
+        new_scenario: String,
+        project: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Editor>,
+    ) -> Result<Task<Result<()>>> {
+        static LAST_ITEM_QUERY: LazyLock<Query> = LazyLock::new(|| {
+            Query::new(
+                &tree_sitter_json::LANGUAGE.into(),
+                "(document (array (object) @object))", // TODO: use "." anchor to only match last object
+            )
+            .expect("Failed to create LAST_ITEM_QUERY")
+        });
+        static EMPTY_ARRAY_QUERY: LazyLock<Query> = LazyLock::new(|| {
+            Query::new(
+                &tree_sitter_json::LANGUAGE.into(),
+                "(document (array) @array)",
+            )
+            .expect("Failed to create EMPTY_ARRAY_QUERY")
+        });
+
+        let content = editor.text(cx);
+        let mut parser = tree_sitter::Parser::new();
+        parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
+        let mut cursor = tree_sitter::QueryCursor::new();
+        let syntax_tree = parser
+            .parse(&content, None)
+            .context("could not parse debug.json")?;
+        let mut matches = cursor.matches(
+            &LAST_ITEM_QUERY,
+            syntax_tree.root_node(),
+            content.as_bytes(),
+        );
+
+        let mut last_offset = None;
+        while let Some(mat) = matches.next() {
+            if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end) {
+                last_offset = Some(pos)
+            }
+        }
+        let mut edits = Vec::new();
+        let mut cursor_position = 0;
+
+        if let Some(pos) = last_offset {
+            edits.push((pos..pos, format!(",\n{new_scenario}")));
+            cursor_position = pos + ",\n  ".len();
+        } else {
+            let mut matches = cursor.matches(
+                &EMPTY_ARRAY_QUERY,
+                syntax_tree.root_node(),
+                content.as_bytes(),
+            );
+
+            if let Some(mat) = matches.next() {
+                if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end - 1) {
+                    edits.push((pos..pos, format!("\n{new_scenario}\n")));
+                    cursor_position = pos + "\n  ".len();
+                }
+            } else {
+                edits.push((0..0, format!("[\n{}\n]", new_scenario)));
+                cursor_position = "[\n  ".len();
+            }
+        }
+        editor.transact(window, cx, |editor, window, cx| {
+            editor.edit(edits, cx);
+            let snapshot = editor
+                .buffer()
+                .read(cx)
+                .as_singleton()
+                .unwrap()
+                .read(cx)
+                .snapshot();
+            let point = cursor_position.to_point(&snapshot);
+            editor.go_to_singleton_buffer_point(point, window, cx);
+        });
+        Ok(editor.save(SaveOptions::default(), project, window, cx))
+    }
+
    pub(crate) fn toggle_thread_picker(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        self.thread_picker_menu_handle.toggle(window, cx);
    }
@@ -1283,9 +1445,7 @@ impl Panel for DebugPanel {

 impl Render for DebugPanel {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_sessions = self.sessions.len() > 0;
        let this = cx.weak_entity();
-        debug_assert_eq!(has_sessions, self.active_session.is_some());

        if self
            .active_session
@@ -1298,11 +1458,13 @@ impl Render for DebugPanel {
        }

        v_flex()
-            .when_else(
-                self.position(window, cx) == DockPosition::Bottom,
-                |this| this.max_h(self.size),
-                |this| this.max_w(self.size),
-            )
+            .when(!self.is_zoomed, |this| {
+                this.when_else(
+                    self.position(window, cx) == DockPosition::Bottom,
+                    |this| this.max_h(self.size),
+                    |this| this.max_w(self.size),
+                )
+            })
            .size_full()
            .key_context("DebugPanel")
            .child(h_flex().children(self.top_controls_strip(window, cx)))
@@ -1470,8 +1632,8 @@ impl Render for DebugPanel {
                }))
            })
            .map(|this| {
-                if has_sessions {
-                    this.children(self.active_session.clone())
+                if let Some(active_session) = self.active_session.clone() {
+                    this.child(active_session)
                } else {
                    let docked_to_bottom = self.position(window, cx) == DockPosition::Bottom;
                    let welcome_experience = v_flex()
@@ -1600,12 +1762,13 @@ impl workspace::DebuggerProvider for DebuggerProvider {
        definition: DebugScenario,
        context: TaskContext,
        buffer: Option<Entity<Buffer>>,
+        worktree_id: Option<WorktreeId>,
        window: &mut Window,
        cx: &mut App,
    ) {
        self.0.update(cx, |_, cx| {
-            cx.defer_in(window, |this, window, cx| {
-                this.start_session(definition, context, buffer, None, window, cx);
+            cx.defer_in(window, move |this, window, cx| {
+                this.start_session(definition, context, buffer, worktree_id, window, cx);
            })
        })
    }
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -32,34 +32,67 @@ pub mod tests;
 actions!(
    debugger,
    [
+        /// Starts a new debugging session.
        Start,
+        /// Continues execution until the next breakpoint.
        Continue,
+        /// Detaches the debugger from the running process.
        Detach,
+        /// Pauses the currently running program.
        Pause,
+        /// Restarts the current debugging session.
        Restart,
+        /// Reruns the current debugging session with the same configuration.
+        RerunSession,
+        /// Steps into the next function call.
        StepInto,
+        /// Steps over the current line.
        StepOver,
+        /// Steps out of the current function.
        StepOut,
+        /// Steps back to the previous statement.
        StepBack,
+        /// Stops the debugging session.
        Stop,
+        /// Toggles whether to ignore all breakpoints.
        ToggleIgnoreBreakpoints,
+        /// Clears all breakpoints in the project.
        ClearAllBreakpoints,
+        /// Focuses on the debugger console panel.
        FocusConsole,
+        /// Focuses on the variables panel.
        FocusVariables,
+        /// Focuses on the breakpoint list panel.
        FocusBreakpointList,
+        /// Focuses on the call stack frames panel.
        FocusFrames,
+        /// Focuses on the loaded modules panel.
        FocusModules,
+        /// Focuses on the loaded sources panel.
        FocusLoadedSources,
+        /// Focuses on the terminal panel.
        FocusTerminal,
+        /// Shows the stack trace for the current thread.
        ShowStackTrace,
+        /// Toggles the thread picker dropdown.
        ToggleThreadPicker,
+        /// Toggles the session picker dropdown.
        ToggleSessionPicker,
-        RerunLastSession,
+        /// Reruns the last debugging session.
+        #[action(deprecated_aliases = ["debugger::RerunLastSession"])]
+        Rerun,
+        /// Toggles expansion of the selected item in the debugger UI.
        ToggleExpandItem,
    ]
 );

-actions!(dev, [CopyDebugAdapterArguments]);
+actions!(
+    dev,
+    [
+        /// Copies debug adapter launch arguments to clipboard.
+        CopyDebugAdapterArguments
+    ]
+);

 pub fn init(cx: &mut App) {
    DebuggerSettings::register(cx);
@@ -74,17 +107,15 @@ pub fn init(cx: &mut App) {
            .register_action(|workspace: &mut Workspace, _: &Start, window, cx| {
                NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
            })
-            .register_action(
-                |workspace: &mut Workspace, _: &RerunLastSession, window, cx| {
-                    let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
-                        return;
-                    };
+            .register_action(|workspace: &mut Workspace, _: &Rerun, window, cx| {
+                let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
+                    return;
+                };

-                    debug_panel.update(cx, |debug_panel, cx| {
-                        debug_panel.rerun_last_session(workspace, window, cx);
-                    })
-                },
-            )
+                debug_panel.update(cx, |debug_panel, cx| {
+                    debug_panel.rerun_last_session(workspace, window, cx);
+                })
+            })
            .register_action(
                |workspace: &mut Workspace, _: &ShutdownDebugAdapters, _window, cx| {
                    workspace.project().update(cx, |project, cx| {
@@ -210,6 +241,14 @@ pub fn init(cx: &mut App) {
                            .ok();
                    }
                })
+                .on_action({
+                    let active_item = active_item.clone();
+                    move |_: &RerunSession, window, cx| {
+                        active_item
+                            .update(cx, |item, cx| item.rerun_session(window, cx))
+                            .ok();
+                    }
+                })
                .on_action({
                    let active_item = active_item.clone();
                    move |_: &Stop, _, cx| {
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -4,6 +4,7 @@ use collections::HashMap;
 use gpui::{Animation, AnimationExt as _, Entity, Transformation, percentage};
 use project::debugger::session::{ThreadId, ThreadStatus};
 use ui::{ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};
+use util::truncate_and_trailoff;

 use crate::{
    debugger_panel::DebugPanel,
@@ -12,6 +13,8 @@ use crate::{

 impl DebugPanel {
    fn dropdown_label(label: impl Into<SharedString>) -> Label {
+        const MAX_LABEL_CHARS: usize = 50;
+        let label = truncate_and_trailoff(&label.into(), MAX_LABEL_CHARS);
        Label::new(label).size(LabelSize::Small)
    }

@@ -170,6 +173,8 @@ impl DebugPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<DropdownMenu> {
+        const MAX_LABEL_CHARS: usize = 150;
+
        let running_state = running_state.clone();
        let running_state_read = running_state.read(cx);
        let thread_id = running_state_read.thread_id();
@@ -202,6 +207,7 @@ impl DebugPanel {
                                .is_empty()
                                .then(|| format!("Tid: {}", thread.id))
                                .unwrap_or_else(|| thread.name);
+                            let entry_name = truncate_and_trailoff(&entry_name, MAX_LABEL_CHARS);

                            this = this.entry(entry_name, None, move |window, cx| {
                                running_state.update(cx, |running_state, cx| {
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -1,12 +1,10 @@
-use anyhow::bail;
+use anyhow::{Context as _, bail};
 use collections::{FxHashMap, HashMap};
 use language::LanguageRegistry;
-use paths::local_debug_file_relative_path;
 use std::{
    borrow::Cow,
    path::{Path, PathBuf},
    sync::Arc,
-    time::Duration,
    usize,
 };
 use tasks_ui::{TaskOverrides, TasksModal};
@@ -18,33 +16,27 @@ use editor::{Editor, EditorElement, EditorStyle};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
    Action, App, AppContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    HighlightStyle, InteractiveText, KeyContext, PromptButton, PromptLevel, Render, StyledText,
-    Subscription, Task, TextStyle, UnderlineStyle, WeakEntity,
+    KeyContext, Render, Subscription, Task, TextStyle, WeakEntity,
 };
 use itertools::Itertools as _;
 use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
-use project::{ProjectPath, TaskContexts, TaskSourceKind, task_store::TaskStore};
-use settings::{Settings, initial_local_debug_tasks_content};
+use project::{DebugScenarioContext, TaskContexts, TaskSourceKind, task_store::TaskStore};
+use settings::Settings;
 use task::{DebugScenario, RevealTarget, ZedDebugConfig};
 use theme::ThemeSettings;
 use ui::{
-    ActiveTheme, CheckboxWithLabel, Clickable, Context, ContextMenu, Disableable, DropdownMenu,
-    FluentBuilder, IconWithIndicator, Indicator, IntoElement, KeyBinding, ListItem,
-    ListItemSpacing, ParentElement, StyledExt, ToggleButton, ToggleState, Toggleable, Tooltip,
-    Window, div, prelude::*, px, relative, rems,
+    ActiveTheme, Button, ButtonCommon, ButtonSize, CheckboxWithLabel, Clickable, Color, Context,
+    ContextMenu, Disableable, DropdownMenu, FluentBuilder, Icon, IconName, IconSize,
+    IconWithIndicator, Indicator, InteractiveElement, IntoElement, KeyBinding, Label,
+    LabelCommon as _, LabelSize, ListItem, ListItemSpacing, ParentElement, RenderOnce,
+    SharedString, Styled, StyledExt, ToggleButton, ToggleState, Toggleable, Tooltip, Window, div,
+    h_flex, relative, rems, v_flex,
 };
 use util::ResultExt;
-use workspace::{ModalView, Workspace, pane};
+use workspace::{ModalView, Workspace, notifications::DetachAndPromptErr, pane};

 use crate::{attach_modal::AttachModal, debugger_panel::DebugPanel};

-#[allow(unused)]
-enum SaveScenarioState {
-    Saving,
-    Saved((ProjectPath, SharedString)),
-    Failed(SharedString),
-}
-
 pub(super) struct NewProcessModal {
    workspace: WeakEntity<Workspace>,
    debug_panel: WeakEntity<DebugPanel>,
@@ -54,7 +46,6 @@ pub(super) struct NewProcessModal {
    configure_mode: Entity<ConfigureMode>,
    task_mode: TaskMode,
    debugger: Option<DebugAdapterName>,
-    save_scenario_state: Option<SaveScenarioState>,
    _subscriptions: [Subscription; 3],
 }

@@ -92,6 +83,7 @@ impl NewProcessModal {

        cx.spawn_in(window, async move |workspace, cx| {
            let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
+                // todo(debugger): get the buffer here (if the active item is an editor) and store it so we can pass it to start_session later
                tasks_ui::task_contexts(workspace, window, cx)
            })?;
            workspace.update_in(cx, |workspace, window, cx| {
@@ -265,7 +257,6 @@ impl NewProcessModal {
                        mode,
                        debug_panel: debug_panel.downgrade(),
                        workspace: workspace_handle,
-                        save_scenario_state: None,
                        _subscriptions,
                    }
                });
@@ -417,63 +408,29 @@ impl NewProcessModal {
        self.debug_picker.read(cx).delegate.task_contexts.clone()
    }

-    fn save_debug_scenario(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let task_contents = self.task_contexts(cx);
+    pub fn save_debug_scenario(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let task_contexts = self.task_contexts(cx);
        let Some(adapter) = self.debugger.as_ref() else {
            return;
        };
        let scenario = self.debug_scenario(&adapter, cx);
-
-        self.save_scenario_state = Some(SaveScenarioState::Saving);
-
        cx.spawn_in(window, async move |this, cx| {
-            let Some((scenario, worktree_id)) = scenario
-                .await
-                .zip(task_contents.and_then(|tcx| tcx.worktree()))
-            else {
-                this.update(cx, |this, _| {
-                    this.save_scenario_state = Some(SaveScenarioState::Failed(
-                        "Couldn't get scenario or task contents".into(),
-                    ))
+            let scenario = scenario.await.context("no scenario to save")?;
+            let worktree_id = task_contexts
+                .context("no task contexts")?
+                .worktree()
+                .context("no active worktree")?;
+            this.update_in(cx, |this, window, cx| {
+                this.debug_panel.update(cx, |panel, cx| {
+                    panel.save_scenario(scenario, worktree_id, window, cx)
                })
-                .ok();
-                return;
-            };
-
-            let Some(save_scenario) = this
-                .update_in(cx, |this, window, cx| {
-                    this.debug_panel
-                        .update(cx, |panel, cx| {
-                            panel.save_scenario(&scenario, worktree_id, window, cx)
-                        })
-                        .ok()
-                })
-                .ok()
-                .flatten()
-            else {
-                return;
-            };
-            let res = save_scenario.await;
-
-            this.update(cx, |this, _| match res {
-                Ok(saved_file) => {
-                    this.save_scenario_state = Some(SaveScenarioState::Saved((
-                        saved_file,
-                        scenario.label.clone(),
-                    )))
-                }
-                Err(error) => {
-                    this.save_scenario_state =
-                        Some(SaveScenarioState::Failed(error.to_string().into()))
-                }
+            })??
+            .await?;
+            this.update_in(cx, |_, _, cx| {
+                cx.emit(DismissEvent);
            })
-            .ok();
-
-            cx.background_executor().timer(Duration::from_secs(3)).await;
-            this.update(cx, |this, _| this.save_scenario_state.take())
-                .ok();
        })
-        .detach();
+        .detach_and_prompt_err("Failed to edit debug.json", window, cx, |_, _, _| None);
    }

    fn adapter_drop_down_menu(
@@ -541,70 +498,6 @@ impl NewProcessModal {
            }),
        )
    }
-
-    fn open_debug_json(&self, window: &mut Window, cx: &mut Context<NewProcessModal>) {
-        let this = cx.entity();
-        window
-            .spawn(cx, async move |cx| {
-                let worktree_id = this.update(cx, |this, cx| {
-                    let tcx = this.task_contexts(cx);
-                    tcx?.worktree()
-                })?;
-
-                let Some(worktree_id) = worktree_id else {
-                    let _ = cx.prompt(
-                        PromptLevel::Critical,
-                        "Cannot open debug.json",
-                        Some("You must have at least one project open"),
-                        &[PromptButton::ok("Ok")],
-                    );
-                    return Ok(());
-                };
-
-                let editor = this
-                    .update_in(cx, |this, window, cx| {
-                        this.workspace.update(cx, |workspace, cx| {
-                            workspace.open_path(
-                                ProjectPath {
-                                    worktree_id,
-                                    path: local_debug_file_relative_path().into(),
-                                },
-                                None,
-                                true,
-                                window,
-                                cx,
-                            )
-                        })
-                    })??
-                    .await?;
-
-                cx.update(|_window, cx| {
-                    if let Some(editor) = editor.act_as::<Editor>(cx) {
-                        editor.update(cx, |editor, cx| {
-                            editor.buffer().update(cx, |buffer, cx| {
-                                if let Some(singleton) = buffer.as_singleton() {
-                                    singleton.update(cx, |buffer, cx| {
-                                        if buffer.is_empty() {
-                                            buffer.edit(
-                                                [(0..0, initial_local_debug_tasks_content())],
-                                                None,
-                                                cx,
-                                            );
-                                        }
-                                    })
-                                }
-                            })
-                        });
-                    }
-                })
-                .ok();
-
-                this.update(cx, |_, cx| cx.emit(DismissEvent)).ok();
-
-                anyhow::Ok(())
-            })
-            .detach();
-    }
 }

 static SELECT_DEBUGGER_LABEL: SharedString = SharedString::new_static("Select Debugger");
@@ -809,39 +702,21 @@ impl Render for NewProcessModal {
                    NewProcessMode::Launch => el.child(
                        container
                            .child(
-                                h_flex()
-                                    .text_ui_sm(cx)
-                                    .text_color(Color::Muted.color(cx))
-                                    .child(
-                                        InteractiveText::new(
-                                            "open-debug-json",
-                                            StyledText::new(
-                                                "Open .zed/debug.json for advanced configuration.",
-                                            )
-                                            .with_highlights([(
-                                                5..20,
-                                                HighlightStyle {
-                                                    underline: Some(UnderlineStyle {
-                                                        thickness: px(1.0),
-                                                        color: None,
-                                                        wavy: false,
-                                                    }),
-                                                    ..Default::default()
-                                                },
-                                            )]),
-                                        )
-                                        .on_click(
-                                            vec![5..20],
-                                            {
-                                                let this = cx.entity();
-                                                move |_, window, cx| {
-                                                    this.update(cx, |this, cx| {
-                                                        this.open_debug_json(window, cx);
-                                                    })
-                                                }
-                                            },
+                                h_flex().child(
+                                    Button::new("edit-custom-debug", "Edit in debug.json")
+                                        .on_click(cx.listener(|this, _, window, cx| {
+                                            this.save_debug_scenario(window, cx);
+                                        }))
+                                        .disabled(
+                                            self.debugger.is_none()
+                                                || self
+                                                    .configure_mode
+                                                    .read(cx)
+                                                    .program
+                                                    .read(cx)
+                                                    .is_empty(cx),
                                        ),
-                                    ),
+                                ),
                            )
                            .child(
                                Button::new("debugger-spawn", "Start")
@@ -859,29 +734,48 @@ impl Render for NewProcessModal {
                                    ),
                            ),
                    ),
-                    NewProcessMode::Attach => el.child(
+                    NewProcessMode::Attach => el.child({
+                        let disabled = self.debugger.is_none()
+                            || self
+                                .attach_mode
+                                .read(cx)
+                                .attach_picker
+                                .read(cx)
+                                .picker
+                                .read(cx)
+                                .delegate
+                                .match_count()
+                                == 0;
+                        let secondary_action = menu::SecondaryConfirm.boxed_clone();
                        container
-                            .child(div().child(self.adapter_drop_down_menu(window, cx)))
+                            .child(div().children(
+                                KeyBinding::for_action(&*secondary_action, window, cx).map(
+                                    |keybind| {
+                                        Button::new("edit-attach-task", "Edit in debug.json")
+                                            .label_size(LabelSize::Small)
+                                            .key_binding(keybind)
+                                            .on_click(move |_, window, cx| {
+                                                window.dispatch_action(
+                                                    secondary_action.boxed_clone(),
+                                                    cx,
+                                                )
+                                            })
+                                            .disabled(disabled)
+                                    },
+                                ),
+                            ))
                            .child(
-                                Button::new("debugger-spawn", "Start")
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.start_new_session(window, cx)
-                                    }))
-                                    .disabled(
-                                        self.debugger.is_none()
-                                            || self
-                                                .attach_mode
-                                                .read(cx)
-                                                .attach_picker
-                                                .read(cx)
-                                                .picker
-                                                .read(cx)
-                                                .delegate
-                                                .match_count()
-                                                == 0,
+                                h_flex()
+                                    .child(div().child(self.adapter_drop_down_menu(window, cx)))
+                                    .child(
+                                        Button::new("debugger-spawn", "Start")
+                                            .on_click(cx.listener(|this, _, window, cx| {
+                                                this.start_new_session(window, cx)
+                                            }))
+                                            .disabled(disabled),
                                    ),
-                            ),
-                    ),
+                            )
+                    }),
                    NewProcessMode::Debug => el,
                    NewProcessMode::Task => el,
                }
@@ -1045,25 +939,6 @@ impl ConfigureMode {
                )
                .checkbox_position(ui::IconPosition::End),
            )
-            .child(
-                CheckboxWithLabel::new(
-                    "debugger-save-to-debug-json",
-                    Label::new("Save to debug.json")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                    self.save_to_debug_json,
-                    {
-                        let this = cx.weak_entity();
-                        move |state, _, cx| {
-                            this.update(cx, |this, _| {
-                                this.save_to_debug_json = *state;
-                            })
-                            .ok();
-                        }
-                    },
-                )
-                .checkbox_position(ui::IconPosition::End),
-            )
    }
 }

@@ -1110,7 +985,11 @@ pub(super) struct TaskMode {

 pub(super) struct DebugDelegate {
    task_store: Entity<TaskStore>,
-    candidates: Vec<(Option<TaskSourceKind>, DebugScenario)>,
+    candidates: Vec<(
+        Option<TaskSourceKind>,
+        DebugScenario,
+        Option<DebugScenarioContext>,
+    )>,
    selected_index: usize,
    matches: Vec<StringMatch>,
    prompt: String,
@@ -1208,7 +1087,11 @@ impl DebugDelegate {

                this.delegate.candidates = recent
                    .into_iter()
-                    .map(|scenario| Self::get_scenario_kind(&languages, &dap_registry, scenario))
+                    .map(|(scenario, context)| {
+                        let (kind, scenario) =
+                            Self::get_scenario_kind(&languages, &dap_registry, scenario);
+                        (kind, scenario, Some(context))
+                    })
                    .chain(
                        scenarios
                            .into_iter()
@@ -1223,7 +1106,7 @@ impl DebugDelegate {
                            .map(|(kind, scenario)| {
                                let (language, scenario) =
                                    Self::get_scenario_kind(&languages, &dap_registry, scenario);
-                                (language.or(Some(kind)), scenario)
+                                (language.or(Some(kind)), scenario, None)
                            }),
                    )
                    .collect();
@@ -1269,7 +1152,7 @@ impl PickerDelegate for DebugDelegate {
            let candidates: Vec<_> = candidates
                .into_iter()
                .enumerate()
-                .map(|(index, (_, candidate))| {
+                .map(|(index, (_, candidate, _))| {
                    StringMatchCandidate::new(index, candidate.label.as_ref())
                })
                .collect();
@@ -1318,12 +1201,7 @@ impl PickerDelegate for DebugDelegate {
        }
    }

-    fn confirm_input(
-        &mut self,
-        _secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
+    fn confirm_input(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
        let text = self.prompt.clone();
        let (task_context, worktree_id) = self
            .task_contexts
@@ -1353,7 +1231,7 @@ impl PickerDelegate for DebugDelegate {

        let args = args.collect::<Vec<_>>();
        let task = task::TaskTemplate {
-            label: "one-off".to_owned(),
+            label: "one-off".to_owned(), // TODO: rename using command as label
            env,
            command: program,
            args,
@@ -1394,7 +1272,11 @@ impl PickerDelegate for DebugDelegate {
                .background_spawn(async move {
                    for locator in locators {
                        if let Some(scenario) =
-                            locator.1.create_scenario(&task, "one-off", &adapter).await
+                            // TODO: use a more informative label than "one-off"
+                            locator
+                                .1
+                                .create_scenario(&task, &task.label, &adapter)
+                                .await
                        {
                            return Some(scenario);
                        }
@@ -1428,33 +1310,67 @@ impl PickerDelegate for DebugDelegate {
        .detach();
    }

-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<picker::Picker<Self>>) {
+    fn confirm(
+        &mut self,
+        secondary: bool,
+        window: &mut Window,
+        cx: &mut Context<picker::Picker<Self>>,
+    ) {
        let debug_scenario = self
            .matches
            .get(self.selected_index())
            .and_then(|match_candidate| self.candidates.get(match_candidate.candidate_id).cloned());

-        let Some((_, debug_scenario)) = debug_scenario else {
+        let Some((kind, debug_scenario, context)) = debug_scenario else {
            return;
        };

-        let (task_context, worktree_id) = self
-            .task_contexts
-            .as_ref()
-            .and_then(|task_contexts| {
-                Some((
-                    task_contexts.active_context().cloned()?,
-                    task_contexts.worktree(),
-                ))
-            })
-            .unwrap_or_default();
+        let context = context.unwrap_or_else(|| {
+            self.task_contexts
+                .as_ref()
+                .and_then(|task_contexts| {
+                    Some(DebugScenarioContext {
+                        task_context: task_contexts.active_context().cloned()?,
+                        active_buffer: None,
+                        worktree_id: task_contexts.worktree(),
+                    })
+                })
+                .unwrap_or_default()
+        });
+        let DebugScenarioContext {
+            task_context,
+            active_buffer: _,
+            worktree_id,
+        } = context;

-        send_telemetry(&debug_scenario, TelemetrySpawnLocation::ScenarioList, cx);
-        self.debug_panel
-            .update(cx, |panel, cx| {
-                panel.start_session(debug_scenario, task_context, None, worktree_id, window, cx);
+        if secondary {
+            let Some(kind) = kind else { return };
+            let Some(id) = worktree_id else { return };
+            let debug_panel = self.debug_panel.clone();
+            cx.spawn_in(window, async move |_, cx| {
+                debug_panel
+                    .update_in(cx, |debug_panel, window, cx| {
+                        debug_panel.go_to_scenario_definition(kind, debug_scenario, id, window, cx)
+                    })?
+                    .await?;
+                anyhow::Ok(())
            })
-            .ok();
+            .detach();
+        } else {
+            send_telemetry(&debug_scenario, TelemetrySpawnLocation::ScenarioList, cx);
+            self.debug_panel
+                .update(cx, |panel, cx| {
+                    panel.start_session(
+                        debug_scenario,
+                        task_context,
+                        None,
+                        worktree_id,
+                        window,
+                        cx,
+                    );
+                })
+                .ok();
+        }

        cx.emit(DismissEvent);
    }
@@ -1472,19 +1388,23 @@ impl PickerDelegate for DebugDelegate {
        let footer = h_flex()
            .w_full()
            .p_1p5()
-            .justify_end()
+            .justify_between()
            .border_t_1()
            .border_color(cx.theme().colors().border_variant)
-            // .child(
-            //     // TODO: add button to open selected task in debug.json
-            //     h_flex().into_any_element(),
-            // )
+            .children({
+                let action = menu::SecondaryConfirm.boxed_clone();
+                KeyBinding::for_action(&*action, window, cx).map(|keybind| {
+                    Button::new("edit-debug-task", "Edit in debug.json")
+                        .label_size(LabelSize::Small)
+                        .key_binding(keybind)
+                        .on_click(move |_, window, cx| {
+                            window.dispatch_action(action.boxed_clone(), cx)
+                        })
+                })
+            })
            .map(|this| {
                if (current_modifiers.alt || self.matches.is_empty()) && !self.prompt.is_empty() {
-                    let action = picker::ConfirmInput {
-                        secondary: current_modifiers.secondary(),
-                    }
-                    .boxed_clone();
+                    let action = picker::ConfirmInput { secondary: false }.boxed_clone();
                    this.children(KeyBinding::for_action(&*action, window, cx).map(|keybind| {
                        Button::new("launch-custom", "Launch Custom")
                            .key_binding(keybind)
@@ -1581,3 +1501,35 @@ pub(crate) fn resolve_path(path: &mut String) {
        );
    };
 }
+
+#[cfg(test)]
+impl NewProcessModal {
+    pub(crate) fn set_configure(
+        &mut self,
+        program: impl AsRef<str>,
+        cwd: impl AsRef<str>,
+        stop_on_entry: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.mode = NewProcessMode::Launch;
+        self.debugger = Some(dap::adapters::DebugAdapterName("fake-adapter".into()));
+
+        self.configure_mode.update(cx, |configure, cx| {
+            configure.program.update(cx, |editor, cx| {
+                editor.clear(window, cx);
+                editor.set_text(program.as_ref(), window, cx);
+            });
+
+            configure.cwd.update(cx, |editor, cx| {
+                editor.clear(window, cx);
+                editor.set_text(cwd.as_ref(), window, cx);
+            });
+
+            configure.stop_on_entry = match stop_on_entry {
+                true => ToggleState::Selected,
+                _ => ToggleState::Unselected,
+            }
+        })
+    }
+}
--- a/crates/debugger_ui/src/session.rs
+++ b/crates/debugger_ui/src/session.rs
@@ -12,6 +12,7 @@ use rpc::proto;
 use running::RunningState;
 use std::{cell::OnceCell, sync::OnceLock};
 use ui::{Indicator, Tooltip, prelude::*};
+use util::truncate_and_trailoff;
 use workspace::{
    CollaboratorId, FollowableItem, ViewId, Workspace,
    item::{self, Item},
@@ -126,7 +127,10 @@ impl DebugSession {
    }

    pub(crate) fn label_element(&self, depth: usize, cx: &App) -> AnyElement {
+        const MAX_LABEL_CHARS: usize = 150;
+
        let label = self.label(cx);
+        let label = truncate_and_trailoff(&label, MAX_LABEL_CHARS);

        let is_terminated = self
            .running_state
--- a/Show More
+++ b/Show More