Wire through IPC mechanism for GIT_ASKPASS

co-authored-by: julia@zed.dev
Rust 1.85 (#25272 )
2025-02-28 20:56:11 -08:00 · 2025-02-28 18:33:35 +01:00 · 2025-02-28 17:04:20 +00:00 · 2025-02-28 11:33:08 -05:00 · 2025-02-28 12:06:47 -03:00 · 2025-02-28 14:01:10 +00:00
327 changed files with 6790 additions and 28000 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,13 +110,13 @@ jobs:
        run: ./script/clippy

      - name: Install cargo-machete
-        uses: clechasseur/rs-cargo@v2
+        uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
        with:
          command: install
          args: cargo-machete@0.7.0

      - name: Check unused dependencies
-        uses: clechasseur/rs-cargo@v2
+        uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
        with:
          command: machete

@@ -240,7 +240,7 @@ jobs:
    timeout-minutes: 60
    name: (Windows) Run Clippy and tests
    if: github.repository_owner == 'zed-industries'
-    runs-on: hosted-windows-1
+    runs-on: hosted-windows-2
    steps:
      # more info here:- https://github.com/rust-lang/cargo/issues/13020
      - name: Enable longer pathnames for git
@@ -273,8 +273,7 @@ jobs:

      - name: cargo clippy
        working-directory: ${{ env.ZED_WORKSPACE }}
-        # Windows can't run shell scripts, so we need to use `cargo xtask`.
-        run: cargo xtask clippy
+        run: ./script/clippy.ps1

      - name: Run tests
        uses: ./.github/actions/run_tests_windows
@@ -359,14 +358,14 @@ jobs:
          mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg

      - name: Upload app bundle (aarch64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
          path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg

      - name: Upload app bundle (x86_64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
@@ -417,7 +416,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
@@ -465,7 +464,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -65,7 +65,7 @@ jobs:
          command: deploy .cloudflare/docs-proxy/src/worker.js

      - name: Preserve Wrangler logs
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
        if: always()
        with:
          name: wrangler_logs
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,8 @@ Andrei Zvonimir Crnković <andrei@0x7f.dev>
 Andrei Zvonimir Crnković <andrei@0x7f.dev> <andreicek@0x7f.dev>
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
+Ben Kunkle <ben@zed.dev>
+Ben Kunkle <ben@zed.dev> <ben.kunkle@gmail.com>
 Bennet Bo Fenner <bennet@zed.dev>
 Bennet Bo Fenner <bennet@zed.dev> <53836821+bennetbo@users.noreply.github.com>
 Bennet Bo Fenner <bennet@zed.dev> <bennetbo@gmx.de>
@@ -112,6 +114,8 @@ Sebastijan Kelnerič <sebastijan.kelneric@sebba.dev> <sebastijan.kelneric@vichav
 Sergey Onufrienko <sergey@onufrienko.com>
 Shish <webmaster@shishnet.org>
 Shish <webmaster@shishnet.org> <shish@shishnet.org>
+Smit Barmase <0xtimsb@gmail.com>
+Smit Barmase <0xtimsb@gmail.com> <smit@zed.dev>
 Thorben Kröger <dev@thorben.net>
 Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
 Thorsten Ball <thorsten@zed.dev>
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -1,19 +0,0 @@
-[
-  {
-    "label": "Debug Zed with LLDB",
-    "adapter": "lldb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug Zed with GDB",
-    "adapter": "gdb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "stopAtBeginningOfMainSubprogram": true
-    }
-  }
-]
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -14,12 +14,12 @@
    },
    "JSON": {
      "tab_size": 2,
-      "preferred_line_length": 100,
+      "preferred_line_length": 120,
      "formatter": "prettier"
    },
    "JSONC": {
      "tab_size": 2,
-      "preferred_line_length": 100,
+      "preferred_line_length": 120,
      "formatter": "prettier"
    },
    "JavaScript": {
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,6 +13,7 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "language",
+ "lsp",
 "project",
 "smallvec",
 "ui",
@@ -489,6 +490,7 @@ dependencies = [
 "ui",
 "util",
 "uuid",
+ "vim_mode_setting",
 "workspace",
 "zed_actions",
 ]
@@ -1174,9 +1176,9 @@ dependencies = [

 [[package]]
 name = "aws-config"
-version = "1.5.16"
+version = "1.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50236e4d60fe8458de90a71c0922c761e41755adf091b1b03de1cef537179915"
+checksum = "490aa7465ee685b2ced076bb87ef654a47724a7844e2c7d3af4e749ce5b875dd"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1267,9 +1269,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-bedrockruntime"
-version = "1.74.0"
+version = "1.75.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6938541d1948a543bca23303fec4cff9c36bf0e63b8fa3ae1b337bcb9d5b81af"
+checksum = "2ddf7475b6f50a1a5be8edb1bcdf6e4ae00feed5b890d14a3f1f0e14d76f5a16"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1291,9 +1293,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-kinesis"
-version = "1.61.0"
+version = "1.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89f2163d8704e8fdcd51ec6c2e0441c418471e422ee9690451b17a1c46344e1a"
+checksum = "e31622345afd0c35d33c1cbba73ccf9fb88e09857413d8963dea2c493e00704d"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1313,9 +1315,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-s3"
-version = "1.76.0"
+version = "1.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e83401ad7287ad15244d557e35502c2a94105ca5b41d656c391f1a4fc04ca2"
+checksum = "34e87342432a3de0e94e82c99a7cbd9042f99de029ae1f4e368160f9e9929264"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1347,9 +1349,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-sso"
-version = "1.58.0"
+version = "1.60.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ff718c9ee45cc1ebd4774a0e086bb80a6ab752b4902edf1c9f56b86ee1f770"
+checksum = "60186fab60b24376d3e33b9ff0a43485f99efd470e3b75a9160c849741d63d56"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1369,9 +1371,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.59.0"
+version = "1.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5183e088715cc135d8d396fdd3bc02f018f0da4c511f53cb8d795b6a31c55809"
+checksum = "7033130ce1ee13e6018905b7b976c915963755aef299c1521897679d6cd4f8ef"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1391,9 +1393,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-sts"
-version = "1.59.0"
+version = "1.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9f944ef032717596639cea4a2118a3a457268ef51bbb5fde9637e54c465da00"
+checksum = "c5c1cac7677179d622b4448b0d31bcb359185295dc6fca891920cfb17e2b5156"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1454,9 +1456,9 @@ dependencies = [

 [[package]]
 name = "aws-smithy-checksums"
-version = "0.62.0"
+version = "0.63.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f45a1c384d7a393026bc5f5c177105aa9fa68e4749653b985707ac27d77295"
+checksum = "db2dc8d842d872529355c72632de49ef8c5a2949a4472f10e802f28cf925770c"
 dependencies = [
 "aws-smithy-http",
 "aws-smithy-types",
@@ -1806,7 +1808,7 @@ dependencies = [
 "bitflags 2.8.0",
 "cexpr",
 "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "lazy_static",
 "lazycell",
 "log",
@@ -1829,7 +1831,7 @@ dependencies = [
 "bitflags 2.8.0",
 "cexpr",
 "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "prettyplease",
 "proc-macro2",
@@ -2399,25 +2401,6 @@ dependencies = [
 "cipher",
 ]

-[[package]]
-name = "cbindgen"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
-dependencies = [
- "clap",
- "heck 0.4.1",
- "indexmap",
- "log",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn 2.0.90",
- "tempfile",
- "toml 0.8.20",
-]
-
 [[package]]
 name = "cbindgen"
 version = "0.28.0"
@@ -2515,9 +2498,9 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -2525,7 +2508,7 @@ dependencies = [
 "num-traits",
 "serde",
 "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]

 [[package]]
@@ -2585,9 +2568,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -2595,9 +2578,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.30"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
 "anstream",
 "anstyle",
@@ -2652,6 +2635,7 @@ dependencies = [
 "serde",
 "tempfile",
 "util",
+ "windows 0.58.0",
 ]

 [[package]]
@@ -2819,12 +2803,9 @@ dependencies = [
 "clock",
 "collab_ui",
 "collections",
- "command_palette_hooks",
 "context_server",
 "ctor",
- "dap",
 "dashmap 6.1.0",
- "debugger_ui",
 "derive_more",
 "editor",
 "env_logger 0.11.6",
@@ -2835,6 +2816,7 @@ dependencies = [
 "futures 0.3.31",
 "git",
 "git_hosting_providers",
+ "git_ui",
 "google_ai",
 "gpui",
 "hex",
@@ -3021,7 +3003,6 @@ dependencies = [
 "collections",
 "gpui",
 "linkme",
- "once_cell",
 "parking_lot",
 "theme",
 ]
@@ -3102,6 +3083,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "assistant_tool",
+ "async-trait",
 "collections",
 "command_palette_hooks",
 "context_server_settings",
@@ -3142,9 +3124,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"

 [[package]]
 name = "convert_case"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
 dependencies = [
 "unicode-segmentation",
 ]
@@ -3523,11 +3505,10 @@ dependencies = [

 [[package]]
 name = "crc64fast-nvme"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5e2ee08013e3f228d6d2394116c4549a6df77708442c62d887d83f68ef2ee37"
+checksum = "4955638f00a809894c947f85a024020a20815b65a5eea633798ea7924edab2b3"
 dependencies = [
- "cbindgen 0.27.0",
 "crc",
 ]

@@ -3664,18 +3645,19 @@ dependencies = [

 [[package]]
 name = "ctor"
-version = "0.3.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d960ecacd0a1bf55e73144b72de745e7bf275c7952c50e36e8af0a0cb7ab1f"
+checksum = "a7747ac3a66a06f4ee6718686c8ea976d2d05fb30ada93ebd76b3f9aef97257c"
 dependencies = [
 "ctor-proc-macro",
+ "dtor",
 ]

 [[package]]
 name = "ctor-proc-macro"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c426d2ba3e525b39c1f0a9ba41b9fe61878dee11fa4e4a76b6ab440f46c5db5d"
+checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d"

 [[package]]
 name = "ctrlc"
@@ -3752,67 +3734,6 @@ dependencies = [
 "syn 2.0.90",
 ]

-[[package]]
-name = "dap"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-pipe",
- "async-tar",
- "async-trait",
- "client",
- "collections",
- "dap-types",
- "env_logger 0.11.6",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "log",
- "node_runtime",
- "parking_lot",
- "paths",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "sysinfo",
- "task",
- "util",
-]
-
-[[package]]
-name = "dap-types"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=bf5632dc19f806e8a435c9f04a4bfe7322badea2#bf5632dc19f806e8a435c9f04a4bfe7322badea2"
-dependencies = [
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "dap_adapters"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "dap",
- "gpui",
- "language",
- "paths",
- "regex",
- "serde",
- "serde_json",
- "sysinfo",
- "task",
- "util",
-]
-
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -3886,59 +3807,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "debugger_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dap",
- "editor",
- "futures 0.3.31",
- "gpui",
- "project",
- "serde_json",
- "settings",
- "smol",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "debugger_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "command_palette_hooks",
- "dap",
- "editor",
- "env_logger 0.11.6",
- "feature_flags",
- "fuzzy",
- "gpui",
- "language",
- "log",
- "menu",
- "picker",
- "pretty_assertions",
- "project",
- "rpc",
- "serde",
- "serde_json",
- "settings",
- "sum_tree",
- "sysinfo",
- "task",
- "tasks_ui",
- "terminal_view",
- "theme",
- "ui",
- "unindent",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "deepseek"
 version = "0.1.0"
@@ -4165,6 +4033,21 @@ dependencies = [
 "phf",
 ]

+[[package]]
+name = "dtor"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf39a0bfd1f94d62ffdb2802a7e6244c0f34f6ebacf5d4c26547d08cd1d67a5"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+
 [[package]]
 name = "dunce"
 version = "1.0.5"
@@ -4219,7 +4102,7 @@ dependencies = [
 "client",
 "clock",
 "collections",
- "convert_case 0.7.1",
+ "convert_case 0.8.0",
 "ctor",
 "db",
 "emojis",
@@ -4239,7 +4122,6 @@ dependencies = [
 "log",
 "lsp",
 "markdown",
- "menu",
 "multi_buffer",
 "ordered-float 2.10.1",
 "parking_lot",
@@ -5468,6 +5350,7 @@ dependencies = [
 "serde_json",
 "smol",
 "sum_tree",
+ "tempfile",
 "text",
 "time",
 "unindent",
@@ -5537,6 +5420,7 @@ dependencies = [
 "theme",
 "time",
 "ui",
+ "unindent",
 "util",
 "windows 0.58.0",
 "workspace",
@@ -5671,7 +5555,7 @@ dependencies = [
 "bytemuck",
 "calloop",
 "calloop-wayland-source",
- "cbindgen 0.28.0",
+ "cbindgen",
 "cocoa 0.26.0",
 "collections",
 "core-foundation 0.9.4",
@@ -7344,9 +7228,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"

 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"

 [[package]]
 name = "libdbus-sys"
@@ -7690,9 +7574,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 dependencies = [
 "serde",
 "value-bag",
@@ -8063,7 +7947,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "convert_case 0.7.1",
+ "convert_case 0.8.0",
 "log",
 "pretty_assertions",
 "streaming-iterator",
@@ -9873,6 +9757,15 @@ dependencies = [
 "indexmap",
 ]

+[[package]]
+name = "pgvector"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0e8871b6d7ca78348c6cd29b911b94851f3429f0cd403130ca17f26c1fb91a6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -10295,8 +10188,6 @@ dependencies = [
 "client",
 "clock",
 "collections",
- "dap",
- "dap_adapters",
 "env_logger 0.11.6",
 "fancy-regex 0.14.0",
 "fs",
@@ -10308,7 +10199,6 @@ dependencies = [
 "gpui",
 "http_client",
 "image",
- "indexmap",
 "itertools 0.14.0",
 "language",
 "log",
@@ -10500,7 +10390,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
 "bytes 1.10.0",
 "heck 0.5.0",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "log",
 "multimap 0.10.0",
 "once_cell",
@@ -10533,7 +10423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
 "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
 "proc-macro2",
 "quote",
 "syn 2.0.90",
@@ -10957,7 +10847,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "auto_update",
- "dap",
 "editor",
 "extension_host",
 "file_finder",
@@ -11562,9 +11451,9 @@ dependencies = [

 [[package]]
 name = "rust-embed"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
+checksum = "0b3aba5104622db5c9fc61098de54708feb732e7763d7faa2fa625899f00bf6f"
 dependencies = [
 "rust-embed-impl",
 "rust-embed-utils",
@@ -11573,9 +11462,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-impl"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
+checksum = "1f198c73be048d2c5aa8e12f7960ad08443e56fd39cc26336719fdb4ea0ebaae"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -11586,9 +11475,9 @@ dependencies = [

 [[package]]
 name = "rust-embed-utils"
-version = "8.5.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
+checksum = "5a2fcdc9f40c8dc2922842ca9add611ad19f332227fc651d015881ad1552bd9a"
 dependencies = [
 "globset",
 "sha2",
@@ -11863,9 +11752,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
 "dyn-clone",
 "indexmap",
@@ -11876,9 +11765,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -11941,17 +11830,18 @@ dependencies = [

 [[package]]
 name = "sea-orm"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00733e5418e8ae3758cdb988c3654174e716230cc53ee2cb884207cf86a23029"
+checksum = "13fba7b2c749b2d0a00303d5cb13e6761e39a4172554bdf930852cac4e7aeabd"
 dependencies = [
 "async-stream",
 "async-trait",
 "bigdecimal",
 "chrono",
- "futures 0.3.31",
+ "futures-util",
 "log",
 "ouroboros",
+ "pgvector",
 "rust_decimal",
 "sea-orm-macros",
 "sea-query",
@@ -11969,9 +11859,9 @@ dependencies = [

 [[package]]
 name = "sea-orm-macros"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a98408f82fb4875d41ef469a79944a7da29767c7b3e4028e22188a3dd613b10f"
+checksum = "2568cff8d35d5150b4276cc0dd766192a587f64b6ece60ae3706e0872c4eb209"
 dependencies = [
 "heck 0.4.1",
 "proc-macro2",
@@ -12164,18 +12054,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -13477,7 +13367,6 @@ dependencies = [
 "parking_lot",
 "schemars",
 "serde",
- "serde_json",
 "serde_json_lenient",
 "sha2",
 "shellexpand 2.1.2",
@@ -14689,7 +14578,7 @@ dependencies = [
 name = "ui_macros"
 version = "0.1.0"
 dependencies = [
- "convert_case 0.7.1",
+ "convert_case 0.8.0",
 "linkme",
 "proc-macro2",
 "quote",
@@ -14892,9 +14781,9 @@ dependencies = [

 [[package]]
 name = "uuid"
-version = "1.13.2"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f41ffb7cf259f1ecc2876861a17e7142e63ead296f671f81f6ae85903e0d6"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
 dependencies = [
 "getrandom 0.3.1",
 "serde",
@@ -16017,6 +15906,12 @@ dependencies = [
 "syn 2.0.90",
 ]

+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -16852,7 +16747,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.176.0"
+version = "0.177.0"
 dependencies = [
 "activity_indicator",
 "anyhow",
@@ -16882,8 +16777,6 @@ dependencies = [
 "component_preview",
 "copilot",
 "db",
- "debugger_tools",
- "debugger_ui",
 "diagnostics",
 "editor",
 "env_logger 0.11.6",
@@ -16958,6 +16851,7 @@ dependencies = [
 "tasks_ui",
 "telemetry",
 "telemetry_events",
+ "tempfile",
 "terminal_view",
 "theme",
 "theme_extension",
@@ -16974,6 +16868,7 @@ dependencies = [
 "vim",
 "vim_mode_setting",
 "welcome",
+ "which 6.0.3",
 "windows 0.58.0",
 "winresource",
 "workspace",
@@ -17072,7 +16967,7 @@ dependencies = [

 [[package]]
 name = "zed_html"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
 "zed_extension_api 0.1.0",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,10 +35,6 @@ members = [
    "crates/context_server_settings",
    "crates/copilot",
    "crates/credentials_provider",
-    "crates/dap",
-    "crates/dap_adapters",
-    "crates/debugger_tools",
-    "crates/debugger_ui",
    "crates/db",
    "crates/deepseek",
    "crates/diagnostics",
@@ -243,11 +239,7 @@ context_server = { path = "crates/context_server" }
 context_server_settings = { path = "crates/context_server_settings" }
 copilot = { path = "crates/copilot" }
 credentials_provider = { path = "crates/credentials_provider" }
-dap = { path = "crates/dap" }
-dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
-debugger_ui = { path = "crates/debugger_ui" }
-debugger_tools = { path = "crates/debugger_tools" }
 deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
 buffer_diff = { path = "crates/buffer_diff" }
@@ -378,7 +370,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e"}
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -413,10 +405,10 @@ chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
 cocoa = "0.26"
 cocoa-foundation = "0.2.0"
-convert_case = "0.7.0"
+convert_case = "0.8.0"
 core-foundation = "0.9.3"
 core-foundation-sys = "0.8.6"
-ctor = "0.3.0"
+ctor = "0.4.0"
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
@@ -463,7 +455,6 @@ nanoid = "0.4"
 nbformat = { version = "0.10.0" }
 nix = "0.29"
 num-format = "0.4.4"
-once_cell = "1.20"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
@@ -552,7 +543,7 @@ tree-sitter-cpp = "0.23"
 tree-sitter-css = "0.23"
 tree-sitter-elixir = "0.3"
 tree-sitter-embedded-template = "0.23.0"
-tree-sitter-gitcommit = {git  = "https://github.com/zed-industries/tree-sitter-git-commit", rev = "88309716a69dd13ab83443721ba6e0b491d37ee9"}
+tree-sitter-gitcommit = { git = "https://github.com/zed-industries/tree-sitter-git-commit", rev = "88309716a69dd13ab83443721ba6e0b491d37ee9" }
 tree-sitter-go = "0.23"
 tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c", package = "tree-sitter-gomod" }
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
@@ -627,6 +618,7 @@ features = [
    "Win32_Storage_FileSystem",
    "Win32_System_Com",
    "Win32_System_Com_StructuredStorage",
+    "Win32_System_Console",
    "Win32_System_DataExchange",
    "Win32_System_LibraryLoader",
    "Win32_System_Memory",
@@ -647,7 +639,7 @@ features = [
 # TODO livekit https://github.com/RustAudio/cpal/pull/891
 [patch.crates-io]
 cpal = { git = "https://github.com/zed-industries/cpal", rev = "fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50" }
-real-async-tls = { git = "https://github.com/zed-industries/async-tls", rev = "1e759a4b5e370f87dc15e40756ac4f8815b61d9d", package = "async-tls"}
+real-async-tls = { git = "https://github.com/zed-industries/async-tls", rev = "1e759a4b5e370f87dc15e40756ac4f8815b61d9d", package = "async-tls" }

 [profile.dev]
 split-debuginfo = "unpacked"
@@ -717,6 +709,9 @@ debug = "full"
 lto = false
 codegen-units = 16

+[workspace.lints.rust]
+unexpected_cfgs = { level = "allow" }
+
 [workspace.lints.clippy]
 dbg_macro = "deny"
 todo = "deny"
--- a/assets/icons/debug.svg
+++ b/assets/icons/debug.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>
--- a/assets/icons/debug_breakpoint.svg
+++ b/assets/icons/debug_breakpoint.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle"><circle cx="12" cy="12" r="10"/></svg>
--- a/assets/icons/debug_continue.svg
+++ b/assets/icons/debug_continue.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-step-forward"><line x1="6" x2="6" y1="4" y2="20"/><polygon points="10,4 20,12 10,20"/></svg>
--- a/assets/icons/debug_disconnect.svg
+++ b/assets/icons/debug_disconnect.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-unplug"><path d="m19 5 3-3"/><path d="m2 22 3-3"/><path d="M6.3 20.3a2.4 2.4 0 0 0 3.4 0L12 18l-6-6-2.3 2.3a2.4 2.4 0 0 0 0 3.4Z"/><path d="M7.5 13.5 10 11"/><path d="M10.5 16.5 13 14"/><path d="m12 6 6 6 2.3-2.3a2.4 2.4 0 0 0 0-3.4l-2.6-2.6a2.4 2.4 0 0 0-3.4 0Z"/></svg>
--- a/assets/icons/debug_ignore_breakpoints.svg
+++ b/assets/icons/debug_ignore_breakpoints.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-off"><path d="m2 2 20 20"/><path d="M8.35 2.69A10 10 0 0 1 21.3 15.65"/><path d="M19.08 19.08A10 10 0 1 1 4.92 4.92"/></svg>
--- a/assets/icons/debug_log_breakpoint.svg
+++ b/assets/icons/debug_log_breakpoint.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle"><path d="M7.9 20A9 9 0 1 0 4 16.1L2 22Z"/></svg>
--- a/assets/icons/debug_pause.svg
+++ b/assets/icons/debug_pause.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-pause"><rect x="14" y="4" width="4" height="16" rx="1"/><rect x="6" y="4" width="4" height="16" rx="1"/></svg>
--- a/assets/icons/debug_restart.svg
+++ b/assets/icons/debug_restart.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-rotate-ccw"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
--- a/assets/icons/debug_step_back.svg
+++ b/assets/icons/debug_step_back.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-undo-dot"><path d="M21 17a9 9 0 0 0-15-6.7L3 13"/><path d="M3 7v6h6"/><circle cx="12" cy="17" r="1"/></svg>
--- a/assets/icons/debug_step_into.svg
+++ b/assets/icons/debug_step_into.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m5 15 7 7 7-7"/>
-  <path d="M12 8v14"/>
-  <circle cx="12" cy="3" r="1"/>
-</svg>
--- a/assets/icons/debug_step_out.svg
+++ b/assets/icons/debug_step_out.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m3 10 9-8 9 8"/>
-  <path d="M12 17V2"/>
-  <circle cx="12" cy="21" r="1"/>
-</svg>
--- a/assets/icons/debug_step_over.svg
+++ b/assets/icons/debug_step_over.svg
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-redo-dot">
-  <circle cx="12" cy="17" r="1"/>
-  <path d="M21 7v6h-6"/>
-  <path d="M3 17a9 9 0 0 1 9-9 9 9 0 0 1 6 2.3l3 2.7"/>
-</svg>
--- a/assets/icons/debug_stop.svg
+++ b/assets/icons/debug_stop.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square"><rect width="18" height="18" x="3" y="3" rx="2"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -84,7 +84,7 @@
      "pageup": "editor::MovePageUp",
      "alt-pageup": "editor::PageUp",
      "shift-pageup": "editor::SelectPageUp",
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "down": "editor::MoveDown",
      "pagedown": "editor::MovePageDown",
      "alt-pagedown": "editor::PageDown",
@@ -107,9 +107,9 @@
      "ctrl-a": "editor::SelectAll",
      "ctrl-l": "editor::SelectLine",
      "ctrl-shift-i": "editor::Format",
-      // "cmd-shift-left": ["editor::SelectToBeginningOfLine", {"stop_at_soft_wraps": true }],
-      // "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      // "cmd-shift-left": ["editor::SelectToBeginningOfLine", {"stop_at_soft_wraps": true, "stop_at_indent": true }],
+      // "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      // "cmd-shift-right": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      // "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
@@ -606,7 +606,7 @@
      "ctrl-n": "assistant2::NewThread",
      "new": "assistant2::NewThread",
      "ctrl-shift-h": "assistant2::OpenHistory",
-      "ctrl-alt-/": "assistant2::ToggleModelSelector",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-shift-a": "assistant2::ToggleContextPicker",
      "ctrl-e": "assistant2::ChatMode",
      "ctrl-alt-e": "assistant2::RemoveAllContext"
@@ -733,6 +733,12 @@
      "ctrl-enter": "git::Commit"
    }
  },
+  {
+    "context": "GitDiff > Editor",
+    "bindings": {
+      "ctrl-enter": "git::Commit"
+    }
+  },
  {
    "context": "GitPanel > Editor",
    "bindings": {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -91,9 +91,9 @@
      "ctrl-l": "editor::ScrollCursorCenter",
      "alt-left": "editor::MoveToPreviousWordStart",
      "alt-right": "editor::MoveToNextWordEnd",
-      "cmd-left": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      "cmd-left": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }],
+      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
@@ -118,9 +118,9 @@
      "cmd-a": "editor::SelectAll",
      "cmd-l": "editor::SelectLine",
      "cmd-shift-i": "editor::Format",
-      "cmd-shift-left": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      "cmd-shift-left": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "cmd-shift-right": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
@@ -238,7 +238,7 @@
      "cmd-n": "assistant2::NewThread",
      "cmd-alt-p": "assistant2::NewPromptEditor",
      "cmd-shift-h": "assistant2::OpenHistory",
-      "cmd-alt-/": "assistant2::ToggleModelSelector",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-shift-a": "assistant2::ToggleContextPicker",
      "cmd-e": "assistant2::ChatMode",
      "cmd-alt-e": "assistant2::RemoveAllContext"
@@ -658,7 +658,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "assistant2::ToggleContextPicker",
-      "cmd-alt-/": "assistant2::ToggleModelSelector",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-alt-e": "assistant2::RemoveAllContext",
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist"
@@ -724,14 +724,6 @@
      "space": "project_panel::Open"
    }
  },
-  {
-    "context": "VariableList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry"
-    }
-  },
  {
    "context": "GitPanel && ChangesList",
    "use_key_equivalents": true,
@@ -747,7 +739,15 @@
      "alt-down": "git_panel::FocusEditor",
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
-      "escape": "git_panel::ToggleFocus"
+      "escape": "git_panel::ToggleFocus",
+      "cmd-enter": "git::Commit"
+    }
+  },
+  {
+    "context": "GitDiff > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-enter": "git::Commit"
    }
  },
  {
@@ -839,6 +839,7 @@
      "cmd-k": "terminal::Clear",
      "cmd-n": "workspace::NewTerminal",
      "ctrl-enter": "assistant::InlineAssist",
+      "ctrl-_": null, // emacs undo
      // Some nice conveniences
      "cmd-backspace": ["terminal::SendText", "\u0015"],
      "cmd-right": ["terminal::SendText", "\u0005"],
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -28,6 +28,7 @@
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
+      "alt-m": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }], // back-to-indentation
      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
      "alt-u": "editor::ConvertToUpperCase", // upcase-word
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -28,6 +28,7 @@
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
+      "alt-m": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }], // back-to-indentation
      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
      "alt-u": "editor::ConvertToUpperCase", // upcase-word
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -176,8 +176,8 @@
  "show_completion_documentation": true,
  // Show method signatures in the editor, when inside parentheses.
  "auto_signature_help": false,
-  /// Whether to show the signature help after completion or a bracket pair inserted.
-  /// If `auto_signature_help` is enabled, this setting will be treated as enabled also.
+  // Whether to show the signature help after completion or a bracket pair inserted.
+  // If `auto_signature_help` is enabled, this setting will be treated as enabled also.
  "show_signature_help_after_edits": false,
  // Whether to show wrap guides (vertical rulers) in the editor.
  // Setting this to true will show a guide at the 'preferred_line_length' value
@@ -298,11 +298,11 @@
    //  - "information": show only errors, warnings, and information
    //  - "all" or true: show all diagnostics
    "diagnostics": "all",
-    /// Forcefully enable or disable the scrollbar for each axis
+    // Forcefully enable or disable the scrollbar for each axis
    "axes": {
-      /// When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
+      // When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
      "horizontal": true,
-      /// When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
+      // When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
      "vertical": true
    }
  },
@@ -328,24 +328,24 @@
    "folds": true
  },
  "indent_guides": {
-    /// Whether to show indent guides in the editor.
+    // Whether to show indent guides in the editor.
    "enabled": true,
-    /// The width of the indent guides in pixels, between 1 and 10.
+    // The width of the indent guides in pixels, between 1 and 10.
    "line_width": 1,
-    /// The width of the active indent guide in pixels, between 1 and 10.
+    // The width of the active indent guide in pixels, between 1 and 10.
    "active_line_width": 1,
-    /// Determines how indent guides are colored.
-    /// This setting can take the following three values:
+    // Determines how indent guides are colored.
+    // This setting can take the following three values:
    ///
-    /// 1. "disabled"
-    /// 2. "fixed"
-    /// 3. "indent_aware"
+    // 1. "disabled"
+    // 2. "fixed"
+    // 3. "indent_aware"
    "coloring": "fixed",
-    /// Determines how indent guide backgrounds are colored.
-    /// This setting can take the following two values:
+    // Determines how indent guide backgrounds are colored.
+    // This setting can take the following two values:
    ///
-    /// 1. "disabled"
-    /// 2. "indent_aware"
+    // 1. "disabled"
+    // 2. "indent_aware"
    "background_coloring": "disabled"
  },
  // Whether the editor will scroll beyond the last line.
@@ -379,6 +379,9 @@
  // 3. Never populate the search query
  //    "never"
  "seed_search_query_from_cursor": "always",
+  // When enabled, automatically adjusts search case sensitivity based on your query.
+  // If your search query contains any uppercase letters, the search becomes case-sensitive;
+  // if it contains only lowercase letters, the search becomes case-insensitive.
  "use_smartcase_search": false,
  // Inlay hint related settings
  "inlay_hints": {
@@ -398,7 +401,16 @@
    "edit_debounce_ms": 700,
    // Time to wait after scrolling the buffer, before requesting the hints,
    // set to 0 to disable debouncing.
-    "scroll_debounce_ms": 50
+    "scroll_debounce_ms": 50,
+    /// A set of modifiers which, when pressed, will toggle the visibility of inlay hints.
+    /// If the set if empty or not all the modifiers specified are pressed, inlay hints will not be toggled.
+    "toggle_on_modifiers_press": {
+      "control": false,
+      "shift": false,
+      "alt": false,
+      "platform": false,
+      "function": false
+    }
  },
  "project_panel": {
    // Whether to show the project panel button in the status bar
@@ -424,32 +436,32 @@
    // Whether to fold directories automatically and show compact folders
    // (e.g. "a/b/c" ) when a directory has only one subdirectory inside.
    "auto_fold_dirs": true,
-    /// Scrollbar-related settings
+    // Scrollbar-related settings
    "scrollbar": {
-      /// When to show the scrollbar in the project panel.
-      /// This setting can take five values:
+      // When to show the scrollbar in the project panel.
+      // This setting can take five values:
      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
+      // 1. null (default): Inherit editor settings
+      // 2. Show the scrollbar if there's important information or
+      //    follow the system's configured behavior (default):
+      //   "auto"
+      // 3. Match the system's configured behavior:
+      //    "system"
+      // 4. Always show the scrollbar:
+      //    "always"
+      // 5. Never show the scrollbar:
+      //    "never"
      "show": null
    },
-    /// Which files containing diagnostic errors/warnings to mark in the project panel.
-    /// This setting can take the following three values:
+    // Which files containing diagnostic errors/warnings to mark in the project panel.
+    // This setting can take the following three values:
    ///
-    /// 1. Do not mark any files:
-    ///    "off"
-    /// 2. Only mark files with errors:
-    ///    "errors"
-    /// 3. Mark files with errors and warnings:
-    ///    "all"
+    // 1. Do not mark any files:
+    //    "off"
+    // 2. Only mark files with errors:
+    //    "errors"
+    // 3. Mark files with errors and warnings:
+    //    "all"
    "show_diagnostics": "all",
    // Settings related to indent guides in the project panel.
    "indent_guides": {
@@ -482,8 +494,8 @@
    // when a corresponding outline entry becomes active.
    // Gitignored entries are never auto revealed.
    "auto_reveal_entries": true,
-    /// Whether to fold directories automatically
-    /// when a directory has only one directory inside.
+    // Whether to fold directories automatically
+    // when a directory has only one directory inside.
    "auto_fold_dirs": true,
    // Settings related to indent guides in the outline panel.
    "indent_guides": {
@@ -496,21 +508,21 @@
      //    "never"
      "show": "always"
    },
-    /// Scrollbar-related settings
+    // Scrollbar-related settings
    "scrollbar": {
-      /// When to show the scrollbar in the project panel.
-      /// This setting can take five values:
+      // When to show the scrollbar in the project panel.
+      // This setting can take five values:
      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
+      // 1. null (default): Inherit editor settings
+      // 2. Show the scrollbar if there's important information or
+      //    follow the system's configured behavior (default):
+      //   "auto"
+      // 3. Match the system's configured behavior:
+      //    "system"
+      // 4. Always show the scrollbar:
+      //    "always"
+      // 5. Never show the scrollbar:
+      //    "never"
      "show": null
    }
  },
@@ -628,7 +640,7 @@
    "show": true,
    // Whether or not to show the navigation history buttons.
    "show_nav_history_buttons": true,
-    /// Whether or not to show the tab bar buttons.
+    // Whether or not to show the tab bar buttons.
    "show_tab_bar_buttons": true
  },
  // Settings related to the editor's tabs
@@ -650,16 +662,16 @@
    // 3. Activate the left neighbour tab if present
    //     "left_neighbour"
    "activate_on_close": "history",
-    /// Which files containing diagnostic errors/warnings to mark in the tabs.
-    /// Diagnostics are only shown when file icons are also active.
-    /// This setting only works when can take the following three values:
+    // Which files containing diagnostic errors/warnings to mark in the tabs.
+    // Diagnostics are only shown when file icons are also active.
+    // This setting only works when can take the following three values:
    ///
-    /// 1. Do not mark any files:
-    ///    "off"
-    /// 2. Only mark files with errors:
-    ///    "errors"
-    /// 3. Mark files with errors and warnings:
-    ///    "all"
+    // 1. Do not mark any files:
+    //    "off"
+    // 2. Only mark files with errors:
+    //    "errors"
+    // 3. Mark files with errors and warnings:
+    //    "all"
    "show_diagnostics": "off"
  },
  // Settings related to preview tabs.
@@ -829,6 +841,8 @@
    // A list of globs representing files that edit predictions should be disabled for.
    // There's a sensible default list of globs already included.
    // Any addition to this list will be merged with the default list.
+    // Globs are matched relative to the worktree root,
+    // except when starting with a slash (/) or equivalent in Windows.
    "disabled_globs": [
      "**/.env*",
      "**/*.pem",
@@ -840,11 +854,14 @@
    ],
    // When to show edit predictions previews in buffer.
    // This setting takes two possible values:
-    // 1. Display inline when there are no language server completions available.
-    //     "mode": "eager_preview"
-    // 2. Display inline when holding modifier key (alt by default).
-    //     "mode": "auto"
-    "mode": "eager_preview"
+    // 1. Display predictions inline when there are no language server completions available.
+    //     "mode": "eager"
+    // 2. Display predictions inline only when holding a modifier key (alt by default).
+    //     "mode": "subtle"
+    "mode": "eager",
+    // Whether edit predictions are enabled in the assistant panel.
+    // This setting has no effect if globally disabled.
+    "enabled_in_assistant": true
  },
  // Settings specific to journaling
  "journal": {
@@ -980,21 +997,21 @@
      // Example: `echo -e "\e]2;New Title\007";`
      "breadcrumbs": true
    },
-    /// Scrollbar-related settings
+    // Scrollbar-related settings
    "scrollbar": {
-      /// When to show the scrollbar in the terminal.
-      /// This setting can take five values:
+      // When to show the scrollbar in the terminal.
+      // This setting can take five values:
      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
+      // 1. null (default): Inherit editor settings
+      // 2. Show the scrollbar if there's important information or
+      //    follow the system's configured behavior (default):
+      //   "auto"
+      // 3. Match the system's configured behavior:
+      //    "system"
+      // 4. Always show the scrollbar:
+      //    "always"
+      // 5. Never show the scrollbar:
+      //    "never"
      "show": null
    }
    // Set the terminal's font size. If this option is not included,
@@ -1013,7 +1030,7 @@
    // "max_scroll_history_lines": 10000,
  },
  "code_actions_on_format": {},
-  /// Settings related to running tasks.
+  // Settings related to running tasks.
  "tasks": {
    "variables": {}
  },
@@ -1034,20 +1051,20 @@
    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
    "Shell Script": [".env.*"]
  },
-  /// By default use a recent system version of node, or install our own.
-  /// You can override this to use a version of node that is not in $PATH with:
-  /// {
-  ///   "node": {
-  ///     "path": "/path/to/node"
-  ///     "npm_path": "/path/to/npm" (defaults to node_path/../npm)
-  ///   }
-  /// }
-  /// or to ensure Zed always downloads and installs an isolated version of node:
-  /// {
-  ///   "node": {
-  ///     "ignore_system_version": true,
-  ///   }
-  /// NOTE: changing this setting currently requires restarting Zed.
+  // By default use a recent system version of node, or install our own.
+  // You can override this to use a version of node that is not in $PATH with:
+  // {
+  //   "node": {
+  //     "path": "/path/to/node"
+  //     "npm_path": "/path/to/npm" (defaults to node_path/../npm)
+  //   }
+  // }
+  // or to ensure Zed always downloads and installs an isolated version of node:
+  // {
+  //   "node": {
+  //     "ignore_system_version": true,
+  //   }
+  // NOTE: changing this setting currently requires restarting Zed.
  "node": {},
  // The extensions that Zed should automatically install on startup.
  //
@@ -1296,6 +1313,7 @@
  },
  // Vim settings
  "vim": {
+    "default_mode": "normal",
    "toggle_relative_line_numbers": false,
    "use_system_clipboard": "always",
    "use_multiline_find": false,
@@ -1376,12 +1394,6 @@
  //   }
  // ]
  "ssh_connections": [],
-
  // Configures context servers for use in the Assistant.
-  "context_servers": {},
-  "debugger": {
-    "stepping_granularity": "line",
-    "save_breakpoints": true,
-    "button": true
-  }
+  "context_servers": {}
 }
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -1,32 +0,0 @@
-[
-  {
-    "label": "Debug active PHP file",
-    "adapter": "php",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active Python file",
-    "adapter": "python",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active JavaScript file",
-    "adapter": "javascript",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "JavaScript debug terminal",
-    "adapter": "javascript",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "console": "integratedTerminal"
-    }
-  }
-]
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -20,6 +20,7 @@ extension_host.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
+lsp.workspace = true
 project.workspace = true
 smallvec.workspace = true
 ui.workspace = true
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -7,7 +7,8 @@ use gpui::{
    EventEmitter, InteractiveElement as _, ParentElement as _, Render, SharedString,
    StatefulInteractiveElement, Styled, Transformation, Window,
 };
-use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
+use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
+use lsp::LanguageServerName;
 use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
@@ -19,21 +20,21 @@ actions!(activity_indicator, [ShowErrorMessage]);

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

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

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

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

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

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

@@ -288,7 +278,7 @@ impl ActivityIndicator {
                ),
                message: format!(
                    "Downloading {}...",
-                    downloading.iter().map(|name| name.as_ref()).fold(
+                    downloading.iter().map(|name| name.0.as_ref()).fold(
                        String::new(),
                        |mut acc, s| {
                            if !acc.is_empty() {
@@ -316,7 +306,7 @@ impl ActivityIndicator {
                ),
                message: format!(
                    "Checking for updates to {}...",
-                    checking_for_update.iter().map(|name| name.as_ref()).fold(
+                    checking_for_update.iter().map(|name| name.0.as_ref()).fold(
                        String::new(),
                        |mut acc, s| {
                            if !acc.is_empty() {
@@ -346,7 +336,7 @@ impl ActivityIndicator {
                    "Failed to run {}. Click to show error.",
                    failed
                        .iter()
-                        .map(|name| name.as_ref())
+                        .map(|name| name.0.as_ref())
                        .fold(String::new(), |mut acc, s| {
                            if !acc.is_empty() {
                                acc.push_str(", ");
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -35,7 +35,7 @@ use language_model::{
    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelTextStream, Role,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_model_selector::{InlineLanguageModelSelector, LanguageModelSelector};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
@@ -1589,29 +1589,10 @@ impl Render for PromptEditor {
                    .w(gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0))
                    .justify_center()
                    .gap_2()
-                    .child(LanguageModelSelectorPopoverMenu::new(
-                        self.language_model_selector.clone(),
-                        IconButton::new("context", IconName::SettingsAlt)
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted),
-                        move |window, cx| {
-                            Tooltip::with_meta(
-                                format!(
-                                    "Using {}",
-                                    LanguageModelRegistry::read_global(cx)
-                                        .active_model()
-                                        .map(|model| model.name().0)
-                                        .unwrap_or_else(|| "No model selected".into()),
-                                ),
-                                None,
-                                "Change Model",
-                                window,
-                                cx,
-                            )
-                        },
-                        gpui::Corner::TopRight,
-                    ))
+                    .child(
+                        InlineLanguageModelSelector::new(self.language_model_selector.clone())
+                            .render(window, cx),
+                    )
                    .map(|el| {
                        let CodegenStatus::Error(error) = self.codegen.read(cx).status(cx) else {
                            return el;
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -19,7 +19,7 @@ use language_model::{
    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, Role,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_model_selector::{InlineLanguageModelSelector, LanguageModelSelector};
 use prompt_library::PromptBuilder;
 use settings::{update_settings_file, Settings};
 use std::{
@@ -506,7 +506,7 @@ struct PromptEditor {
 impl EventEmitter<PromptEditorEvent> for PromptEditor {}

 impl Render for PromptEditor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let status = &self.codegen.read(cx).status;
        let buttons = match status {
            CodegenStatus::Idle => {
@@ -641,29 +641,10 @@ impl Render for PromptEditor {
                    .w_12()
                    .justify_center()
                    .gap_2()
-                    .child(LanguageModelSelectorPopoverMenu::new(
-                        self.language_model_selector.clone(),
-                        IconButton::new("context", IconName::SettingsAlt)
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted),
-                        move |window, cx| {
-                            Tooltip::with_meta(
-                                format!(
-                                    "Using {}",
-                                    LanguageModelRegistry::read_global(cx)
-                                        .active_model()
-                                        .map(|model| model.name().0)
-                                        .unwrap_or_else(|| "No model selected".into()),
-                                ),
-                                None,
-                                "Change Model",
-                                window,
-                                cx,
-                            )
-                        },
-                        gpui::Corner::TopRight,
-                    ))
+                    .child(
+                        InlineLanguageModelSelector::new(self.language_model_selector.clone())
+                            .render(window, cx),
+                    )
                    .children(
                        if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
                            let error_message = SharedString::from(error.to_string());
@@ -1073,7 +1054,10 @@ pub enum CodegenEvent {

 impl EventEmitter<CodegenEvent> for Codegen {}

+#[cfg(not(target_os = "windows"))]
 const CLEAR_INPUT: &str = "\x15";
+#[cfg(target_os = "windows")]
+const CLEAR_INPUT: &str = "\x03";
 const CARRIAGE_RETURN: &str = "\x0d";

 struct TerminalTransaction {
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -73,6 +73,7 @@ time_format.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
+vim_mode_setting.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -8,15 +8,16 @@ use gpui::{
    UnderlineStyle, WeakEntity,
 };
 use language::LanguageRegistry;
-use language_model::Role;
+use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role};
 use markdown::{Markdown, MarkdownStyle};
 use settings::Settings as _;
 use theme::ThemeSettings;
-use ui::prelude::*;
+use ui::{prelude::*, Disclosure};
 use workspace::Workspace;

-use crate::thread::{MessageId, Thread, ThreadError, ThreadEvent};
+use crate::thread::{MessageId, RequestKind, Thread, ThreadError, ThreadEvent};
 use crate::thread_store::ThreadStore;
+use crate::tool_use::{ToolUse, ToolUseStatus};
 use crate::ui::ContextPill;

 pub struct ActiveThread {
@@ -28,6 +29,7 @@ pub struct ActiveThread {
    messages: Vec<MessageId>,
    list_state: ListState,
    rendered_messages_by_id: HashMap<MessageId, Entity<Markdown>>,
+    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
    last_error: Option<ThreadError>,
    _subscriptions: Vec<Subscription>,
 }
@@ -55,6 +57,7 @@ impl ActiveThread {
            thread: thread.clone(),
            messages: Vec::new(),
            rendered_messages_by_id: HashMap::default(),
+            expanded_tool_uses: HashMap::default(),
            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
                let this = cx.entity().downgrade();
                move |ix, _: &mut Window, cx: &mut App| {
@@ -251,17 +254,29 @@ impl ActiveThread {
                        let task = tool.run(tool_use.input, self.workspace.clone(), window, cx);

                        self.thread.update(cx, |thread, cx| {
-                            thread.insert_tool_output(
-                                tool_use.assistant_message_id,
-                                tool_use.id.clone(),
-                                task,
-                                cx,
-                            );
+                            thread.insert_tool_output(tool_use.id.clone(), task, cx);
+                        });
+                    }
+                }
+            }
+            ThreadEvent::ToolFinished { .. } => {
+                let all_tools_finished = self
+                    .thread
+                    .read(cx)
+                    .pending_tool_uses()
+                    .into_iter()
+                    .all(|tool_use| tool_use.status.is_error());
+                if all_tools_finished {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(model) = model_registry.active_model() {
+                        self.thread.update(cx, |thread, cx| {
+                            // Insert an empty user message to contain the tool results.
+                            thread.insert_user_message("", Vec::new(), cx);
+                            thread.send_to_model(model, RequestKind::Chat, true, cx);
                        });
                    }
                }
            }
-            ThreadEvent::ToolFinished { .. } => {}
        }
    }

@@ -276,8 +291,17 @@ impl ActiveThread {
        };

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

+        // Don't render user messages that are just there for returning tool results.
+        if message.role == Role::User
+            && message.text.is_empty()
+            && self.thread.read(cx).message_has_tool_results(message_id)
+        {
+            return Empty.into_any();
+        }
+
        let message_content = v_flex()
            .child(div().p_2p5().text_ui(cx).child(markdown.clone()))
            .when_some(context, |parent, context| {
@@ -332,7 +356,22 @@ impl ActiveThread {
                        )
                        .child(message_content),
                ),
-            Role::Assistant => div().id(("message-container", ix)).child(message_content),
+            Role::Assistant => div()
+                .id(("message-container", ix))
+                .child(message_content)
+                .map(|parent| {
+                    if tool_uses.is_empty() {
+                        return parent;
+                    }
+
+                    parent.child(
+                        v_flex().children(
+                            tool_uses
+                                .into_iter()
+                                .map(|tool_use| self.render_tool_use(tool_use, cx)),
+                        ),
+                    )
+                }),
            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
                v_flex()
                    .bg(colors.editor_background)
@@ -343,6 +382,102 @@ impl ActiveThread {

        styled_message.into_any()
    }
+
+    fn render_tool_use(&self, tool_use: ToolUse, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_open = self
+            .expanded_tool_uses
+            .get(&tool_use.id)
+            .copied()
+            .unwrap_or_default();
+
+        div().px_2p5().child(
+            v_flex()
+                .gap_1()
+                .rounded_lg()
+                .border_1()
+                .border_color(cx.theme().colors().border)
+                .child(
+                    h_flex()
+                        .justify_between()
+                        .py_0p5()
+                        .pl_1()
+                        .pr_2()
+                        .bg(cx.theme().colors().editor_foreground.opacity(0.02))
+                        .when(is_open, |element| element.border_b_1().rounded_t(px(6.)))
+                        .when(!is_open, |element| element.rounded(px(6.)))
+                        .border_color(cx.theme().colors().border)
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(Disclosure::new("tool-use-disclosure", is_open).on_click(
+                                    cx.listener({
+                                        let tool_use_id = tool_use.id.clone();
+                                        move |this, _event, _window, _cx| {
+                                            let is_open = this
+                                                .expanded_tool_uses
+                                                .entry(tool_use_id.clone())
+                                                .or_insert(false);
+
+                                            *is_open = !*is_open;
+                                        }
+                                    }),
+                                ))
+                                .child(Label::new(tool_use.name)),
+                        )
+                        .child(
+                            Label::new(match tool_use.status {
+                                ToolUseStatus::Pending => "Pending",
+                                ToolUseStatus::Running => "Running",
+                                ToolUseStatus::Finished(_) => "Finished",
+                                ToolUseStatus::Error(_) => "Error",
+                            })
+                            .size(LabelSize::XSmall)
+                            .buffer_font(cx),
+                        ),
+                )
+                .map(|parent| {
+                    if !is_open {
+                        return parent;
+                    }
+
+                    parent.child(
+                        v_flex()
+                            .child(
+                                v_flex()
+                                    .gap_0p5()
+                                    .py_1()
+                                    .px_2p5()
+                                    .border_b_1()
+                                    .border_color(cx.theme().colors().border)
+                                    .child(Label::new("Input:"))
+                                    .child(Label::new(
+                                        serde_json::to_string_pretty(&tool_use.input)
+                                            .unwrap_or_default(),
+                                    )),
+                            )
+                            .map(|parent| match tool_use.status {
+                                ToolUseStatus::Finished(output) => parent.child(
+                                    v_flex()
+                                        .gap_0p5()
+                                        .py_1()
+                                        .px_2p5()
+                                        .child(Label::new("Result:"))
+                                        .child(Label::new(output)),
+                                ),
+                                ToolUseStatus::Error(err) => parent.child(
+                                    v_flex()
+                                        .gap_0p5()
+                                        .py_1()
+                                        .px_2p5()
+                                        .child(Label::new("Error:"))
+                                        .child(Label::new(err)),
+                                ),
+                                ToolUseStatus::Pending | ToolUseStatus::Running => parent,
+                            }),
+                    )
+                }),
+        )
+    }
 }

 impl Render for ActiveThread {
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -16,6 +16,7 @@ mod terminal_inline_assistant;
 mod thread;
 mod thread_history;
 mod thread_store;
+mod tool_use;
 mod ui;

 use std::sync::Arc;
@@ -38,7 +39,6 @@ actions!(
        NewThread,
        NewPromptEditor,
        ToggleContextPicker,
-        ToggleModelSelector,
        RemoveAllContext,
        OpenHistory,
        OpenConfiguration,
--- a/crates/assistant2/src/assistant_configuration.rs
+++ b/crates/assistant2/src/assistant_configuration.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use collections::HashMap;
-use gpui::{AnyView, App, EventEmitter, FocusHandle, Focusable, Subscription};
+use gpui::{Action, AnyView, App, EventEmitter, FocusHandle, Focusable, Subscription};
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
 use ui::{prelude::*, Divider, DividerColor, ElevationIndex};
 use zed_actions::assistant::DeployPromptLibrary;
@@ -158,8 +158,16 @@ impl Render for AssistantConfiguration {
            .child(
                v_flex()
                    .p(DynamicSpacing::Base16.rems(cx))
-                    .gap_1()
-                    .child(Headline::new("Prompt Library").size(HeadlineSize::Small))
+                    .gap_2()
+                    .child(
+                        v_flex()
+                            .gap_0p5()
+                            .child(Headline::new("Prompt Library").size(HeadlineSize::Small))
+                            .child(
+                                Label::new("Create reusable prompts and tag which ones you want sent in every LLM interaction.")
+                                    .color(Color::Muted),
+                            ),
+                    )
                    .child(
                        Button::new("open-prompt-library", "Open Prompt Library")
                            .style(ButtonStyle::Filled)
@@ -168,8 +176,8 @@ impl Render for AssistantConfiguration {
                            .icon(IconName::Book)
                            .icon_size(IconSize::Small)
                            .icon_position(IconPosition::Start)
-                            .on_click(|_event, _window, cx| {
-                                cx.dispatch_action(&DeployPromptLibrary)
+                            .on_click(|_event, window, cx| {
+                                window.dispatch_action(DeployPromptLibrary.boxed_clone(), cx)
                            }),
                    ),
            )
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -1,24 +1,19 @@
 use assistant_settings::AssistantSettings;
 use fs::Fs;
-use gpui::{Entity, FocusHandle, SharedString};
-use language_model::LanguageModelRegistry;
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use gpui::{Entity, FocusHandle};
+use language_model_selector::{AssistantLanguageModelSelector, LanguageModelSelector};
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};
-
-use crate::ToggleModelSelector;
+use ui::prelude::*;

 pub struct AssistantModelSelector {
-    selector: Entity<LanguageModelSelector>,
-    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+    pub selector: Entity<LanguageModelSelector>,
    focus_handle: FocusHandle,
 }

 impl AssistantModelSelector {
    pub(crate) fn new(
        fs: Arc<dyn Fs>,
-        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
        focus_handle: FocusHandle,
        window: &mut Window,
        cx: &mut App,
@@ -38,50 +33,14 @@ impl AssistantModelSelector {
                    cx,
                )
            }),
-            menu_handle,
            focus_handle,
        }
    }
 }

 impl Render for AssistantModelSelector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
-        let focus_handle = self.focus_handle.clone();
-        let model_name = match active_model {
-            Some(model) => model.name().0,
-            _ => SharedString::from("No model selected"),
-        };
-
-        LanguageModelSelectorPopoverMenu::new(
-            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .style(ButtonStyle::Subtle)
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            Label::new(model_name)
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                        .child(
-                            Icon::new(IconName::ChevronDown)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        ),
-                ),
-            move |window, cx| {
-                Tooltip::for_action_in(
-                    "Change Model",
-                    &ToggleModelSelector,
-                    &focus_handle,
-                    window,
-                    cx,
-                )
-            },
-            gpui::Corner::BottomRight,
-        )
-        .with_handle(self.menu_handle.clone())
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        AssistantLanguageModelSelector::new(self.focus_handle.clone(), self.selector.clone())
+            .render(window, cx)
    }
 }
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -14,7 +14,7 @@ use client::zed_urls;
 use editor::Editor;
 use fs::Fs;
 use gpui::{
-    prelude::*, px, svg, Action, AnyElement, App, AsyncWindowContext, Corner, Entity, EventEmitter,
+    prelude::*, Action, AnyElement, App, AsyncWindowContext, Corner, Entity, EventEmitter,
    FocusHandle, Focusable, FontWeight, Pixels, Subscription, Task, UpdateGlobal, WeakEntity,
 };
 use language::LanguageRegistry;
@@ -458,6 +458,12 @@ impl AssistantPanel {
    pub(crate) fn active_context_editor(&self) -> Option<Entity<ContextEditor>> {
        self.context_editor.clone()
    }
+
+    pub(crate) fn delete_context(&mut self, path: PathBuf, cx: &mut Context<Self>) {
+        self.context_store
+            .update(cx, |this, cx| this.delete_local_context(path, cx))
+            .detach_and_log_err(cx);
+    }
 }

 impl Focusable for AssistantPanel {
@@ -590,7 +596,6 @@ impl AssistantPanel {

        h_flex()
            .id("assistant-toolbar")
-            .px(DynamicSpacing::Base08.rems(cx))
            .h(Tab::container_height(cx))
            .flex_none()
            .justify_between()
@@ -598,72 +603,86 @@ impl AssistantPanel {
            .bg(cx.theme().colors().tab_bar_background)
            .border_b_1()
            .border_color(cx.theme().colors().border)
+            .child(
+                div()
+                    .id("title")
+                    .overflow_x_scroll()
+                    .px(DynamicSpacing::Base08.rems(cx))
+                    .child(Label::new(title).text_ellipsis()),
+            )
            .child(
                h_flex()
-                    .w_full()
-                    .gap_1()
-                    .justify_between()
-                    .child(Label::new(title))
+                    .h_full()
+                    .pl_2()
+                    .gap_2()
+                    .bg(cx.theme().colors().tab_bar_background)
                    .children(if matches!(self.active_view, ActiveView::PromptEditor) {
                        self.context_editor
                            .as_ref()
                            .and_then(|editor| render_remaining_tokens(editor, cx))
                    } else {
                        None
-                    }),
-            )
-            .child(
-                h_flex()
-                    .h_full()
-                    .pl_1p5()
-                    .border_l_1()
-                    .border_color(cx.theme().colors().border)
-                    .gap(DynamicSpacing::Base02.rems(cx))
+                    })
                    .child(
-                        PopoverMenu::new("assistant-toolbar-new-popover-menu")
-                            .trigger_with_tooltip(
-                                IconButton::new("new", IconName::Plus)
-                                    .icon_size(IconSize::Small)
-                                    .style(ButtonStyle::Subtle),
-                                Tooltip::text("New…"),
-                            )
-                            .anchor(Corner::TopRight)
-                            .with_handle(self.new_item_context_menu_handle.clone())
-                            .menu(move |window, cx| {
-                                Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                                    menu.action("New Thread", NewThread.boxed_clone())
-                                        .action("New Prompt Editor", NewPromptEditor.boxed_clone())
-                                }))
-                            }),
-                    )
-                    .child(
-                        IconButton::new("open-history", IconName::HistoryRerun)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::Subtle)
-                            .tooltip({
-                                let focus_handle = self.focus_handle(cx);
-                                move |window, cx| {
-                                    Tooltip::for_action_in(
-                                        "History",
-                                        &OpenHistory,
-                                        &focus_handle,
-                                        window,
-                                        cx,
+                        h_flex()
+                            .h_full()
+                            .px(DynamicSpacing::Base08.rems(cx))
+                            .border_l_1()
+                            .border_color(cx.theme().colors().border)
+                            .gap(DynamicSpacing::Base02.rems(cx))
+                            .child(
+                                PopoverMenu::new("assistant-toolbar-new-popover-menu")
+                                    .trigger_with_tooltip(
+                                        IconButton::new("new", IconName::Plus)
+                                            .icon_size(IconSize::Small)
+                                            .style(ButtonStyle::Subtle),
+                                        Tooltip::text("New…"),
                                    )
-                                }
-                            })
-                            .on_click(move |_event, window, cx| {
-                                window.dispatch_action(OpenHistory.boxed_clone(), cx);
-                            }),
-                    )
-                    .child(
-                        IconButton::new("configure-assistant", IconName::Settings)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::Subtle)
-                            .tooltip(Tooltip::text("Assistant Settings"))
-                            .on_click(move |_event, window, cx| {
-                                window.dispatch_action(OpenConfiguration.boxed_clone(), cx);
-                            }),
+                                    .anchor(Corner::TopRight)
+                                    .with_handle(self.new_item_context_menu_handle.clone())
+                                    .menu(move |window, cx| {
+                                        Some(ContextMenu::build(
+                                            window,
+                                            cx,
+                                            |menu, _window, _cx| {
+                                                menu.action("New Thread", NewThread.boxed_clone())
+                                                    .action(
+                                                        "New Prompt Editor",
+                                                        NewPromptEditor.boxed_clone(),
+                                                    )
+                                            },
+                                        ))
+                                    }),
+                            )
+                            .child(
+                                IconButton::new("open-history", IconName::HistoryRerun)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle)
+                                    .tooltip({
+                                        let focus_handle = self.focus_handle(cx);
+                                        move |window, cx| {
+                                            Tooltip::for_action_in(
+                                                "History",
+                                                &OpenHistory,
+                                                &focus_handle,
+                                                window,
+                                                cx,
+                                            )
+                                        }
+                                    })
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(OpenHistory.boxed_clone(), cx);
+                                    }),
+                            )
+                            .child(
+                                IconButton::new("configure-assistant", IconName::Settings)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle)
+                                    .tooltip(Tooltip::text("Assistant Settings"))
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(OpenConfiguration.boxed_clone(), cx);
+                                    }),
+                            ),
                    ),
            )
    }
@@ -705,12 +724,11 @@ impl AssistantPanel {
    ) -> impl IntoElement {
        let recent_history = self
            .history_store
-            .update(cx, |this, cx| this.recent_entries(3, cx));
+            .update(cx, |this, cx| this.recent_entries(6, cx));

        let create_welcome_heading = || {
            h_flex()
                .w_full()
-                .justify_center()
                .child(Headline::new("Welcome to the Assistant Panel").size(HeadlineSize::Small))
        };

@@ -718,36 +736,27 @@ impl AssistantPanel {
        let no_error = configuration_error.is_none();

        v_flex()
-            .gap_2()
-            .child(
-                v_flex().w_full().child(
-                    svg()
-                        .path("icons/logo_96.svg")
-                        .text_color(cx.theme().colors().text)
-                        .w(px(40.))
-                        .h(px(40.))
-                        .mx_auto()
-                        .mb_4(),
-                ),
-            )
+            .p_1p5()
+            .size_full()
+            .justify_end()
+            .gap_1()
            .map(|parent| {
                match configuration_error {
                    Some(ConfigurationError::ProviderNotAuthenticated)
                    | Some(ConfigurationError::NoProvider) => {
                        parent.child(
                            v_flex()
+                                .px_1p5()
                                .gap_0p5()
                                .child(create_welcome_heading())
                                .child(
-                                    h_flex().mb_2().w_full().justify_center().child(
-                                        Label::new(
-                                            "To start using the assistant, configure at least one LLM provider.",
-                                        )
-                                        .color(Color::Muted),
-                                    ),
+                                    Label::new(
+                                        "To start using the assistant, configure at least one LLM provider.",
+                                    )
+                                    .color(Color::Muted),
                                )
                                .child(
-                                    h_flex().w_full().justify_center().child(
+                                    h_flex().mt_1().w_full().child(
                                        Button::new("open-configuration", "Configure a Provider")
                                            .size(ButtonSize::Compact)
                                            .icon(Some(IconName::Sliders))
@@ -761,7 +770,7 @@ impl AssistantPanel {
                        )
                    }
                    Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => parent
-                        .child(v_flex().gap_0p5().child(create_welcome_heading()).children(
+                        .child(v_flex().px_1p5().gap_0p5().child(create_welcome_heading()).children(
                            provider.render_accept_terms(
                                LanguageModelProviderTosView::ThreadEmptyState,
                                cx,
@@ -772,21 +781,40 @@ impl AssistantPanel {
            })
            .when(recent_history.is_empty() && no_error, |parent| {
                parent.child(v_flex().gap_0p5().child(create_welcome_heading()).child(
-                    h_flex().w_full().justify_center().child(
-                        Label::new("Start typing to chat with your codebase").color(Color::Muted),
-                    ),
+                    Label::new("Start typing to chat with your codebase").color(Color::Muted),
                ))
            })
            .when(!recent_history.is_empty(), |parent| {
                parent
                    .child(
-                        h_flex().w_full().justify_center().child(
-                            Label::new("Recent Threads:")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
+                        h_flex()
+                            .pl_1p5()
+                            .pb_1()
+                            .w_full()
+                            .justify_between()
+                            .border_b_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .child(
+                                Label::new("Past Interactions")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .child(
+                                Button::new("view-history", "View All")
+                                    .style(ButtonStyle::Subtle)
+                                    .label_size(LabelSize::Small)
+                                    .key_binding(KeyBinding::for_action_in(
+                                        &OpenHistory,
+                                        &self.focus_handle(cx),
+                                        window,
+                                        cx,
+                                    ))
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(OpenHistory.boxed_clone(), cx);
+                                    }),
+                            ),
                    )
-                    .child(v_flex().mx_auto().w_4_5().gap_2().children(
+                    .child(v_flex().gap_1().children(
                        recent_history.into_iter().map(|entry| {
                            // TODO: Add keyboard navigation.
                            match entry {
@@ -801,22 +829,6 @@ impl AssistantPanel {
                            }
                        }),
                    ))
-                    .child(
-                        h_flex().w_full().justify_center().child(
-                            Button::new("view-all-past-threads", "View All Past Threads")
-                                .style(ButtonStyle::Subtle)
-                                .label_size(LabelSize::Small)
-                                .key_binding(KeyBinding::for_action_in(
-                                    &OpenHistory,
-                                    &self.focus_handle(cx),
-                                    window,
-                                    cx,
-                                ))
-                                .on_click(move |_event, window, cx| {
-                                    window.dispatch_action(OpenHistory.boxed_clone(), cx);
-                                }),
-                        ),
-                    )
            })
    }

--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -6,7 +6,7 @@ use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::ThreadStore;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
-use crate::{RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::{RemoveAllContext, ToggleContextPicker};
 use client::ErrorExt;
 use collections::VecDeque;
 use editor::{
@@ -20,7 +20,6 @@ use gpui::{
    EventEmitter, FocusHandle, Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use language_model_selector::LanguageModelSelector;
 use parking_lot::Mutex;
 use settings::Settings;
 use std::cmp;
@@ -40,7 +39,6 @@ pub struct PromptEditor<T> {
    context_strip: Entity<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    model_selector: Entity<AssistantModelSelector>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    edited_since_done: bool,
    prompt_history: VecDeque<String>,
    prompt_history_ix: Option<usize>,
@@ -104,7 +102,12 @@ impl<T: 'static> Render for PromptEditor<T> {
                    .items_start()
                    .cursor(CursorStyle::Arrow)
                    .on_action(cx.listener(Self::toggle_context_picker))
-                    .on_action(cx.listener(Self::toggle_model_selector))
+                    .on_action(cx.listener(|this, action, window, cx| {
+                        let selector = this.model_selector.read(cx).selector.clone();
+                        selector.update(cx, |selector, cx| {
+                            selector.toggle_model_selector(action, window, cx);
+                        })
+                    }))
                    .on_action(cx.listener(Self::confirm))
                    .on_action(cx.listener(Self::cancel))
                    .on_action(cx.listener(Self::move_up))
@@ -347,15 +350,6 @@ impl<T: 'static> PromptEditor<T> {
        self.context_picker_menu_handle.toggle(window, cx);
    }

-    fn toggle_model_selector(
-        &mut self,
-        _: &ToggleModelSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.model_selector_menu_handle.toggle(window, cx);
-    }
-
    pub fn remove_all_context(
        &mut self,
        _: &RemoveAllContext,
@@ -864,7 +858,6 @@ impl PromptEditor<BufferCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();

        let context_strip = cx.new(|cx| {
            ContextStrip::new(
@@ -888,15 +881,8 @@ impl PromptEditor<BufferCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
-                    prompt_editor.focus_handle(cx),
-                    window,
-                    cx,
-                )
+                AssistantModelSelector::new(fs, prompt_editor.focus_handle(cx), window, cx)
            }),
-            model_selector_menu_handle,
            edited_since_done: false,
            prompt_history,
            prompt_history_ix: None,
@@ -1020,7 +1006,6 @@ impl PromptEditor<TerminalCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();

        let context_strip = cx.new(|cx| {
            ContextStrip::new(
@@ -1044,15 +1029,8 @@ impl PromptEditor<TerminalCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
-                    prompt_editor.focus_handle(cx),
-                    window,
-                    cx,
-                )
+                AssistantModelSelector::new(fs, prompt_editor.focus_handle(cx), window, cx)
            }),
-            model_selector_menu_handle,
            edited_since_done: false,
            prompt_history,
            prompt_history_ix: None,
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -7,16 +7,17 @@ use gpui::{
    pulsating_between, Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription,
    TextStyle, WeakEntity,
 };
-use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
-use language_model_selector::LanguageModelSelector;
+use language_model::LanguageModelRegistry;
 use rope::Point;
 use settings::Settings;
 use std::time::Duration;
 use text::Bias;
 use theme::ThemeSettings;
 use ui::{
-    prelude::*, ButtonLike, KeyBinding, PopoverMenu, PopoverMenuHandle, Switch, TintColor, Tooltip,
+    prelude::*, ButtonLike, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle, Switch,
+    TintColor, Tooltip,
 };
+use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;

 use crate::assistant_model_selector::AssistantModelSelector;
@@ -25,7 +26,7 @@ use crate::context_store::{refresh_context_store_text, ContextStore};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
-use crate::{Chat, ChatMode, RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::{Chat, ChatMode, RemoveAllContext, ToggleContextPicker};

 pub struct MessageEditor {
    thread: Entity<Thread>,
@@ -36,7 +37,6 @@ pub struct MessageEditor {
    inline_context_picker: Entity<ContextPicker>,
    inline_context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    model_selector: Entity<AssistantModelSelector>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    use_tools: bool,
    _subscriptions: Vec<Subscription>,
 }
@@ -53,7 +53,6 @@ impl MessageEditor {
        let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let inline_context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();

        let editor = cx.new(|cx| {
            let mut editor = Editor::auto_height(10, window, cx);
@@ -106,30 +105,13 @@ impl MessageEditor {
            context_picker_menu_handle,
            inline_context_picker,
            inline_context_picker_menu_handle,
-            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
-                    editor.focus_handle(cx),
-                    window,
-                    cx,
-                )
-            }),
-            model_selector_menu_handle,
+            model_selector: cx
+                .new(|cx| AssistantModelSelector::new(fs, editor.focus_handle(cx), window, cx)),
            use_tools: false,
            _subscriptions: subscriptions,
        }
    }

-    fn toggle_model_selector(
-        &mut self,
-        _: &ToggleModelSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.model_selector_menu_handle.toggle(window, cx)
-    }
-
    fn toggle_chat_mode(&mut self, _: &ChatMode, _window: &mut Window, cx: &mut Context<Self>) {
        self.use_tools = !self.use_tools;
        cx.notify();
@@ -205,22 +187,7 @@ impl MessageEditor {
                .update(&mut cx, |thread, cx| {
                    let context = context_store.read(cx).snapshot(cx).collect::<Vec<_>>();
                    thread.insert_user_message(user_message, context, cx);
-                    let mut request = thread.to_completion_request(request_kind, cx);
-
-                    if use_tools {
-                        request.tools = thread
-                            .tools()
-                            .tools(cx)
-                            .into_iter()
-                            .map(|tool| LanguageModelRequestTool {
-                                name: tool.name(),
-                                description: tool.description(),
-                                input_schema: tool.input_schema(),
-                            })
-                            .collect();
-                    }
-
-                    thread.stream_completion(request, model, cx)
+                    thread.send_to_model(model, request_kind, use_tools, cx);
                })
                .ok();
        })
@@ -309,7 +276,6 @@ impl Render for MessageEditor {
        let inline_context_picker = self.inline_context_picker.clone();
        let bg_color = cx.theme().colors().editor_background;
        let is_streaming_completion = self.thread.read(cx).is_streaming();
-        let button_width = px(64.);
        let is_model_selected = self.is_model_selected(cx);
        let is_editor_empty = self.is_editor_empty(cx);
        let submit_label_color = if is_editor_empty {
@@ -318,10 +284,25 @@ impl Render for MessageEditor {
            Color::Default
        };

+        let vim_mode_enabled = VimModeSetting::get_global(cx).0;
+        let platform = PlatformStyle::platform();
+        let linux = platform == PlatformStyle::Linux;
+        let windows = platform == PlatformStyle::Windows;
+        let button_width = if linux || windows || vim_mode_enabled {
+            px(92.)
+        } else {
+            px(64.)
+        };
+
        v_flex()
            .key_context("MessageEditor")
            .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(Self::toggle_model_selector))
+            .on_action(cx.listener(|this, action, window, cx| {
+                let selector = this.model_selector.read(cx).selector.clone();
+                selector.update(cx, |this, cx| {
+                    this.toggle_model_selector(action, window, cx);
+                })
+            }))
            .on_action(cx.listener(Self::toggle_context_picker))
            .on_action(cx.listener(Self::remove_all_context))
            .on_action(cx.listener(Self::move_up))
@@ -333,7 +314,7 @@ impl Render for MessageEditor {
            .child(self.context_strip.clone())
            .child(
                v_flex()
-                    .gap_4()
+                    .gap_5()
                    .child({
                        let settings = ThemeSettings::get_global(cx);
                        let text_style = TextStyle {
--- a/crates/assistant2/src/terminal_codegen.rs
+++ b/crates/assistant2/src/terminal_codegen.rs
@@ -155,7 +155,10 @@ pub enum CodegenEvent {
    Finished,
 }

+#[cfg(not(target_os = "windows"))]
 pub const CLEAR_INPUT: &str = "\x15";
+#[cfg(target_os = "windows")]
+pub const CLEAR_INPUT: &str = "\x03";
 const CARRIAGE_RETURN: &str = "\x0d";

 struct TerminalTransaction {
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -4,14 +4,12 @@ use anyhow::Result;
 use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap, HashSet};
-use futures::future::Shared;
-use futures::{FutureExt as _, StreamExt as _};
+use futures::StreamExt as _;
 use gpui::{App, Context, EventEmitter, SharedString, Task};
 use language_model::{
    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
-    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
-    Role, StopReason,
+    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolUseId,
+    MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError, Role, StopReason,
 };
 use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
@@ -19,10 +17,13 @@ use uuid::Uuid;

 use crate::context::{attach_context_to_message, ContextId, ContextSnapshot};
 use crate::thread_store::SavedThread;
+use crate::tool_use::{PendingToolUse, ToolUse, ToolUseState};

 #[derive(Debug, Clone, Copy)]
 pub enum RequestKind {
    Chat,
+    /// Used when summarizing a thread.
+    Summarize,
 }

 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
@@ -41,7 +42,7 @@ impl std::fmt::Display for ThreadId {
 }

 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-pub struct MessageId(usize);
+pub struct MessageId(pub(crate) usize);

 impl MessageId {
    fn post_inc(&mut self) -> Self {
@@ -70,9 +71,7 @@ pub struct Thread {
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
    tools: Arc<ToolWorkingSet>,
-    tool_uses_by_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
-    tool_results_by_message: HashMap<MessageId, Vec<LanguageModelToolResult>>,
-    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
+    tool_use: ToolUseState,
 }

 impl Thread {
@@ -89,9 +88,7 @@ impl Thread {
            completion_count: 0,
            pending_completions: Vec::new(),
            tools,
-            tool_uses_by_message: HashMap::default(),
-            tool_results_by_message: HashMap::default(),
-            pending_tool_uses_by_id: HashMap::default(),
+            tool_use: ToolUseState::default(),
        }
    }

@@ -123,9 +120,7 @@ impl Thread {
            completion_count: 0,
            pending_completions: Vec::new(),
            tools,
-            tool_uses_by_message: HashMap::default(),
-            tool_results_by_message: HashMap::default(),
-            pending_tool_uses_by_id: HashMap::default(),
+            tool_use: ToolUseState::default(),
        }
    }

@@ -187,7 +182,15 @@ impl Thread {
    }

    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
-        self.pending_tool_uses_by_id.values().collect()
+        self.tool_use.pending_tool_uses()
+    }
+
+    pub fn tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
+        self.tool_use.tool_uses_for_message(id)
+    }
+
+    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
+        self.tool_use.message_has_tool_results(message_id)
    }

    pub fn insert_user_message(
@@ -241,9 +244,34 @@ impl Thread {
        text
    }

+    pub fn send_to_model(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        request_kind: RequestKind,
+        use_tools: bool,
+        cx: &mut Context<Self>,
+    ) {
+        let mut request = self.to_completion_request(request_kind, cx);
+
+        if use_tools {
+            request.tools = self
+                .tools()
+                .tools(cx)
+                .into_iter()
+                .map(|tool| LanguageModelRequestTool {
+                    name: tool.name(),
+                    description: tool.description(),
+                    input_schema: tool.input_schema(),
+                })
+                .collect();
+        }
+
+        self.stream_completion(request, model, cx);
+    }
+
    pub fn to_completion_request(
        &self,
-        _request_kind: RequestKind,
+        request_kind: RequestKind,
        _cx: &App,
    ) -> LanguageModelRequest {
        let mut request = LanguageModelRequest {
@@ -265,12 +293,13 @@ impl Thread {
                content: Vec::new(),
                cache: false,
            };
-
-            if let Some(tool_results) = self.tool_results_by_message.get(&message.id) {
-                for tool_result in tool_results {
-                    request_message
-                        .content
-                        .push(MessageContent::ToolResult(tool_result.clone()));
+            match request_kind {
+                RequestKind::Chat => {
+                    self.tool_use
+                        .attach_tool_results(message.id, &mut request_message);
+                }
+                RequestKind::Summarize => {
+                    // We don't care about tool use during summarization.
                }
            }

@@ -280,11 +309,13 @@ impl Thread {
                    .push(MessageContent::Text(message.text.clone()));
            }

-            if let Some(tool_uses) = self.tool_uses_by_message.get(&message.id) {
-                for tool_use in tool_uses {
-                    request_message
-                        .content
-                        .push(MessageContent::ToolUse(tool_use.clone()));
+            match request_kind {
+                RequestKind::Chat => {
+                    self.tool_use
+                        .attach_tool_uses(message.id, &mut request_message);
+                }
+                RequestKind::Summarize => {
+                    // We don't care about tool use during summarization.
                }
            }

@@ -360,21 +391,8 @@ impl Thread {
                                    .rfind(|message| message.role == Role::Assistant)
                                {
                                    thread
-                                        .tool_uses_by_message
-                                        .entry(last_assistant_message.id)
-                                        .or_default()
-                                        .push(tool_use.clone());
-
-                                    thread.pending_tool_uses_by_id.insert(
-                                        tool_use.id.clone(),
-                                        PendingToolUse {
-                                            assistant_message_id: last_assistant_message.id,
-                                            id: tool_use.id,
-                                            name: tool_use.name,
-                                            input: tool_use.input,
-                                            status: PendingToolUseStatus::Idle,
-                                        },
-                                    );
+                                        .tool_use
+                                        .request_tool_use(last_assistant_message.id, tool_use);
                                }
                            }
                        }
@@ -451,7 +469,7 @@ impl Thread {
            return;
        }

-        let mut request = self.to_completion_request(RequestKind::Chat, cx);
+        let mut request = self.to_completion_request(RequestKind::Summarize, cx);
        request.messages.push(LanguageModelRequestMessage {
            role: Role::User,
            content: vec![
@@ -494,7 +512,6 @@ impl Thread {

    pub fn insert_tool_output(
        &mut self,
-        assistant_message_id: MessageId,
        tool_use_id: LanguageModelToolUseId,
        output: Task<Result<String>>,
        cx: &mut Context<Self>,
@@ -505,50 +522,18 @@ impl Thread {
                let output = output.await;
                thread
                    .update(&mut cx, |thread, cx| {
-                        // The tool use was requested by an Assistant message,
-                        // so we want to attach the tool results to the next
-                        // user message.
-                        let next_user_message = MessageId(assistant_message_id.0 + 1);
+                        thread
+                            .tool_use
+                            .insert_tool_output(tool_use_id.clone(), output);

-                        let tool_results = thread
-                            .tool_results_by_message
-                            .entry(next_user_message)
-                            .or_default();
-
-                        match output {
-                            Ok(output) => {
-                                tool_results.push(LanguageModelToolResult {
-                                    tool_use_id: tool_use_id.to_string(),
-                                    content: output,
-                                    is_error: false,
-                                });
-
-                                cx.emit(ThreadEvent::ToolFinished { tool_use_id });
-                            }
-                            Err(err) => {
-                                tool_results.push(LanguageModelToolResult {
-                                    tool_use_id: tool_use_id.to_string(),
-                                    content: err.to_string(),
-                                    is_error: true,
-                                });
-
-                                if let Some(tool_use) =
-                                    thread.pending_tool_uses_by_id.get_mut(&tool_use_id)
-                                {
-                                    tool_use.status = PendingToolUseStatus::Error(err.to_string());
-                                }
-                            }
-                        }
+                        cx.emit(ThreadEvent::ToolFinished { tool_use_id });
                    })
                    .ok();
            }
        });

-        if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
-            tool_use.status = PendingToolUseStatus::Running {
-                _task: insert_output_task.shared(),
-            };
-        }
+        self.tool_use
+            .run_pending_tool(tool_use_id, insert_output_task);
    }

    /// Cancels the last pending completion, if there are any pending.
@@ -590,26 +575,3 @@ struct PendingCompletion {
    id: usize,
    _task: Task<()>,
 }
-
-#[derive(Debug, Clone)]
-pub struct PendingToolUse {
-    pub id: LanguageModelToolUseId,
-    /// The ID of the Assistant message in which the tool use was requested.
-    pub assistant_message_id: MessageId,
-    pub name: String,
-    pub input: serde_json::Value,
-    pub status: PendingToolUseStatus,
-}
-
-#[derive(Debug, Clone)]
-pub enum PendingToolUseStatus {
-    Idle,
-    Running { _task: Shared<Task<()>> },
-    Error(#[allow(unused)] String),
-}
-
-impl PendingToolUseStatus {
-    pub fn is_idle(&self) -> bool {
-        matches!(self, PendingToolUseStatus::Idle)
-    }
-}
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -134,7 +134,13 @@ impl ThreadHistory {
                        })
                        .ok();
                }
-                HistoryEntry::Context(_context) => {}
+                HistoryEntry::Context(context) => {
+                    self.assistant_panel
+                        .update(cx, |this, cx| {
+                            this.delete_context(context.path.clone(), cx);
+                        })
+                        .ok();
+                }
            }

            cx.notify();
@@ -248,18 +254,28 @@ impl RenderOnce for PastThread {
        );

        ListItem::new(SharedString::from(self.thread.id.to_string()))
-            .outlined()
+            .rounded()
            .toggle_state(self.selected)
-            .start_slot(
-                Icon::new(IconName::MessageCircle)
-                    .size(IconSize::Small)
-                    .color(Color::Muted),
-            )
            .spacing(ListItemSpacing::Sparse)
-            .child(Label::new(summary).size(LabelSize::Small).text_ellipsis())
+            .start_slot(
+                div()
+                    .max_w_4_5()
+                    .child(Label::new(summary).size(LabelSize::Small).text_ellipsis()),
+            )
            .end_slot(
                h_flex()
                    .gap_1p5()
+                    .child(
+                        Label::new("Thread")
+                            .color(Color::Muted)
+                            .size(LabelSize::XSmall),
+                    )
+                    .child(
+                        div()
+                            .size(px(3.))
+                            .rounded_full()
+                            .bg(cx.theme().colors().text_disabled),
+                    )
                    .child(
                        Label::new(thread_timestamp)
                            .color(Color::Muted)
@@ -334,21 +350,50 @@ impl RenderOnce for PastContext {
        ListItem::new(SharedString::from(
            self.context.path.to_string_lossy().to_string(),
        ))
-        .outlined()
+        .rounded()
        .toggle_state(self.selected)
-        .start_slot(
-            Icon::new(IconName::Code)
-                .size(IconSize::Small)
-                .color(Color::Muted),
-        )
        .spacing(ListItemSpacing::Sparse)
-        .child(Label::new(summary).size(LabelSize::Small).text_ellipsis())
+        .start_slot(
+            div()
+                .max_w_4_5()
+                .child(Label::new(summary).size(LabelSize::Small).text_ellipsis()),
+        )
        .end_slot(
-            h_flex().gap_1p5().child(
-                Label::new(context_timestamp)
-                    .color(Color::Muted)
-                    .size(LabelSize::XSmall),
-            ),
+            h_flex()
+                .gap_1p5()
+                .child(
+                    Label::new("Prompt Editor")
+                        .color(Color::Muted)
+                        .size(LabelSize::XSmall),
+                )
+                .child(
+                    div()
+                        .size(px(3.))
+                        .rounded_full()
+                        .bg(cx.theme().colors().text_disabled),
+                )
+                .child(
+                    Label::new(context_timestamp)
+                        .color(Color::Muted)
+                        .size(LabelSize::XSmall),
+                )
+                .child(
+                    IconButton::new("delete", IconName::TrashAlt)
+                        .shape(IconButtonShape::Square)
+                        .icon_size(IconSize::XSmall)
+                        .tooltip(Tooltip::text("Delete Prompt Editor"))
+                        .on_click({
+                            let assistant_panel = self.assistant_panel.clone();
+                            let path = self.context.path.clone();
+                            move |_event, _window, cx| {
+                                assistant_panel
+                                    .update(cx, |this, cx| {
+                                        this.delete_context(path.clone(), cx);
+                                    })
+                                    .ok();
+                            }
+                        }),
+                ),
        )
        .on_click({
            let assistant_panel = self.assistant_panel.clone();
--- a/crates/assistant2/src/tool_use.rs
+++ b/crates/assistant2/src/tool_use.rs
@@ -0,0 +1,221 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use collections::HashMap;
+use futures::future::Shared;
+use futures::FutureExt as _;
+use gpui::{SharedString, Task};
+use language_model::{
+    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
+    LanguageModelToolUseId, MessageContent,
+};
+
+use crate::thread::MessageId;
+
+#[derive(Debug)]
+pub struct ToolUse {
+    pub id: LanguageModelToolUseId,
+    pub name: SharedString,
+    pub status: ToolUseStatus,
+    pub input: serde_json::Value,
+}
+
+#[derive(Debug, Clone)]
+pub enum ToolUseStatus {
+    Pending,
+    Running,
+    Finished(SharedString),
+    Error(SharedString),
+}
+
+#[derive(Default)]
+pub struct ToolUseState {
+    tool_uses_by_assistant_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
+    tool_uses_by_user_message: HashMap<MessageId, Vec<LanguageModelToolUseId>>,
+    tool_results: HashMap<LanguageModelToolUseId, LanguageModelToolResult>,
+    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
+}
+
+impl ToolUseState {
+    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
+        self.pending_tool_uses_by_id.values().collect()
+    }
+
+    pub fn tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
+        let Some(tool_uses_for_message) = &self.tool_uses_by_assistant_message.get(&id) else {
+            return Vec::new();
+        };
+
+        let mut tool_uses = Vec::new();
+
+        for tool_use in tool_uses_for_message.iter() {
+            let tool_result = self.tool_results.get(&tool_use.id);
+
+            let status = (|| {
+                if let Some(tool_result) = tool_result {
+                    return if tool_result.is_error {
+                        ToolUseStatus::Error(tool_result.content.clone().into())
+                    } else {
+                        ToolUseStatus::Finished(tool_result.content.clone().into())
+                    };
+                }
+
+                if let Some(pending_tool_use) = self.pending_tool_uses_by_id.get(&tool_use.id) {
+                    return match pending_tool_use.status {
+                        PendingToolUseStatus::Idle => ToolUseStatus::Pending,
+                        PendingToolUseStatus::Running { .. } => ToolUseStatus::Running,
+                        PendingToolUseStatus::Error(ref err) => {
+                            ToolUseStatus::Error(err.clone().into())
+                        }
+                    };
+                }
+
+                ToolUseStatus::Pending
+            })();
+
+            tool_uses.push(ToolUse {
+                id: tool_use.id.clone(),
+                name: tool_use.name.clone().into(),
+                input: tool_use.input.clone(),
+                status,
+            })
+        }
+
+        tool_uses
+    }
+
+    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
+        self.tool_uses_by_user_message
+            .get(&message_id)
+            .map_or(false, |results| !results.is_empty())
+    }
+
+    pub fn request_tool_use(
+        &mut self,
+        assistant_message_id: MessageId,
+        tool_use: LanguageModelToolUse,
+    ) {
+        self.tool_uses_by_assistant_message
+            .entry(assistant_message_id)
+            .or_default()
+            .push(tool_use.clone());
+
+        // The tool use is being requested by the Assistant, so we want to
+        // attach the tool results to the next user message.
+        let next_user_message_id = MessageId(assistant_message_id.0 + 1);
+        self.tool_uses_by_user_message
+            .entry(next_user_message_id)
+            .or_default()
+            .push(tool_use.id.clone());
+
+        self.pending_tool_uses_by_id.insert(
+            tool_use.id.clone(),
+            PendingToolUse {
+                assistant_message_id,
+                id: tool_use.id,
+                name: tool_use.name,
+                input: tool_use.input,
+                status: PendingToolUseStatus::Idle,
+            },
+        );
+    }
+
+    pub fn run_pending_tool(&mut self, tool_use_id: LanguageModelToolUseId, task: Task<()>) {
+        if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
+            tool_use.status = PendingToolUseStatus::Running {
+                _task: task.shared(),
+            };
+        }
+    }
+
+    pub fn insert_tool_output(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        output: Result<String>,
+    ) {
+        match output {
+            Ok(output) => {
+                self.tool_results.insert(
+                    tool_use_id.clone(),
+                    LanguageModelToolResult {
+                        tool_use_id: tool_use_id.clone(),
+                        content: output.into(),
+                        is_error: false,
+                    },
+                );
+                self.pending_tool_uses_by_id.remove(&tool_use_id);
+            }
+            Err(err) => {
+                self.tool_results.insert(
+                    tool_use_id.clone(),
+                    LanguageModelToolResult {
+                        tool_use_id: tool_use_id.clone(),
+                        content: err.to_string().into(),
+                        is_error: true,
+                    },
+                );
+
+                if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
+                    tool_use.status = PendingToolUseStatus::Error(err.to_string().into());
+                }
+            }
+        }
+    }
+
+    pub fn attach_tool_uses(
+        &self,
+        message_id: MessageId,
+        request_message: &mut LanguageModelRequestMessage,
+    ) {
+        if let Some(tool_uses) = self.tool_uses_by_assistant_message.get(&message_id) {
+            for tool_use in tool_uses {
+                request_message
+                    .content
+                    .push(MessageContent::ToolUse(tool_use.clone()));
+            }
+        }
+    }
+
+    pub fn attach_tool_results(
+        &self,
+        message_id: MessageId,
+        request_message: &mut LanguageModelRequestMessage,
+    ) {
+        if let Some(tool_uses) = self.tool_uses_by_user_message.get(&message_id) {
+            for tool_use_id in tool_uses {
+                if let Some(tool_result) = self.tool_results.get(tool_use_id) {
+                    request_message
+                        .content
+                        .push(MessageContent::ToolResult(tool_result.clone()));
+                }
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct PendingToolUse {
+    pub id: LanguageModelToolUseId,
+    /// The ID of the Assistant message in which the tool use was requested.
+    pub assistant_message_id: MessageId,
+    pub name: Arc<str>,
+    pub input: serde_json::Value,
+    pub status: PendingToolUseStatus,
+}
+
+#[derive(Debug, Clone)]
+pub enum PendingToolUseStatus {
+    Idle,
+    Running { _task: Shared<Task<()>> },
+    Error(#[allow(unused)] Arc<str>),
+}
+
+impl PendingToolUseStatus {
+    pub fn is_idle(&self) -> bool {
+        matches!(self, PendingToolUseStatus::Idle)
+    }
+
+    pub fn is_error(&self) -> bool {
+        matches!(self, PendingToolUseStatus::Error(_))
+    }
+}
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -29,19 +29,22 @@ use gpui::{
    WeakEntity,
 };
 use indexed_docs::IndexedDocsStore;
-use language::{language_settings::SoftWrap, BufferSnapshot, LspAdapterDelegate, ToOffset};
+use language::{
+    language_settings::{all_language_settings, SoftWrap},
+    BufferSnapshot, LspAdapterDelegate, ToOffset,
+};
 use language_model::{
    LanguageModelImage, LanguageModelProvider, LanguageModelProviderTosView, LanguageModelRegistry,
    Role,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_model_selector::{AssistantLanguageModelSelector, LanguageModelSelector};
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
 use project::lsp_store::LocalLspAdapterDelegate;
 use project::{Project, Worktree};
 use rope::Point;
 use serde::{Deserialize, Serialize};
-use settings::{update_settings_file, Settings};
+use settings::{update_settings_file, Settings, SettingsStore};
 use std::{any::TypeId, borrow::Cow, cmp, ops::Range, path::PathBuf, sync::Arc, time::Duration};
 use text::SelectionGoal;
 use ui::{
@@ -77,7 +80,6 @@ actions!(
        InsertIntoEditor,
        QuoteSelection,
        Split,
-        ToggleModelSelector,
    ]
 );

@@ -194,7 +196,6 @@ pub struct ContextEditor {
    // context editor, we keep a reference here.
    dragged_file_worktrees: Vec<Entity<Worktree>>,
    language_model_selector: Entity<LanguageModelSelector>,
-    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 pub const DEFAULT_TAB_TITLE: &str = "New Chat";
@@ -230,6 +231,13 @@ impl ContextEditor {
            editor.set_completion_provider(Some(Box::new(completion_provider)));
            editor.set_menu_inline_completions_policy(MenuInlineCompletionsPolicy::Never);
            editor.set_collaboration_hub(Box::new(project.clone()));
+
+            let show_edit_predictions = all_language_settings(None, cx)
+                .edit_predictions
+                .enabled_in_assistant;
+
+            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
+
            editor
        });

@@ -238,6 +246,7 @@ impl ContextEditor {
            cx.subscribe_in(&context, window, Self::handle_context_event),
            cx.subscribe_in(&editor, window, Self::handle_editor_event),
            cx.subscribe_in(&editor, window, Self::handle_editor_search_event),
+            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
        ];

        let fs_clone = fs.clone();
@@ -255,7 +264,6 @@ impl ContextEditor {
            )
        });

-        let language_model_selector_menu_handle = PopoverMenuHandle::default();
        let sections = context.read(cx).slash_command_output_sections().to_vec();
        let patch_ranges = context.read(cx).patch_ranges().collect::<Vec<_>>();
        let slash_commands = context.read(cx).slash_commands().clone();
@@ -281,7 +289,6 @@ impl ContextEditor {
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
            language_model_selector,
-            language_model_selector_menu_handle,
        };
        this.update_message_headers(cx);
        this.update_image_blocks(cx);
@@ -290,6 +297,16 @@ impl ContextEditor {
        this
    }

+    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            let show_edit_predictions = all_language_settings(None, cx)
+                .edit_predictions
+                .enabled_in_assistant;
+
+            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
+        });
+    }
+
    pub fn context(&self) -> &Entity<AssistantContext> {
        &self.context
    }
@@ -1087,7 +1104,7 @@ impl ContextEditor {
        patch: AssistantPatch,
        mut cx: AsyncWindowContext,
    ) -> Result<()> {
-        let project = this.update(&mut cx, |this, _| this.project.clone())?;
+        let project = this.read_with(&cx, |this, _| this.project.clone())?;
        let resolved_patch = patch.resolve(project.clone(), &mut cx).await;

        let editor = cx.new_window_entity(|window, cx| {
@@ -1112,7 +1129,7 @@ impl ContextEditor {
            editor
        })?;

-        this.update_in(&mut cx, |this, window, cx| {
+        this.update(&mut cx, |this, _| {
            if let Some(patch_state) = this.patches.get_mut(&patch.range) {
                patch_state.editor = Some(PatchEditorState {
                    editor: editor.downgrade(),
@@ -1120,19 +1137,12 @@ impl ContextEditor {
                });
                patch_state.update_task.take();
            }
-
-            this.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.add_item_to_active_pane(
-                        Box::new(editor.clone()),
-                        None,
-                        false,
-                        window,
-                        cx,
-                    )
-                })
-                .log_err();
        })?;
+        this.read_with(&cx, |this, _| this.workspace.clone())?
+            .update_in(&mut cx, |workspace, window, cx| {
+                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, false, window, cx)
+            })
+            .log_err();

        Ok(())
    }
@@ -2031,15 +2041,6 @@ impl ContextEditor {
        });
    }

-    fn toggle_model_selector(
-        &mut self,
-        _: &ToggleModelSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.language_model_selector_menu_handle.toggle(window, cx);
-    }
-
    fn save(&mut self, _: &Save, _window: &mut Window, cx: &mut Context<Self>) {
        self.context.update(cx, |context, cx| {
            context.save(Some(Duration::from_millis(500)), self.fs.clone(), cx)
@@ -2387,46 +2388,6 @@ impl ContextEditor {
        )
    }

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

@@ -2871,6 +2832,7 @@ impl Render for ContextEditor {
            None
        };

+        let language_model_selector = self.language_model_selector.clone();
        v_flex()
            .key_context("ContextEditor")
            .capture_action(cx.listener(ContextEditor::cancel))
@@ -2883,7 +2845,11 @@ impl Render for ContextEditor {
            .on_action(cx.listener(ContextEditor::edit))
            .on_action(cx.listener(ContextEditor::assist))
            .on_action(cx.listener(ContextEditor::split))
-            .on_action(cx.listener(ContextEditor::toggle_model_selector))
+            .on_action(move |action, window, cx| {
+                language_model_selector.update(cx, |this, cx| {
+                    this.toggle_model_selector(action, window, cx);
+                })
+            })
            .size_full()
            .children(self.render_notice(cx))
            .child(
@@ -2921,11 +2887,14 @@ impl Render for ContextEditor {
                                .gap_1()
                                .child(self.render_inject_context_menu(cx))
                                .child(ui::Divider::vertical())
-                                .child(
-                                    div()
-                                        .pl_0p5()
-                                        .child(self.render_language_model_selector(cx)),
-                                ),
+                                .child(div().pl_0p5().child({
+                                    let focus_handle = self.editor().focus_handle(cx).clone();
+                                    AssistantLanguageModelSelector::new(
+                                        focus_handle,
+                                        self.language_model_selector.clone(),
+                                    )
+                                    .render(window, cx)
+                                })),
                        )
                        .child(
                            h_flex()
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -9,7 +9,7 @@ use clock::ReplicaId;
 use collections::HashMap;
 use context_server::manager::ContextServerManager;
 use context_server::ContextServerFactoryRegistry;
-use fs::Fs;
+use fs::{Fs, RemoveOptions};
 use futures::StreamExt;
 use fuzzy::StringMatchCandidate;
 use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
@@ -475,6 +475,38 @@ impl ContextStore {
        })
    }

+    pub fn delete_local_context(
+        &mut self,
+        path: PathBuf,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        let fs = self.fs.clone();
+
+        cx.spawn(|this, mut cx| async move {
+            fs.remove_file(
+                &path,
+                RemoveOptions {
+                    recursive: false,
+                    ignore_if_not_exists: true,
+                },
+            )
+            .await?;
+
+            this.update(&mut cx, |this, cx| {
+                this.contexts.retain(|context| {
+                    context
+                        .upgrade()
+                        .and_then(|context| context.read(cx).path())
+                        != Some(&path)
+                });
+                this.contexts_metadata
+                    .retain(|context| context.path != path);
+            })?;
+
+            Ok(())
+        })
+    }
+
    fn loaded_context_for_path(&self, path: &Path, cx: &App) -> Option<Entity<AssistantContext>> {
        self.contexts.iter().find_map(|context| {
            let context = context.upgrade()?;
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -21,11 +21,11 @@ impl SlashCommand for DefaultSlashCommand {
    }

    fn description(&self) -> String {
-        "insert default prompt".into()
+        "Insert default prompt".into()
    }

    fn menu_text(&self) -> String {
-        "Insert Default Prompt".into()
+        self.description()
    }

    fn requires_argument(&self) -> bool {
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -7,8 +7,10 @@ use strum::EnumIter;
 pub enum Model {
    // Anthropic models (already included)
    #[default]
-    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
+    #[serde(rename = "claude-3-5-sonnet-v2", alias = "claude-3-5-sonnet-latest")]
    Claude3_5Sonnet,
+    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
+    Claude3_7Sonnet,
    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
    Claude3Opus,
    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
@@ -64,7 +66,7 @@ pub enum Model {

 impl Model {
    pub fn from_id(id: &str) -> anyhow::Result<Self> {
-        if id.starts_with("claude-3-5-sonnet") {
+        if id.starts_with("claude-3-5-sonnet-v2") {
            Ok(Self::Claude3_5Sonnet)
        } else if id.starts_with("claude-3-opus") {
            Ok(Self::Claude3Opus)
@@ -72,6 +74,8 @@ impl Model {
            Ok(Self::Claude3Sonnet)
        } else if id.starts_with("claude-3-5-haiku") {
            Ok(Self::Claude3_5Haiku)
+        } else if id.starts_with("claude-3-7-sonnet") {
+            Ok(Self::Claude3_7Sonnet)
        } else {
            Err(anyhow!("invalid model id"))
        }
@@ -83,6 +87,7 @@ impl Model {
            Model::Claude3Opus => "us.anthropic.claude-3-opus-20240229-v1:0",
            Model::Claude3Sonnet => "us.anthropic.claude-3-sonnet-20240229-v1:0",
            Model::Claude3_5Haiku => "us.anthropic.claude-3-5-haiku-20241022-v1:0",
+            Model::Claude3_7Sonnet => "us.anthropic.claude-3-7-sonnet-20250219-v1:0",
            Model::AmazonNovaLite => "us.amazon.nova-lite-v1:0",
            Model::AmazonNovaMicro => "us.amazon.nova-micro-v1:0",
            Model::AmazonNovaPro => "us.amazon.nova-pro-v1:0",
@@ -120,10 +125,11 @@ impl Model {

    pub fn display_name(&self) -> &str {
        match self {
-            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
+            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet v2",
            Self::Claude3Opus => "Claude 3 Opus",
            Self::Claude3Sonnet => "Claude 3 Sonnet",
            Self::Claude3_5Haiku => "Claude 3.5 Haiku",
+            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
            Self::AmazonNovaLite => "Amazon Nova Lite",
            Self::AmazonNovaMicro => "Amazon Nova Micro",
            Self::AmazonNovaPro => "Amazon Nova Pro",
@@ -166,7 +172,8 @@ impl Model {
            Self::Claude3_5Sonnet
            | Self::Claude3Opus
            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku => 200_000,
+            | Self::Claude3_5Haiku
+            | Self::Claude3_7Sonnet => 200_000,
            Self::Custom { max_tokens, .. } => *max_tokens,
            _ => 200_000,
        }
@@ -188,7 +195,8 @@ impl Model {
            Self::Claude3_5Sonnet
            | Self::Claude3Opus
            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku => 1.0,
+            | Self::Claude3_5Haiku
+            | Self::Claude3_7Sonnet => 1.0,
            Self::Custom {
                default_temperature,
                ..
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -81,7 +81,7 @@ impl Render for Breadcrumbs {
            }
            text_style.color = Color::Muted.color(cx);

-            StyledText::new(segment.text.replace('\n', "␤"))
+            StyledText::new(segment.text.replace('\n', "⏎"))
                .with_highlights(&text_style, segment.highlights.unwrap_or_default())
                .into_any()
        });
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -109,7 +109,7 @@ impl sum_tree::Summary for DiffHunkSummary {
    }
 }

-impl<'a> sum_tree::SeekTarget<'a, DiffHunkSummary, DiffHunkSummary> for Anchor {
+impl sum_tree::SeekTarget<'_, DiffHunkSummary, DiffHunkSummary> for Anchor {
    fn cmp(&self, cursor_location: &DiffHunkSummary, buffer: &text::BufferSnapshot) -> Ordering {
        if self
            .cmp(&cursor_location.buffer_range.start, buffer)
@@ -184,17 +184,31 @@ impl BufferDiffSnapshot {
        cx: &mut App,
    ) -> Option<Rope> {
        let secondary_diff = self.secondary_diff()?;
-        let index_base = if let Some(index_base) = secondary_diff.base_text() {
-            index_base.text.as_rope().clone()
-        } else if stage {
-            Rope::from("")
-        } else {
-            return None;
+        let head_text = self.base_text().map(|text| text.as_rope().clone());
+        let index_text = secondary_diff
+            .base_text()
+            .map(|text| text.as_rope().clone());
+        let (index_text, head_text) = match (index_text, head_text) {
+            (Some(index_text), Some(head_text)) => (index_text, head_text),
+            // file is deleted in both index and head
+            (None, None) => return None,
+            // file is deleted in index
+            (None, Some(head_text)) => {
+                return if stage {
+                    Some(buffer.as_rope().clone())
+                } else {
+                    Some(head_text)
+                }
+            }
+            // file exists in the index, but is deleted in head
+            (Some(_), None) => {
+                return if stage {
+                    Some(buffer.as_rope().clone())
+                } else {
+                    None
+                }
+            }
        };
-        let head_base = self.base_text().map_or_else(
-            || Rope::from(""),
-            |snapshot| snapshot.text.as_rope().clone(),
-        );

        let mut secondary_cursor = secondary_diff.inner.hunks.cursor::<DiffHunkSummary>(buffer);
        secondary_cursor.next(buffer);
@@ -251,7 +265,7 @@ impl BufferDiffSnapshot {
                    .collect::<String>()
            } else {
                log::debug!("unstaging");
-                head_base
+                head_text
                    .chunks_in_range(diff_base_byte_range.clone())
                    .collect::<String>()
            };
@@ -259,7 +273,7 @@ impl BufferDiffSnapshot {
        }

        let buffer = cx.new(|cx| {
-            language::Buffer::local_normalized(index_base, text::LineEnding::default(), cx)
+            language::Buffer::local_normalized(index_text, text::LineEnding::default(), cx)
        });
        let new_text = buffer.update(cx, |buffer, cx| {
            buffer.edit(edits, None, cx);
--- a/crates/channel/src/channel_store/channel_index.rs
+++ b/crates/channel/src/channel_store/channel_index.rs
@@ -48,7 +48,7 @@ pub struct ChannelPathsInsertGuard<'a> {
    channels_by_id: &'a mut BTreeMap<ChannelId, Arc<Channel>>,
 }

-impl<'a> ChannelPathsInsertGuard<'a> {
+impl ChannelPathsInsertGuard<'_> {
    pub fn insert(&mut self, channel_proto: proto::Channel) -> bool {
        let mut ret = false;
        let parent_path = channel_proto
@@ -86,7 +86,7 @@ impl<'a> ChannelPathsInsertGuard<'a> {
    }
 }

-impl<'a> Drop for ChannelPathsInsertGuard<'a> {
+impl Drop for ChannelPathsInsertGuard<'_> {
    fn drop(&mut self) {
        self.channels_ordered.sort_by(|a, b| {
            let a = channel_path_sorting_key(*a, self.channels_by_id);
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -33,10 +33,13 @@ util.workspace = true
 tempfile.workspace = true

 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-exec.workspace =  true
+exec.workspace = true
 fork.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation.workspace = true
 core-services = "0.2"
 plist = "1.3"
+
+[target.'cfg(target_os = "windows")'.dependencies]
+windows.workspace = true
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -521,30 +521,108 @@ mod flatpak {
    }
 }

-// todo("windows")
 #[cfg(target_os = "windows")]
 mod windows {
+    use anyhow::Context;
+    use release_channel::app_identifier;
+    use windows::{
+        core::HSTRING,
+        Win32::{
+            Foundation::{CloseHandle, GetLastError, ERROR_ALREADY_EXISTS, GENERIC_WRITE},
+            Storage::FileSystem::{
+                CreateFileW, WriteFile, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE, OPEN_EXISTING,
+            },
+            System::Threading::CreateMutexW,
+        },
+    };
+
    use crate::{Detect, InstalledApp};
    use std::io;
-    use std::path::Path;
+    use std::path::{Path, PathBuf};
    use std::process::ExitStatus;

-    struct App;
+    fn check_single_instance() -> bool {
+        let mutex = unsafe {
+            CreateMutexW(
+                None,
+                false,
+                &HSTRING::from(format!("{}-Instance-Mutex", app_identifier())),
+            )
+            .expect("Unable to create instance sync event")
+        };
+        let last_err = unsafe { GetLastError() };
+        let _ = unsafe { CloseHandle(mutex) };
+        last_err != ERROR_ALREADY_EXISTS
+    }
+
+    struct App(PathBuf);
+
    impl InstalledApp for App {
        fn zed_version_string(&self) -> String {
-            unimplemented!()
+            format!(
+                "Zed {}{}{} – {}",
+                if *release_channel::RELEASE_CHANNEL_NAME == "stable" {
+                    "".to_string()
+                } else {
+                    format!("{} ", *release_channel::RELEASE_CHANNEL_NAME)
+                },
+                option_env!("RELEASE_VERSION").unwrap_or_default(),
+                match option_env!("ZED_COMMIT_SHA") {
+                    Some(commit_sha) => format!(" {commit_sha} "),
+                    None => "".to_string(),
+                },
+                self.0.display(),
+            )
        }
-        fn launch(&self, _ipc_url: String) -> anyhow::Result<()> {
-            unimplemented!()
+
+        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
+            if check_single_instance() {
+                std::process::Command::new(self.0.clone())
+                    .arg(ipc_url)
+                    .spawn()?;
+            } else {
+                unsafe {
+                    let pipe = CreateFileW(
+                        &HSTRING::from(format!("\\\\.\\pipe\\{}-Named-Pipe", app_identifier())),
+                        GENERIC_WRITE.0,
+                        FILE_SHARE_MODE::default(),
+                        None,
+                        OPEN_EXISTING,
+                        FILE_FLAGS_AND_ATTRIBUTES::default(),
+                        None,
+                    )?;
+                    let message = ipc_url.as_bytes();
+                    let mut bytes_written = 0;
+                    WriteFile(pipe, Some(message), Some(&mut bytes_written), None)?;
+                    CloseHandle(pipe)?;
+                }
+            }
+            Ok(())
        }
-        fn run_foreground(&self, _ipc_url: String) -> io::Result<ExitStatus> {
-            unimplemented!()
+
+        fn run_foreground(&self, ipc_url: String) -> io::Result<ExitStatus> {
+            std::process::Command::new(self.0.clone())
+                .arg(ipc_url)
+                .arg("--foreground")
+                .spawn()?
+                .wait()
        }
    }

    impl Detect {
-        pub fn detect(_path: Option<&Path>) -> anyhow::Result<impl InstalledApp> {
-            Ok(App)
+        pub fn detect(path: Option<&Path>) -> anyhow::Result<impl InstalledApp> {
+            let path = if let Some(path) = path {
+                path.to_path_buf().canonicalize()?
+            } else {
+                std::env::current_exe()?
+                    .parent()
+                    .context("no parent path for cli")?
+                    .parent()
+                    .context("no parent path for cli folder")?
+                    .join("Zed.exe")
+            };
+
+            Ok(App(path))
        }
    }
 }
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -89,17 +89,15 @@ channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
 collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
-command_palette_hooks.workspace = true
 context_server.workspace = true
 ctor.workspace = true
-dap = { workspace = true, features = ["test-support"] }
-debugger_ui = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 extension.workspace = true
 file_finder.workspace = true
 fs = { workspace = true, features = ["test-support"] }
 git = { workspace = true, features = ["test-support"] }
+git_ui = { workspace = true, features = ["test-support"] }
 git_hosting_providers.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 hyper.workspace = true
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -469,14 +469,3 @@ CREATE TABLE IF NOT EXISTS processed_stripe_events (
 );

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

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

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

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

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

--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -1,5 +1,5 @@
 use anyhow::Context as _;
-use collections::{HashMap, HashSet};
+
 use util::ResultExt;

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

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

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

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

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

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

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

-impl Related<super::breakpoints::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Breakpoints.def()
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -451,19 +451,15 @@ async fn check_usage_limit(
        return Ok(());
    }

+    let user_id = UserId::from_proto(claims.user_id);
    let model = state.db.model(provider, model_name)?;
-    let usage = state
-        .db
-        .get_usage(
-            UserId::from_proto(claims.user_id),
-            provider,
-            model_name,
-            Utc::now(),
-        )
-        .await?;
    let free_tier = claims.free_tier_monthly_spending_limit();

-    if usage.spending_this_month >= free_tier {
+    let spending_this_month = state
+        .db
+        .get_user_spending_for_month(user_id, Utc::now())
+        .await?;
+    if spending_this_month >= free_tier {
        if !claims.has_llm_subscription {
            return Err(Error::http(
                StatusCode::PAYMENT_REQUIRED,
@@ -471,7 +467,8 @@ async fn check_usage_limit(
            ));
        }

-        if (usage.spending_this_month - free_tier) >= Cents(claims.max_monthly_spend_in_cents) {
+        let monthly_spend = spending_this_month.saturating_sub(free_tier);
+        if monthly_spend >= Cents(claims.max_monthly_spend_in_cents) {
            return Err(Error::Http(
                StatusCode::FORBIDDEN,
                "Maximum spending limit reached for this month.".to_string(),
@@ -496,6 +493,11 @@ async fn check_usage_limit(
        model.max_tokens_per_minute as usize / users_in_recent_minutes;
    let per_user_max_tokens_per_day = model.max_tokens_per_day as usize / users_in_recent_days;

+    let usage = state
+        .db
+        .get_usage(user_id, provider, model_name, Utc::now())
+        .await?;
+
    let checks = [
        (
            usage.requests_this_minute,
--- a/crates/collab/src/llm/authorization.rs
+++ b/crates/collab/src/llm/authorization.rs
@@ -27,7 +27,7 @@ fn authorize_access_to_model(
    }

    if provider == LanguageModelProvider::Anthropic {
-        if model == "claude-3-5-sonnet" {
+        if model == "claude-3-5-sonnet" || model == "claude-3-7-sonnet" {
            return Ok(());
        }

--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -427,40 +427,7 @@ impl Server {
                        app_state.config.openai_api_key.clone(),
                    )
                }
-            })
-            .add_message_handler(update_breakpoints)
-            .add_message_handler(broadcast_project_message_from_host::<proto::SetActiveDebugLine>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::RemoveActiveDebugLine>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateDebugAdapter>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::SetDebugClientCapabilities>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::ShutdownDebugClient>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapNextRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepInRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepOutRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepBackRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapContinueRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapPauseRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapDisconnectRequest>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::DapTerminateThreadsRequest>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::DapRestartRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapTerminateRequest>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateThreadStatus>)
-            .add_request_handler(forward_mutating_project_request::<proto::VariablesRequest>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::DapRestartStackFrameRequest>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::ToggleIgnoreBreakpoints>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::IgnoreBreakpointState>,
-            );
+            });

        Arc::new(server)
    }
@@ -1008,7 +975,7 @@ impl Server {
    }
 }

-impl<'a> Deref for ConnectionPoolGuard<'a> {
+impl Deref for ConnectionPoolGuard<'_> {
    type Target = ConnectionPool;

    fn deref(&self) -> &Self::Target {
@@ -1016,13 +983,13 @@ impl<'a> Deref for ConnectionPoolGuard<'a> {
    }
 }

-impl<'a> DerefMut for ConnectionPoolGuard<'a> {
+impl DerefMut for ConnectionPoolGuard<'_> {
    fn deref_mut(&mut self) -> &mut Self::Target {
        &mut self.guard
    }
 }

-impl<'a> Drop for ConnectionPoolGuard<'a> {
+impl Drop for ConnectionPoolGuard<'_> {
    fn drop(&mut self) {
        #[cfg(test)]
        self.check_invariants();
@@ -1900,18 +1867,6 @@ fn join_project_internal(
            .trace_err();
    }

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

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

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

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

-    executor.run_until_parked();
-
    // Client B joins the project
    let project_b = client_b.join_remote_project(project_id, cx_b).await;
    active_call_b
@@ -1772,6 +1772,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
                    show_parameter_hints: false,
                    show_other_hints: false,
                    show_background: false,
+                    toggle_on_modifiers_press: None,
                })
            });
        });
@@ -1787,6 +1788,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
                    show_parameter_hints: true,
                    show_other_hints: true,
                    show_background: false,
+                    toggle_on_modifiers_press: None,
                })
            });
        });
@@ -2396,202 +2398,6 @@ fn main() { let foo = other::foo(); }"};
    );
 }

-#[gpui::test]
-async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "test.txt": "one\ntwo\nthree\nfour\nfive",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let project_path = ProjectPath {
-        worktree_id,
-        path: Arc::from(Path::new(&"test.txt")),
-    };
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Client A opens an editor.
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens same editor as A.
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Client A adds breakpoint on line (1)
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-
-    // Client B adds breakpoint on line(2)
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(2, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client A removes last added breakpoint from client B
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client B removes first added breakpoint by client A
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(0, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-}
-
 #[track_caller]
 fn tab_undo_assert(
    cx_a: &mut EditorTestContext,
--- a/crates/collab/src/tests/git_tests.rs
+++ b/crates/collab/src/tests/git_tests.rs
@@ -0,0 +1,130 @@
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+
+use call::ActiveCall;
+use git::status::{FileStatus, StatusCode, TrackedStatus};
+use git_ui::project_diff::ProjectDiff;
+use gpui::{TestAppContext, VisualTestContext};
+use project::ProjectPath;
+use serde_json::json;
+use workspace::Workspace;
+
+//
+use crate::tests::TestServer;
+
+#[gpui::test]
+async fn test_project_diff(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
+    let mut server = TestServer::start(cx_a.background_executor.clone()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+    cx_a.set_name("cx_a");
+    cx_b.set_name("cx_b");
+
+    server
+        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .await;
+
+    client_a
+        .fs()
+        .insert_tree(
+            "/a",
+            json!({
+                ".git": {},
+                "changed.txt": "after\n",
+                "unchanged.txt": "unchanged\n",
+                "created.txt": "created\n",
+                "secret.pem": "secret-changed\n",
+            }),
+        )
+        .await;
+
+    client_a.fs().set_git_content_for_repo(
+        Path::new("/a/.git"),
+        &[
+            ("changed.txt".into(), "before\n".to_string(), None),
+            ("unchanged.txt".into(), "unchanged\n".to_string(), None),
+            ("deleted.txt".into(), "deleted\n".to_string(), None),
+            ("secret.pem".into(), "shh\n".to_string(), None),
+        ],
+    );
+    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
+    let active_call_a = cx_a.read(ActiveCall::global);
+    let project_id = active_call_a
+        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
+        .await
+        .unwrap();
+
+    cx_b.update(editor::init);
+    cx_b.update(git_ui::init);
+    let project_b = client_b.join_remote_project(project_id, cx_b).await;
+    let workspace_b = cx_b.add_window(|window, cx| {
+        Workspace::new(
+            None,
+            project_b.clone(),
+            client_b.app_state.clone(),
+            window,
+            cx,
+        )
+    });
+    let cx_b = &mut VisualTestContext::from_window(*workspace_b, cx_b);
+    let workspace_b = workspace_b.root(cx_b).unwrap();
+
+    cx_b.update(|window, cx| {
+        window
+            .focused(cx)
+            .unwrap()
+            .dispatch_action(&git_ui::project_diff::Diff, window, cx)
+    });
+    let diff = workspace_b.update(cx_b, |workspace, cx| {
+        workspace.active_item(cx).unwrap().act_as::<ProjectDiff>(cx)
+    });
+    let diff = diff.unwrap();
+    cx_b.run_until_parked();
+
+    diff.update(cx_b, |diff, cx| {
+        assert_eq!(
+            diff.excerpt_paths(cx),
+            vec!["changed.txt", "deleted.txt", "created.txt"]
+        );
+    });
+
+    client_a
+        .fs()
+        .insert_tree(
+            "/a",
+            json!({
+                ".git": {},
+                "changed.txt": "before\n",
+                "unchanged.txt": "changed\n",
+                "created.txt": "created\n",
+                "secret.pem": "secret-changed\n",
+            }),
+        )
+        .await;
+    client_a.fs().recalculate_git_status(Path::new("/a/.git"));
+    cx_b.run_until_parked();
+
+    project_b.update(cx_b, |project, cx| {
+        let project_path = ProjectPath {
+            worktree_id,
+            path: Arc::from(PathBuf::from("unchanged.txt")),
+        };
+        let status = project.project_path_git_status(&project_path, cx);
+        assert_eq!(
+            status.unwrap(),
+            FileStatus::Tracked(TrackedStatus {
+                worktree_status: StatusCode::Modified,
+                index_status: StatusCode::Unmodified,
+            })
+        );
+    });
+
+    diff.update(cx_b, |diff, cx| {
+        assert_eq!(
+            diff.excerpt_paths(cx),
+            vec!["deleted.txt", "unchanged.txt", "created.txt"]
+        );
+    });
+}
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6354,7 +6354,7 @@ async fn test_preview_tabs(cx: &mut TestAppContext) {
    // Open item 1 as preview
    workspace
        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_1.clone(), None, true, true, window, cx)
+            workspace.open_path_preview(path_1.clone(), None, true, true, true, window, cx)
        })
        .await
        .unwrap();
@@ -6375,7 +6375,7 @@ async fn test_preview_tabs(cx: &mut TestAppContext) {
    // Open item 2 as preview
    workspace
        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, window, cx)
+            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
        })
        .await
        .unwrap();
@@ -6507,7 +6507,7 @@ async fn test_preview_tabs(cx: &mut TestAppContext) {
    // Open item 2 as preview in right pane
    workspace
        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, window, cx)
+            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
        })
        .await
        .unwrap();
@@ -6545,7 +6545,7 @@ async fn test_preview_tabs(cx: &mut TestAppContext) {
    // Open item 2 as preview in left pane
    workspace
        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, window, cx)
+            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
        })
        .await
        .unwrap();
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -27,7 +27,7 @@ impl<'de> Deserialize<'de> for ChatPanelButton {
    {
        struct Visitor;

-        impl<'de> serde::de::Visitor<'de> for Visitor {
+        impl serde::de::Visitor<'_> for Visitor {
            type Value = ChatPanelButton;

            fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
--- a/crates/component/Cargo.toml
+++ b/crates/component/Cargo.toml
@@ -15,7 +15,6 @@ path = "src/component.rs"
 collections.workspace = true
 gpui.workspace = true
 linkme.workspace = true
-once_cell.workspace = true
 parking_lot.workspace = true
 theme.workspace = true

--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -1,9 +1,9 @@
 use std::ops::{Deref, DerefMut};
+use std::sync::LazyLock;

 use collections::HashMap;
 use gpui::{div, prelude::*, px, AnyElement, App, IntoElement, RenderOnce, SharedString, Window};
 use linkme::distributed_slice;
-use once_cell::sync::Lazy;
 use parking_lot::RwLock;
 use theme::ActiveTheme;

@@ -27,8 +27,8 @@ pub static __ALL_COMPONENTS: [fn()] = [..];
 #[distributed_slice]
 pub static __ALL_PREVIEWS: [fn()] = [..];

-pub static COMPONENT_DATA: Lazy<RwLock<ComponentRegistry>> =
-    Lazy::new(|| RwLock::new(ComponentRegistry::new()));
+pub static COMPONENT_DATA: LazyLock<RwLock<ComponentRegistry>> =
+    LazyLock::new(|| RwLock::new(ComponentRegistry::new()));

 pub struct ComponentRegistry {
    components: Vec<(Option<&'static str>, &'static str, Option<&'static str>)>,
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -14,6 +14,7 @@ path = "src/context_server.rs"
 [dependencies]
 anyhow.workspace = true
 assistant_tool.workspace = true
+async-trait.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 context_server_settings.workspace = true
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -1,16 +1,12 @@
-use anyhow::{anyhow, Context as _, Result};
+use anyhow::{anyhow, Context, Result};
 use collections::HashMap;
-use futures::{channel::oneshot, io::BufWriter, select, AsyncRead, AsyncWrite, FutureExt};
+use futures::{channel::oneshot, select, FutureExt, StreamExt};
 use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, Task};
 use parking_lot::Mutex;
 use postage::barrier;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::{value::RawValue, Value};
-use smol::{
-    channel,
-    io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-    process::Child,
-};
+use smol::channel;
 use std::{
    fmt,
    path::PathBuf,
@@ -22,6 +18,8 @@ use std::{
 };
 use util::TryFutureExt;

+use crate::transport::{StdioTransport, Transport};
+
 const JSON_RPC_VERSION: &str = "2.0";
 const REQUEST_TIMEOUT: Duration = Duration::from_secs(60);

@@ -55,7 +53,8 @@ pub struct Client {
    #[allow(dead_code)]
    output_done_rx: Mutex<Option<barrier::Receiver>>,
    executor: BackgroundExecutor,
-    server: Arc<Mutex<Option<Child>>>,
+    #[allow(dead_code)]
+    transport: Arc<dyn Transport>,
 }

 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -152,25 +151,13 @@ impl Client {
            &binary.args
        );

-        let mut command = util::command::new_smol_command(&binary.executable);
-        command
-            .args(&binary.args)
-            .envs(binary.env.unwrap_or_default())
-            .stdin(std::process::Stdio::piped())
-            .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::piped())
-            .kill_on_drop(true);
+        let server_name = binary
+            .executable
+            .file_name()
+            .map(|name| name.to_string_lossy().to_string())
+            .unwrap_or_else(String::new);

-        let mut server = command.spawn().with_context(|| {
-            format!(
-                "failed to spawn command. (path={:?}, args={:?})",
-                binary.executable, &binary.args
-            )
-        })?;
-
-        let stdin = server.stdin.take().unwrap();
-        let stdout = server.stdout.take().unwrap();
-        let stderr = server.stderr.take().unwrap();
+        let transport = Arc::new(StdioTransport::new(binary, &cx)?);

        let (outbound_tx, outbound_rx) = channel::unbounded::<String>();
        let (output_done_tx, output_done_rx) = barrier::channel();
@@ -183,18 +170,22 @@ impl Client {
        let stdout_input_task = cx.spawn({
            let notification_handlers = notification_handlers.clone();
            let response_handlers = response_handlers.clone();
+            let transport = transport.clone();
            move |cx| {
-                Self::handle_input(stdout, notification_handlers, response_handlers, cx).log_err()
+                Self::handle_input(transport, notification_handlers, response_handlers, cx)
+                    .log_err()
            }
        });
-        let stderr_input_task = cx.spawn(|_| Self::handle_stderr(stderr).log_err());
+        let stderr_input_task = cx.spawn(|_| Self::handle_stderr(transport.clone()).log_err());
        let input_task = cx.spawn(|_| async move {
            let (stdout, stderr) = futures::join!(stdout_input_task, stderr_input_task);
            stdout.or(stderr)
        });
+
        let output_task = cx.background_spawn({
+            let transport = transport.clone();
            Self::handle_output(
-                stdin,
+                transport,
                outbound_rx,
                output_done_tx,
                response_handlers.clone(),
@@ -202,24 +193,18 @@ impl Client {
            .log_err()
        });

-        let mut context_server = Self {
+        Ok(Self {
            server_id,
            notification_handlers,
            response_handlers,
-            name: "".into(),
+            name: server_name.into(),
            next_id: Default::default(),
            outbound_tx,
            executor: cx.background_executor().clone(),
            io_tasks: Mutex::new(Some((input_task, output_task))),
            output_done_rx: Mutex::new(Some(output_done_rx)),
-            server: Arc::new(Mutex::new(Some(server))),
-        };
-
-        if let Some(name) = binary.executable.file_name() {
-            context_server.name = name.to_string_lossy().into();
-        }
-
-        Ok(context_server)
+            transport,
+        })
    }

    /// Handles input from the server's stdout.
@@ -228,79 +213,53 @@ impl Client {
    /// parses them as JSON-RPC responses or notifications, and dispatches them
    /// to the appropriate handlers. It processes both responses (which are matched
    /// to pending requests) and notifications (which trigger registered handlers).
-    async fn handle_input<Stdout>(
-        stdout: Stdout,
+    async fn handle_input(
+        transport: Arc<dyn Transport>,
        notification_handlers: Arc<Mutex<HashMap<&'static str, NotificationHandler>>>,
        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
        cx: AsyncApp,
-    ) -> anyhow::Result<()>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stdout = BufReader::new(stdout);
-        let mut buffer = String::new();
+    ) -> anyhow::Result<()> {
+        let mut receiver = transport.receive();

-        loop {
-            buffer.clear();
-            if stdout.read_line(&mut buffer).await? == 0 {
-                return Ok(());
-            }
-
-            let content = buffer.trim();
-
-            if !content.is_empty() {
-                if let Ok(response) = serde_json::from_str::<AnyResponse>(content) {
-                    if let Some(handlers) = response_handlers.lock().as_mut() {
-                        if let Some(handler) = handlers.remove(&response.id) {
-                            handler(Ok(content.to_string()));
-                        }
-                    }
-                } else if let Ok(notification) = serde_json::from_str::<AnyNotification>(content) {
-                    let mut notification_handlers = notification_handlers.lock();
-                    if let Some(handler) =
-                        notification_handlers.get_mut(notification.method.as_str())
-                    {
-                        handler(notification.params.unwrap_or(Value::Null), cx.clone());
+        while let Some(message) = receiver.next().await {
+            if let Ok(response) = serde_json::from_str::<AnyResponse>(&message) {
+                if let Some(handlers) = response_handlers.lock().as_mut() {
+                    if let Some(handler) = handlers.remove(&response.id) {
+                        handler(Ok(message.to_string()));
                    }
                }
+            } else if let Ok(notification) = serde_json::from_str::<AnyNotification>(&message) {
+                let mut notification_handlers = notification_handlers.lock();
+                if let Some(handler) = notification_handlers.get_mut(notification.method.as_str()) {
+                    handler(notification.params.unwrap_or(Value::Null), cx.clone());
+                }
            }
-
-            smol::future::yield_now().await;
        }
+
+        smol::future::yield_now().await;
+
+        Ok(())
    }

    /// Handles the stderr output from the context server.
    /// Continuously reads and logs any error messages from the server.
-    async fn handle_stderr<Stderr>(stderr: Stderr) -> anyhow::Result<()>
-    where
-        Stderr: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stderr = BufReader::new(stderr);
-        let mut buffer = String::new();
-
-        loop {
-            buffer.clear();
-            if stderr.read_line(&mut buffer).await? == 0 {
-                return Ok(());
-            }
-            log::warn!("context server stderr: {}", buffer.trim());
-            smol::future::yield_now().await;
+    async fn handle_stderr(transport: Arc<dyn Transport>) -> anyhow::Result<()> {
+        while let Some(err) = transport.receive_err().next().await {
+            log::warn!("context server stderr: {}", err.trim());
        }
+
+        Ok(())
    }

    /// Handles the output to the context server's stdin.
    /// This function continuously receives messages from the outbound channel,
    /// writes them to the server's stdin, and manages the lifecycle of response handlers.
-    async fn handle_output<Stdin>(
-        stdin: Stdin,
+    async fn handle_output(
+        transport: Arc<dyn Transport>,
        outbound_rx: channel::Receiver<String>,
        output_done_tx: barrier::Sender,
        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-    ) -> anyhow::Result<()>
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-    {
-        let mut stdin = BufWriter::new(stdin);
+    ) -> anyhow::Result<()> {
        let _clear_response_handlers = util::defer({
            let response_handlers = response_handlers.clone();
            move || {
@@ -309,10 +268,7 @@ impl Client {
        });
        while let Ok(message) = outbound_rx.recv().await {
            log::trace!("outgoing message: {}", message);
-
-            stdin.write_all(message.as_bytes()).await?;
-            stdin.write_all(b"\n").await?;
-            stdin.flush().await?;
+            transport.send(message).await?;
        }
        drop(output_done_tx);
        Ok(())
@@ -416,14 +372,6 @@ impl Client {
    }
 }

-impl Drop for Client {
-    fn drop(&mut self) {
-        if let Some(mut server) = self.server.lock().take() {
-            let _ = server.kill();
-        }
-    }
-}
-
 impl fmt::Display for ContextServerId {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        self.0.fmt(f)
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -4,6 +4,7 @@ mod extension_context_server;
 pub mod manager;
 pub mod protocol;
 mod registry;
+mod transport;
 pub mod types;

 use command_palette_hooks::CommandPaletteFilter;
--- a/crates/context_server/src/transport.rs
+++ b/crates/context_server/src/transport.rs
@@ -0,0 +1,16 @@
+mod stdio_transport;
+
+use std::pin::Pin;
+
+use anyhow::Result;
+use async_trait::async_trait;
+use futures::Stream;
+
+pub use stdio_transport::*;
+
+#[async_trait]
+pub trait Transport: Send + Sync {
+    async fn send(&self, message: String) -> Result<()>;
+    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>>;
+    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>>;
+}
--- a/crates/context_server/src/transport/stdio_transport.rs
+++ b/crates/context_server/src/transport/stdio_transport.rs
@@ -0,0 +1,140 @@
+use std::pin::Pin;
+
+use anyhow::{Context as _, Result};
+use async_trait::async_trait;
+use futures::io::{BufReader, BufWriter};
+use futures::{
+    AsyncBufReadExt as _, AsyncRead, AsyncWrite, AsyncWriteExt as _, Stream, StreamExt as _,
+};
+use gpui::AsyncApp;
+use smol::channel;
+use smol::process::Child;
+use util::TryFutureExt as _;
+
+use crate::client::ModelContextServerBinary;
+use crate::transport::Transport;
+
+pub struct StdioTransport {
+    stdout_sender: channel::Sender<String>,
+    stdin_receiver: channel::Receiver<String>,
+    stderr_receiver: channel::Receiver<String>,
+    server: Child,
+}
+
+impl StdioTransport {
+    pub fn new(binary: ModelContextServerBinary, cx: &AsyncApp) -> Result<Self> {
+        let mut command = util::command::new_smol_command(&binary.executable);
+        command
+            .args(&binary.args)
+            .envs(binary.env.unwrap_or_default())
+            .stdin(std::process::Stdio::piped())
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped())
+            .kill_on_drop(true);
+
+        let mut server = command.spawn().with_context(|| {
+            format!(
+                "failed to spawn command. (path={:?}, args={:?})",
+                binary.executable, &binary.args
+            )
+        })?;
+
+        let stdin = server.stdin.take().unwrap();
+        let stdout = server.stdout.take().unwrap();
+        let stderr = server.stderr.take().unwrap();
+
+        let (stdin_sender, stdin_receiver) = channel::unbounded::<String>();
+        let (stdout_sender, stdout_receiver) = channel::unbounded::<String>();
+        let (stderr_sender, stderr_receiver) = channel::unbounded::<String>();
+
+        cx.spawn(|_| Self::handle_output(stdin, stdout_receiver).log_err())
+            .detach();
+
+        cx.spawn(|_| async move { Self::handle_input(stdout, stdin_sender).await })
+            .detach();
+
+        cx.spawn(|_| async move { Self::handle_err(stderr, stderr_sender).await })
+            .detach();
+
+        Ok(Self {
+            stdout_sender,
+            stdin_receiver,
+            stderr_receiver,
+            server,
+        })
+    }
+
+    async fn handle_input<Stdout>(stdin: Stdout, inbound_rx: channel::Sender<String>)
+    where
+        Stdout: AsyncRead + Unpin + Send + 'static,
+    {
+        let mut stdin = BufReader::new(stdin);
+        let mut line = String::new();
+        while let Ok(n) = stdin.read_line(&mut line).await {
+            if n == 0 {
+                break;
+            }
+            if inbound_rx.send(line.clone()).await.is_err() {
+                break;
+            }
+            line.clear();
+        }
+    }
+
+    async fn handle_output<Stdin>(
+        stdin: Stdin,
+        outbound_rx: channel::Receiver<String>,
+    ) -> Result<()>
+    where
+        Stdin: AsyncWrite + Unpin + Send + 'static,
+    {
+        let mut stdin = BufWriter::new(stdin);
+        let mut pinned_rx = Box::pin(outbound_rx);
+        while let Some(message) = pinned_rx.next().await {
+            log::trace!("outgoing message: {}", message);
+
+            stdin.write_all(message.as_bytes()).await?;
+            stdin.write_all(b"\n").await?;
+            stdin.flush().await?;
+        }
+        Ok(())
+    }
+
+    async fn handle_err<Stderr>(stderr: Stderr, stderr_tx: channel::Sender<String>)
+    where
+        Stderr: AsyncRead + Unpin + Send + 'static,
+    {
+        let mut stderr = BufReader::new(stderr);
+        let mut line = String::new();
+        while let Ok(n) = stderr.read_line(&mut line).await {
+            if n == 0 {
+                break;
+            }
+            if stderr_tx.send(line.clone()).await.is_err() {
+                break;
+            }
+            line.clear();
+        }
+    }
+}
+
+#[async_trait]
+impl Transport for StdioTransport {
+    async fn send(&self, message: String) -> Result<()> {
+        Ok(self.stdout_sender.send(message).await?)
+    }
+
+    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
+        Box::pin(self.stdin_receiver.clone())
+    }
+
+    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
+        Box::pin(self.stderr_receiver.clone())
+    }
+}
+
+impl Drop for StdioTransport {
+    fn drop(&mut self) {
+        let _ = self.server.kill();
+    }
+}
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -475,6 +475,7 @@ impl Copilot {
                binary,
                root_path,
                None,
+                Default::default(),
                cx.clone(),
            )?;

--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -40,6 +40,8 @@ pub enum Model {
    O3Mini,
    #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")]
    Claude3_5Sonnet,
+    #[serde(alias = "claude-3-7-sonnet", rename = "claude-3.7-sonnet")]
+    Claude3_7Sonnet,
    #[serde(alias = "gemini-2.0-flash", rename = "gemini-2.0-flash-001")]
    Gemini20Flash,
 }
@@ -47,7 +49,11 @@ pub enum Model {
 impl Model {
    pub fn uses_streaming(&self) -> bool {
        match self {
-            Self::Gpt4o | Self::Gpt4 | Self::Gpt3_5Turbo | Self::Claude3_5Sonnet => true,
+            Self::Gpt4o
+            | Self::Gpt4
+            | Self::Gpt3_5Turbo
+            | Self::Claude3_5Sonnet
+            | Self::Claude3_7Sonnet => true,
            Self::O3Mini | Self::O1 | Self::Gemini20Flash => false,
        }
    }
@@ -60,6 +66,7 @@ impl Model {
            "o1" => Ok(Self::O1),
            "o3-mini" => Ok(Self::O3Mini),
            "claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet),
+            "claude-3-7-sonnet" => Ok(Self::Claude3_7Sonnet),
            "gemini-2.0-flash-001" => Ok(Self::Gemini20Flash),
            _ => Err(anyhow!("Invalid model id: {}", id)),
        }
@@ -73,6 +80,7 @@ impl Model {
            Self::O3Mini => "o3-mini",
            Self::O1 => "o1",
            Self::Claude3_5Sonnet => "claude-3-5-sonnet",
+            Self::Claude3_7Sonnet => "claude-3-7-sonnet",
            Self::Gemini20Flash => "gemini-2.0-flash-001",
        }
    }
@@ -85,6 +93,7 @@ impl Model {
            Self::O3Mini => "o3-mini",
            Self::O1 => "o1",
            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
+            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
            Self::Gemini20Flash => "Gemini 2.0 Flash",
        }
    }
@@ -96,7 +105,8 @@ impl Model {
            Self::Gpt3_5Turbo => 12_288,
            Self::O3Mini => 64_000,
            Self::O1 => 20_000,
-            Self::Claude3_5Sonnet => 128_000,
+            Self::Claude3_5Sonnet => 200_000,
+            Self::Claude3_7Sonnet => 90_000,
            Model::Gemini20Flash => 128_000,
        }
    }
@@ -401,7 +411,7 @@ async fn stream_completion(

                        match serde_json::from_str::<ResponseEvent>(line) {
                            Ok(response) => {
-                                if response.choices.first().is_none()
+                                if response.choices.is_empty()
                                    || response.choices.first().unwrap().finish_reason.is_some()
                                {
                                    None
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -192,7 +192,7 @@ impl EditPredictionProvider for CopilotCompletionProvider {
    fn discard(&mut self, cx: &mut Context<Self>) {
        let settings = AllLanguageSettings::get_global(cx);

-        let copilot_enabled = settings.show_inline_completions(None, cx);
+        let copilot_enabled = settings.show_edit_predictions(None, cx);

        if !copilot_enabled {
            return;
--- a/crates/dap/Cargo.toml
+++ b/crates/dap/Cargo.toml
@@ -1,54 +0,0 @@
-[package]
-name = "dap"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "util/test-support",
-    "task/test-support",
-    "async-pipe",
-    "settings/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-async-compression.workspace = true
-async-pipe = { workspace = true, optional = true }
-async-tar.workspace = true
-async-trait.workspace = true
-client.workspace = true
-collections.workspace = true
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "bf5632dc19f806e8a435c9f04a4bfe7322badea2" }
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-language.workspace = true
-log.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-sysinfo.workspace = true
-task.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-async-pipe.workspace = true
-env_logger.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-task = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
--- a/crates/dap/LICENSE-GPL
+++ b/crates/dap/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/dap/docs/breakpoints.md
+++ b/crates/dap/docs/breakpoints.md
@@ -1,9 +0,0 @@
-# Overview
-
-The active `Project` is responsible for maintain opened and closed breakpoints
-as well as serializing breakpoints to save. At a high level project serializes
-the positions of breakpoints that don't belong to any active buffers and handles
-converting breakpoints from serializing to active whenever a buffer is opened/closed.
-
-`Project` also handles sending all relevant breakpoint information to debug adapter's
-during debugging or when starting a debugger.
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -1,391 +0,0 @@
-use ::fs::Fs;
-use anyhow::{anyhow, Context as _, Ok, Result};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use async_trait::async_trait;
-use futures::io::BufReader;
-use gpui::{AsyncApp, SharedString};
-pub use http_client::{github::latest_github_release, HttpClient};
-use language::LanguageToolchainStore;
-use node_runtime::NodeRuntime;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use settings::WorktreeId;
-use smol::{self, fs::File, lock::Mutex};
-use std::{
-    collections::{HashMap, HashSet},
-    ffi::{OsStr, OsString},
-    fmt::Debug,
-    net::Ipv4Addr,
-    ops::Deref,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use sysinfo::{Pid, Process};
-use task::DebugAdapterConfig;
-use util::ResultExt;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum DapStatus {
-    None,
-    CheckingForUpdate,
-    Downloading,
-    Failed { error: String },
-}
-
-#[async_trait(?Send)]
-pub trait DapDelegate {
-    fn worktree_id(&self) -> WorktreeId;
-    fn http_client(&self) -> Arc<dyn HttpClient>;
-    fn node_runtime(&self) -> NodeRuntime;
-    fn toolchain_store(&self) -> Arc<dyn LanguageToolchainStore>;
-    fn fs(&self) -> Arc<dyn Fs>;
-    fn updated_adapters(&self) -> Arc<Mutex<HashSet<DebugAdapterName>>>;
-    fn update_status(&self, dap_name: DebugAdapterName, status: DapStatus);
-    fn which(&self, command: &OsStr) -> Option<PathBuf>;
-    async fn shell_env(&self) -> collections::HashMap<String, String>;
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
-pub struct DebugAdapterName(pub Arc<str>);
-
-impl Deref for DebugAdapterName {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<str> for DebugAdapterName {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl AsRef<Path> for DebugAdapterName {
-    fn as_ref(&self) -> &Path {
-        Path::new(&*self.0)
-    }
-}
-
-impl std::fmt::Display for DebugAdapterName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.0, f)
-    }
-}
-
-impl From<DebugAdapterName> for SharedString {
-    fn from(name: DebugAdapterName) -> Self {
-        SharedString::from(name.0)
-    }
-}
-
-impl<'a> From<&'a str> for DebugAdapterName {
-    fn from(str: &'a str) -> DebugAdapterName {
-        DebugAdapterName(str.to_string().into())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct TcpArguments {
-    pub host: Ipv4Addr,
-    pub port: u16,
-    pub timeout: Option<u64>,
-}
-#[derive(Debug, Clone)]
-pub struct DebugAdapterBinary {
-    pub command: String,
-    pub arguments: Option<Vec<OsString>>,
-    pub envs: Option<HashMap<String, String>>,
-    pub cwd: Option<PathBuf>,
-    pub connection: Option<TcpArguments>,
-}
-
-pub struct AdapterVersion {
-    pub tag_name: String,
-    pub url: String,
-}
-
-pub enum DownloadedFileType {
-    Vsix,
-    GzipTar,
-    Zip,
-}
-
-pub struct GithubRepo {
-    pub repo_name: String,
-    pub repo_owner: String,
-}
-
-pub async fn download_adapter_from_github(
-    adapter_name: DebugAdapterName,
-    github_version: AdapterVersion,
-    file_type: DownloadedFileType,
-    delegate: &dyn DapDelegate,
-) -> Result<PathBuf> {
-    let adapter_path = paths::debug_adapters_dir().join(&adapter_name);
-    let version_path = adapter_path.join(format!("{}_{}", adapter_name, github_version.tag_name));
-    let fs = delegate.fs();
-
-    if version_path.exists() {
-        return Ok(version_path);
-    }
-
-    if !adapter_path.exists() {
-        fs.create_dir(&adapter_path.as_path())
-            .await
-            .context("Failed creating adapter path")?;
-    }
-
-    log::debug!(
-        "Downloading adapter {} from {}",
-        adapter_name,
-        &github_version.url,
-    );
-
-    let mut response = delegate
-        .http_client()
-        .get(&github_version.url, Default::default(), true)
-        .await
-        .context("Error downloading release")?;
-    if !response.status().is_success() {
-        Err(anyhow!(
-            "download failed with status {}",
-            response.status().to_string()
-        ))?;
-    }
-
-    match file_type {
-        DownloadedFileType::GzipTar => {
-            let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
-            let archive = Archive::new(decompressed_bytes);
-            archive.unpack(&version_path).await?;
-        }
-        DownloadedFileType::Zip | DownloadedFileType::Vsix => {
-            let zip_path = version_path.with_extension("zip");
-
-            let mut file = File::create(&zip_path).await?;
-            futures::io::copy(response.body_mut(), &mut file).await?;
-
-            // we cannot check the status as some adapter include files with names that trigger `Illegal byte sequence`
-            util::command::new_smol_command("unzip")
-                .arg(&zip_path)
-                .arg("-d")
-                .arg(&version_path)
-                .output()
-                .await?;
-
-            util::fs::remove_matching(&adapter_path, |entry| {
-                entry
-                    .file_name()
-                    .is_some_and(|file| file.to_string_lossy().ends_with(".zip"))
-            })
-            .await;
-        }
-    }
-
-    // remove older versions
-    util::fs::remove_matching(&adapter_path, |entry| {
-        entry.to_string_lossy() != version_path.to_string_lossy()
-    })
-    .await;
-
-    Ok(version_path)
-}
-
-pub async fn fetch_latest_adapter_version_from_github(
-    github_repo: GithubRepo,
-    delegate: &dyn DapDelegate,
-) -> Result<AdapterVersion> {
-    let release = latest_github_release(
-        &format!("{}/{}", github_repo.repo_owner, github_repo.repo_name),
-        false,
-        false,
-        delegate.http_client(),
-    )
-    .await?;
-
-    Ok(AdapterVersion {
-        tag_name: release.tag_name,
-        url: release.zipball_url,
-    })
-}
-
-#[async_trait(?Send)]
-pub trait DebugAdapter: 'static + Send + Sync {
-    fn name(&self) -> DebugAdapterName;
-
-    async fn get_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        if delegate
-            .updated_adapters()
-            .lock()
-            .await
-            .contains(&self.name())
-        {
-            log::info!("Using cached debug adapter binary {}", self.name());
-
-            if let Some(binary) = self
-                .get_installed_binary(delegate, &config, user_installed_path.clone(), cx)
-                .await
-                .log_err()
-            {
-                return Ok(binary);
-            }
-
-            log::info!(
-                "Cached binary {} is corrupt falling back to install",
-                self.name()
-            );
-        }
-
-        log::info!("Getting latest version of debug adapter {}", self.name());
-        delegate.update_status(self.name(), DapStatus::CheckingForUpdate);
-        if let Some(version) = self.fetch_latest_adapter_version(delegate).await.log_err() {
-            log::info!(
-                "Installiing latest version of debug adapter {}",
-                self.name()
-            );
-            delegate.update_status(self.name(), DapStatus::Downloading);
-            self.install_binary(version, delegate).await?;
-
-            delegate
-                .updated_adapters()
-                .lock_arc()
-                .await
-                .insert(self.name());
-        }
-
-        self.get_installed_binary(delegate, &config, user_installed_path, cx)
-            .await
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion>;
-
-    /// Installs the binary for the debug adapter.
-    /// This method is called when the adapter binary is not found or needs to be updated.
-    /// It should download and install the necessary files for the debug adapter to function.
-    async fn install_binary(
-        &self,
-        version: AdapterVersion,
-        delegate: &dyn DapDelegate,
-    ) -> Result<()>;
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary>;
-
-    /// Should return base configuration to make the debug adapter work
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value;
-
-    /// Filters out the processes that the adapter can attach to for debugging
-    fn attach_processes<'a>(
-        &self,
-        _: &'a HashMap<Pid, Process>,
-    ) -> Option<Vec<(&'a Pid, &'a Process)>> {
-        None
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeAdapter {}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeAdapter {
-    const ADAPTER_NAME: &'static str = "fake-adapter";
-
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[async_trait(?Send)]
-impl DebugAdapter for FakeAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        _: &dyn DapDelegate,
-        _: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        Ok(DebugAdapterBinary {
-            command: "command".into(),
-            arguments: None,
-            connection: None,
-            envs: None,
-            cwd: None,
-        })
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        _delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion> {
-        unimplemented!("fetch latest adapter version");
-    }
-
-    async fn install_binary(
-        &self,
-        _version: AdapterVersion,
-        _delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        unimplemented!("install binary");
-    }
-
-    async fn get_installed_binary(
-        &self,
-        _: &dyn DapDelegate,
-        _: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        unimplemented!("get installed binary");
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        use serde_json::json;
-        use task::DebugRequestType;
-
-        json!({
-            "request": match config.request {
-                DebugRequestType::Launch => "launch",
-                DebugRequestType::Attach(_) => "attach",
-            },
-            "process_id": if let DebugRequestType::Attach(attach_config) = &config.request {
-                attach_config.process_id
-            } else {
-                None
-            },
-        })
-    }
-
-    fn attach_processes<'a>(
-        &self,
-        processes: &'a HashMap<Pid, Process>,
-    ) -> Option<Vec<(&'a Pid, &'a Process)>> {
-        Some(
-            processes
-                .iter()
-                .filter(|(pid, _)| pid.as_u32() == std::process::id())
-                .collect::<Vec<_>>(),
-        )
-    }
-}
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -1,485 +0,0 @@
-use crate::{
-    adapters::DebugAdapterBinary,
-    transport::{IoKind, LogKind, TransportDelegate},
-};
-use anyhow::{anyhow, Result};
-use dap_types::{
-    messages::{Message, Response},
-    requests::Request,
-};
-use futures::{channel::oneshot, select, FutureExt as _};
-use gpui::{App, AsyncApp, BackgroundExecutor};
-use smol::channel::{Receiver, Sender};
-use std::{
-    hash::Hash,
-    sync::atomic::{AtomicU64, Ordering},
-    time::Duration,
-};
-
-#[cfg(any(test, feature = "test-support"))]
-const DAP_REQUEST_TIMEOUT: Duration = Duration::from_secs(2);
-
-#[cfg(not(any(test, feature = "test-support")))]
-const DAP_REQUEST_TIMEOUT: Duration = Duration::from_secs(12);
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[repr(transparent)]
-pub struct SessionId(pub u32);
-
-impl SessionId {
-    pub fn from_proto(client_id: u64) -> Self {
-        Self(client_id as u32)
-    }
-
-    pub fn to_proto(&self) -> u64 {
-        self.0 as u64
-    }
-}
-
-/// Represents a connection to the debug adapter process, either via stdout/stdin or a socket.
-pub struct DebugAdapterClient {
-    id: SessionId,
-    sequence_count: AtomicU64,
-    binary: DebugAdapterBinary,
-    executor: BackgroundExecutor,
-    transport_delegate: TransportDelegate,
-}
-
-pub type DapMessageHandler = Box<dyn FnMut(Message, &mut App) + 'static + Send + Sync>;
-
-impl DebugAdapterClient {
-    pub async fn start(
-        id: SessionId,
-        binary: DebugAdapterBinary,
-        message_handler: DapMessageHandler,
-        cx: AsyncApp,
-    ) -> Result<Self> {
-        let ((server_rx, server_tx), transport_delegate) =
-            TransportDelegate::start(&binary, cx.clone()).await?;
-        let this = Self {
-            id,
-            binary,
-            transport_delegate,
-            sequence_count: AtomicU64::new(1),
-            executor: cx.background_executor().clone(),
-        };
-        log::info!("Successfully connected to debug adapter");
-
-        let client_id = this.id;
-
-        // start handling events/reverse requests
-        cx.update(|cx| {
-            cx.spawn({
-                let server_tx = server_tx.clone();
-                |mut cx| async move {
-                    Self::handle_receive_messages(
-                        client_id,
-                        server_rx,
-                        server_tx,
-                        message_handler,
-                        &mut cx,
-                    )
-                    .await
-                }
-            })
-            .detach_and_log_err(cx);
-
-            this
-        })
-    }
-
-    pub async fn reconnect(
-        &self,
-        session_id: SessionId,
-        binary: DebugAdapterBinary,
-        message_handler: DapMessageHandler,
-        cx: AsyncApp,
-    ) -> Result<Self> {
-        let binary = match self.transport_delegate.transport() {
-            crate::transport::Transport::Tcp(tcp_transport) => DebugAdapterBinary {
-                command: binary.command,
-                arguments: binary.arguments,
-                envs: binary.envs,
-                cwd: binary.cwd,
-                connection: Some(crate::adapters::TcpArguments {
-                    host: tcp_transport.host,
-                    port: tcp_transport.port,
-                    timeout: Some(tcp_transport.timeout),
-                }),
-            },
-            _ => self.binary.clone(),
-        };
-
-        Self::start(session_id, binary, message_handler, cx).await
-    }
-
-    async fn handle_receive_messages(
-        client_id: SessionId,
-        server_rx: Receiver<Message>,
-        client_tx: Sender<Message>,
-        mut message_handler: DapMessageHandler,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let result = loop {
-            let message = match server_rx.recv().await {
-                Ok(message) => message,
-                Err(e) => break Err(e.into()),
-            };
-
-            if let Err(e) = match message {
-                Message::Event(ev) => {
-                    log::debug!("Client {} received event `{}`", client_id.0, &ev);
-
-                    cx.update(|cx| message_handler(Message::Event(ev), cx))
-                }
-                Message::Request(req) => cx.update(|cx| message_handler(Message::Request(req), cx)),
-                Message::Response(response) => {
-                    log::debug!("Received response after request timeout: {:#?}", response);
-
-                    Ok(())
-                }
-            } {
-                break Err(e);
-            }
-
-            smol::future::yield_now().await;
-        };
-
-        drop(client_tx);
-
-        log::debug!("Handle receive messages dropped");
-
-        result
-    }
-
-    /// Send a request to an adapter and get a response back
-    /// Note: This function will block until a response is sent back from the adapter
-    pub async fn request<R: Request>(&self, arguments: R::Arguments) -> Result<R::Response> {
-        let serialized_arguments = serde_json::to_value(arguments)?;
-
-        let (callback_tx, callback_rx) = oneshot::channel::<Result<Response>>();
-
-        let sequence_id = self.next_sequence_id();
-
-        let request = crate::messages::Request {
-            seq: sequence_id,
-            command: R::COMMAND.to_string(),
-            arguments: Some(serialized_arguments),
-        };
-
-        self.transport_delegate
-            .add_pending_request(sequence_id, callback_tx)
-            .await;
-
-        log::debug!(
-            "Client {} send `{}` request with sequence_id: {}",
-            self.id.0,
-            R::COMMAND.to_string(),
-            sequence_id
-        );
-
-        self.send_message(Message::Request(request)).await?;
-
-        let mut timeout = self.executor.timer(DAP_REQUEST_TIMEOUT).fuse();
-        let command = R::COMMAND.to_string();
-
-        select! {
-            response = callback_rx.fuse() => {
-                log::debug!(
-                    "Client {} received response for: `{}` sequence_id: {}",
-                    self.id.0,
-                    command,
-                    sequence_id
-                );
-
-                let response = response??;
-                match response.success {
-                    true => Ok(serde_json::from_value(response.body.unwrap_or_default())?),
-                    false => Err(anyhow!("Request failed")),
-                }
-            }
-
-            _ = timeout => {
-                self.transport_delegate.cancel_pending_request(&sequence_id).await;
-                log::error!("Cancelled DAP request for {command:?} id {sequence_id} which took over {DAP_REQUEST_TIMEOUT:?}");
-                anyhow::bail!("DAP request timeout");
-            }
-        }
-    }
-
-    pub async fn send_message(&self, message: Message) -> Result<()> {
-        self.transport_delegate.send_message(message).await
-    }
-
-    pub fn id(&self) -> SessionId {
-        self.id
-    }
-
-    pub fn binary(&self) -> &DebugAdapterBinary {
-        &self.binary
-    }
-
-    /// Get the next sequence id to be used in a request
-    pub fn next_sequence_id(&self) -> u64 {
-        self.sequence_count.fetch_add(1, Ordering::Relaxed)
-    }
-
-    pub async fn shutdown(&self) -> Result<()> {
-        self.transport_delegate.shutdown().await
-    }
-
-    pub fn has_adapter_logs(&self) -> bool {
-        self.transport_delegate.has_adapter_logs()
-    }
-
-    pub fn add_log_handler<F>(&self, f: F, kind: LogKind)
-    where
-        F: 'static + Send + FnMut(IoKind, &str),
-    {
-        self.transport_delegate.add_log_handler(f, kind);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn on_request<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static
-            + Send
-            + FnMut(u64, R::Arguments) -> Result<R::Response, dap_types::ErrorResponse>,
-    {
-        let transport = self.transport_delegate.transport().as_fake();
-        transport.on_request::<R, F>(handler).await;
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_reverse_request<R: dap_types::requests::Request>(&self, args: R::Arguments) {
-        self.send_message(Message::Request(dap_types::messages::Request {
-            seq: self.sequence_count.load(Ordering::Relaxed),
-            command: R::COMMAND.into(),
-            arguments: serde_json::to_value(args).ok(),
-        }))
-        .await
-        .unwrap();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn on_response<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static + Send + Fn(Response),
-    {
-        let transport = self.transport_delegate.transport().as_fake();
-        transport.on_response::<R, F>(handler).await;
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_event(&self, event: dap_types::messages::Events) {
-        self.send_message(Message::Event(Box::new(event)))
-            .await
-            .unwrap();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{client::DebugAdapterClient, debugger_settings::DebuggerSettings};
-    use dap_types::{
-        messages::Events,
-        requests::{Initialize, Request, RunInTerminal},
-        Capabilities, InitializeRequestArguments, InitializeRequestArgumentsPathFormat,
-        RunInTerminalRequestArguments,
-    };
-    use gpui::TestAppContext;
-    use serde_json::json;
-    use settings::{Settings, SettingsStore};
-    use std::sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    };
-
-    pub fn init_test(cx: &mut gpui::TestAppContext) {
-        if std::env::var("RUST_LOG").is_ok() {
-            env_logger::try_init().ok();
-        }
-
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-            DebuggerSettings::register(cx);
-        });
-    }
-
-    #[gpui::test]
-    pub async fn test_initialize_client(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: "command".into(),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-            },
-            Box::new(|_, _| panic!("Did not expect to hit this code path")),
-            cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        client
-            .on_request::<Initialize, _>(move |_, _| {
-                Ok(dap_types::Capabilities {
-                    supports_configuration_done_request: Some(true),
-                    ..Default::default()
-                })
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        let response = client
-            .request::<Initialize>(InitializeRequestArguments {
-                client_id: Some("zed".to_owned()),
-                client_name: Some("Zed".to_owned()),
-                adapter_id: "fake-adapter".to_owned(),
-                locale: Some("en-US".to_owned()),
-                path_format: Some(InitializeRequestArgumentsPathFormat::Path),
-                supports_variable_type: Some(true),
-                supports_variable_paging: Some(false),
-                supports_run_in_terminal_request: Some(true),
-                supports_memory_references: Some(true),
-                supports_progress_reporting: Some(false),
-                supports_invalidated_event: Some(false),
-                lines_start_at1: Some(true),
-                columns_start_at1: Some(true),
-                supports_memory_event: Some(false),
-                supports_args_can_be_interpreted_by_shell: Some(false),
-                supports_start_debugging_request: Some(true),
-            })
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        assert_eq!(
-            dap_types::Capabilities {
-                supports_configuration_done_request: Some(true),
-                ..Default::default()
-            },
-            response
-        );
-
-        client.shutdown().await.unwrap();
-    }
-
-    #[gpui::test]
-    pub async fn test_calls_event_handler(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let called_event_handler = Arc::new(AtomicBool::new(false));
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: "command".into(),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-            },
-            Box::new({
-                let called_event_handler = called_event_handler.clone();
-                move |event, _| {
-                    called_event_handler.store(true, Ordering::SeqCst);
-
-                    assert_eq!(
-                        Message::Event(Box::new(Events::Initialized(
-                            Some(Capabilities::default())
-                        ))),
-                        event
-                    );
-                }
-            }),
-            cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        client
-            .fake_event(Events::Initialized(Some(Capabilities::default())))
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(
-            called_event_handler.load(std::sync::atomic::Ordering::SeqCst),
-            "Event handler was not called"
-        );
-
-        client.shutdown().await.unwrap();
-    }
-
-    #[gpui::test]
-    pub async fn test_calls_event_handler_for_reverse_request(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let called_event_handler = Arc::new(AtomicBool::new(false));
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: "command".into(),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-            },
-            Box::new({
-                let called_event_handler = called_event_handler.clone();
-                move |event, _| {
-                    called_event_handler.store(true, Ordering::SeqCst);
-
-                    assert_eq!(
-                        Message::Request(dap_types::messages::Request {
-                            seq: 1,
-                            command: RunInTerminal::COMMAND.into(),
-                            arguments: Some(json!({
-                                "cwd": "/project/path/src",
-                                "args": ["node", "test.js"],
-                            }))
-                        }),
-                        event
-                    );
-                }
-            }),
-            cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        client
-            .fake_reverse_request::<RunInTerminal>(RunInTerminalRequestArguments {
-                kind: None,
-                title: None,
-                cwd: "/project/path/src".into(),
-                args: vec!["node".into(), "test.js".into()],
-                env: None,
-                args_can_be_interpreted_by_shell: None,
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(
-            called_event_handler.load(std::sync::atomic::Ordering::SeqCst),
-            "Event handler was not called"
-        );
-
-        client.shutdown().await.unwrap();
-    }
-}
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -1,59 +0,0 @@
-use dap_types::SteppingGranularity;
-use gpui::{App, Global};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
-
-#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy)]
-#[serde(default)]
-pub struct DebuggerSettings {
-    /// Determines the stepping granularity.
-    ///
-    /// Default: line
-    pub stepping_granularity: SteppingGranularity,
-    /// Whether the breakpoints should be reused across Zed sessions.
-    ///
-    /// Default: true
-    pub save_breakpoints: bool,
-    /// Whether to show the debug button in the status bar.
-    ///
-    /// Default: true
-    pub button: bool,
-    /// Time in milliseconds until timeout error when connecting to a TCP debug adapter
-    ///
-    /// Default: 2000ms
-    pub timeout: u64,
-    /// Whether to log messages between active debug adapters and Zed
-    ///
-    /// Default: true
-    pub log_dap_communications: bool,
-    /// Whether to format dap messages in when adding them to debug adapter logger
-    ///
-    /// Default: true
-    pub format_dap_log_messages: bool,
-}
-
-impl Default for DebuggerSettings {
-    fn default() -> Self {
-        Self {
-            button: true,
-            save_breakpoints: true,
-            stepping_granularity: SteppingGranularity::Line,
-            timeout: 2000,
-            log_dap_communications: true,
-            format_dap_log_messages: true,
-        }
-    }
-}
-
-impl Settings for DebuggerSettings {
-    const KEY: Option<&'static str> = Some("debugger");
-
-    type FileContent = Self;
-
-    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
-        sources.json_merge()
-    }
-}
-
-impl Global for DebuggerSettings {}
--- a/crates/dap/src/lib.rs
+++ b/crates/dap/src/lib.rs
@@ -1,28 +0,0 @@
-pub mod adapters;
-pub mod client;
-pub mod debugger_settings;
-pub mod proto_conversions;
-pub mod transport;
-
-pub use dap_types::*;
-pub use task::{DebugAdapterConfig, DebugAdapterKind, DebugRequestType};
-
-pub type ScopeId = u64;
-pub type VariableReference = u64;
-pub type StackFrameId = u64;
-
-#[cfg(any(test, feature = "test-support"))]
-pub use adapters::FakeAdapter;
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn test_config() -> DebugAdapterConfig {
-    DebugAdapterConfig {
-        label: "test config".into(),
-        kind: DebugAdapterKind::Fake,
-        request: DebugRequestType::Launch,
-        program: None,
-        supports_attach: false,
-        cwd: None,
-        initialize_args: None,
-    }
-}
--- a/crates/dap/src/proto_conversions.rs
+++ b/crates/dap/src/proto_conversions.rs
@@ -1,638 +0,0 @@
-use anyhow::{anyhow, Result};
-use client::proto::{
-    self, DapChecksum, DapChecksumAlgorithm, DapEvaluateContext, DapModule, DapScope,
-    DapScopePresentationHint, DapSource, DapSourcePresentationHint, DapStackFrame, DapVariable,
-    SetDebugClientCapabilities,
-};
-use dap_types::{
-    Capabilities, OutputEventCategory, OutputEventGroup, ScopePresentationHint, Source,
-};
-
-pub trait ProtoConversion {
-    type ProtoType;
-    type Output;
-
-    fn to_proto(&self) -> Self::ProtoType;
-    fn from_proto(payload: Self::ProtoType) -> Self::Output;
-}
-
-impl<T> ProtoConversion for Vec<T>
-where
-    T: ProtoConversion<Output = T>,
-{
-    type ProtoType = Vec<T::ProtoType>;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        self.iter().map(|item| item.to_proto()).collect()
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        payload
-            .into_iter()
-            .map(|item| T::from_proto(item))
-            .collect()
-    }
-}
-
-impl ProtoConversion for dap_types::Scope {
-    type ProtoType = DapScope;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            presentation_hint: self
-                .presentation_hint
-                .as_ref()
-                .map(|hint| hint.to_proto().into()),
-            variables_reference: self.variables_reference,
-            named_variables: self.named_variables,
-            indexed_variables: self.indexed_variables,
-            expensive: self.expensive,
-            source: self.source.as_ref().map(Source::to_proto),
-            line: self.line,
-            end_line: self.end_line,
-            column: self.column,
-            end_column: self.end_column,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        let presentation_hint = payload
-            .presentation_hint
-            .and_then(DapScopePresentationHint::from_i32);
-        Self {
-            name: payload.name,
-            presentation_hint: presentation_hint.map(ScopePresentationHint::from_proto),
-            variables_reference: payload.variables_reference,
-            named_variables: payload.named_variables,
-            indexed_variables: payload.indexed_variables,
-            expensive: payload.expensive,
-            source: payload.source.map(dap_types::Source::from_proto),
-            line: payload.line,
-            end_line: payload.end_line,
-            column: payload.column,
-            end_column: payload.end_column,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Variable {
-    type ProtoType = DapVariable;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            value: self.value.clone(),
-            r#type: self.type_.clone(),
-            evaluate_name: self.evaluate_name.clone(),
-            variables_reference: self.variables_reference,
-            named_variables: self.named_variables,
-            indexed_variables: self.indexed_variables,
-            memory_reference: self.memory_reference.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            name: payload.name,
-            value: payload.value,
-            type_: payload.r#type,
-            evaluate_name: payload.evaluate_name,
-            presentation_hint: None, // TODO Debugger Collab Add this
-            variables_reference: payload.variables_reference,
-            named_variables: payload.named_variables,
-            indexed_variables: payload.indexed_variables,
-            memory_reference: payload.memory_reference,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::ScopePresentationHint {
-    type ProtoType = DapScopePresentationHint;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::ScopePresentationHint::Locals => DapScopePresentationHint::Locals,
-            dap_types::ScopePresentationHint::Arguments => DapScopePresentationHint::Arguments,
-            dap_types::ScopePresentationHint::Registers => DapScopePresentationHint::Registers,
-            dap_types::ScopePresentationHint::ReturnValue => DapScopePresentationHint::ReturnValue,
-            dap_types::ScopePresentationHint::Unknown => DapScopePresentationHint::ScopeUnknown,
-            &_ => unreachable!(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapScopePresentationHint::Locals => dap_types::ScopePresentationHint::Locals,
-            DapScopePresentationHint::Arguments => dap_types::ScopePresentationHint::Arguments,
-            DapScopePresentationHint::Registers => dap_types::ScopePresentationHint::Registers,
-            DapScopePresentationHint::ReturnValue => dap_types::ScopePresentationHint::ReturnValue,
-            DapScopePresentationHint::ScopeUnknown => dap_types::ScopePresentationHint::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::SourcePresentationHint {
-    type ProtoType = DapSourcePresentationHint;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::SourcePresentationHint::Normal => DapSourcePresentationHint::SourceNormal,
-            dap_types::SourcePresentationHint::Emphasize => DapSourcePresentationHint::Emphasize,
-            dap_types::SourcePresentationHint::Deemphasize => {
-                DapSourcePresentationHint::Deemphasize
-            }
-            dap_types::SourcePresentationHint::Unknown => DapSourcePresentationHint::SourceUnknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapSourcePresentationHint::SourceNormal => dap_types::SourcePresentationHint::Normal,
-            DapSourcePresentationHint::Emphasize => dap_types::SourcePresentationHint::Emphasize,
-            DapSourcePresentationHint::Deemphasize => {
-                dap_types::SourcePresentationHint::Deemphasize
-            }
-            DapSourcePresentationHint::SourceUnknown => dap_types::SourcePresentationHint::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Checksum {
-    type ProtoType = DapChecksum;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        DapChecksum {
-            algorithm: self.algorithm.to_proto().into(),
-            checksum: self.checksum.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            algorithm: dap_types::ChecksumAlgorithm::from_proto(payload.algorithm()),
-            checksum: payload.checksum,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::ChecksumAlgorithm {
-    type ProtoType = DapChecksumAlgorithm;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::ChecksumAlgorithm::Md5 => DapChecksumAlgorithm::Md5,
-            dap_types::ChecksumAlgorithm::Sha1 => DapChecksumAlgorithm::Sha1,
-            dap_types::ChecksumAlgorithm::Sha256 => DapChecksumAlgorithm::Sha256,
-            dap_types::ChecksumAlgorithm::Timestamp => DapChecksumAlgorithm::Timestamp,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapChecksumAlgorithm::Md5 => dap_types::ChecksumAlgorithm::Md5,
-            DapChecksumAlgorithm::Sha1 => dap_types::ChecksumAlgorithm::Sha1,
-            DapChecksumAlgorithm::Sha256 => dap_types::ChecksumAlgorithm::Sha256,
-            DapChecksumAlgorithm::Timestamp => dap_types::ChecksumAlgorithm::Timestamp,
-            DapChecksumAlgorithm::ChecksumAlgorithmUnspecified => unreachable!(),
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Source {
-    type ProtoType = DapSource;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            path: self.path.clone(),
-            source_reference: self.source_reference,
-            presentation_hint: self.presentation_hint.map(|hint| hint.to_proto().into()),
-            origin: self.origin.clone(),
-            sources: self
-                .sources
-                .clone()
-                .map(|src| src.to_proto())
-                .unwrap_or_default(),
-            adapter_data: Default::default(), // TODO Debugger Collab
-            checksums: self
-                .checksums
-                .clone()
-                .map(|c| c.to_proto())
-                .unwrap_or_default(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            name: payload.name.clone(),
-            path: payload.path.clone(),
-            source_reference: payload.source_reference,
-            presentation_hint: payload
-                .presentation_hint
-                .and_then(DapSourcePresentationHint::from_i32)
-                .map(dap_types::SourcePresentationHint::from_proto),
-            origin: payload.origin.clone(),
-            sources: Some(Vec::<dap_types::Source>::from_proto(payload.sources)),
-            checksums: Some(Vec::<dap_types::Checksum>::from_proto(payload.checksums)),
-            adapter_data: None, // TODO Debugger Collab
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::StackFrame {
-    type ProtoType = DapStackFrame;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            id: self.id,
-            name: self.name.clone(),
-            source: self.source.as_ref().map(|src| src.to_proto()),
-            line: self.line,
-            column: self.column,
-            end_line: self.end_line,
-            end_column: self.end_column,
-            can_restart: self.can_restart,
-            instruction_pointer_reference: self.instruction_pointer_reference.clone(),
-            module_id: None,         // TODO Debugger Collab
-            presentation_hint: None, // TODO Debugger Collab
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            id: payload.id,
-            name: payload.name,
-            source: payload.source.map(dap_types::Source::from_proto),
-            line: payload.line,
-            column: payload.column,
-            end_line: payload.end_line,
-            end_column: payload.end_column,
-            can_restart: payload.can_restart,
-            instruction_pointer_reference: payload.instruction_pointer_reference,
-            module_id: None,         // TODO Debugger Collab
-            presentation_hint: None, // TODO Debugger Collab
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Module {
-    type ProtoType = DapModule;
-    type Output = Result<Self>;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        let id = match &self.id {
-            dap_types::ModuleId::Number(num) => proto::dap_module_id::Id::Number(*num),
-            dap_types::ModuleId::String(string) => proto::dap_module_id::Id::String(string.clone()),
-        };
-
-        DapModule {
-            id: Some(proto::DapModuleId { id: Some(id) }),
-            name: self.name.clone(),
-            path: self.path.clone(),
-            is_optimized: self.is_optimized,
-            is_user_code: self.is_user_code,
-            version: self.version.clone(),
-            symbol_status: self.symbol_status.clone(),
-            symbol_file_path: self.symbol_file_path.clone(),
-            date_time_stamp: self.date_time_stamp.clone(),
-            address_range: self.address_range.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Result<Self> {
-        let id = match payload
-            .id
-            .ok_or(anyhow!("All DapModule proto messages must have an id"))?
-            .id
-            .ok_or(anyhow!("All DapModuleID proto messages must have an id"))?
-        {
-            proto::dap_module_id::Id::String(string) => dap_types::ModuleId::String(string),
-            proto::dap_module_id::Id::Number(num) => dap_types::ModuleId::Number(num),
-        };
-
-        Ok(Self {
-            id,
-            name: payload.name,
-            path: payload.path,
-            is_optimized: payload.is_optimized,
-            is_user_code: payload.is_user_code,
-            version: payload.version,
-            symbol_status: payload.symbol_status,
-            symbol_file_path: payload.symbol_file_path,
-            date_time_stamp: payload.date_time_stamp,
-            address_range: payload.address_range,
-        })
-    }
-}
-
-pub fn capabilities_from_proto(payload: &SetDebugClientCapabilities) -> Capabilities {
-    Capabilities {
-        supports_loaded_sources_request: Some(payload.supports_loaded_sources_request),
-        supports_modules_request: Some(payload.supports_modules_request),
-        supports_restart_request: Some(payload.supports_restart_request),
-        supports_set_expression: Some(payload.supports_set_expression),
-        supports_single_thread_execution_requests: Some(
-            payload.supports_single_thread_execution_requests,
-        ),
-        supports_step_back: Some(payload.supports_step_back),
-        supports_stepping_granularity: Some(payload.supports_stepping_granularity),
-        supports_terminate_threads_request: Some(payload.supports_terminate_threads_request),
-        supports_restart_frame: Some(payload.supports_restart_frame_request),
-        supports_clipboard_context: Some(payload.supports_clipboard_context),
-        ..Default::default()
-    }
-}
-
-pub fn capabilities_to_proto(
-    capabilities: &Capabilities,
-    project_id: u64,
-    session_id: u64,
-) -> SetDebugClientCapabilities {
-    SetDebugClientCapabilities {
-        session_id,
-        project_id,
-        supports_loaded_sources_request: capabilities
-            .supports_loaded_sources_request
-            .unwrap_or_default(),
-        supports_modules_request: capabilities.supports_modules_request.unwrap_or_default(),
-        supports_restart_request: capabilities.supports_restart_request.unwrap_or_default(),
-        supports_set_expression: capabilities.supports_set_expression.unwrap_or_default(),
-        supports_single_thread_execution_requests: capabilities
-            .supports_single_thread_execution_requests
-            .unwrap_or_default(),
-        supports_step_back: capabilities.supports_step_back.unwrap_or_default(),
-        supports_stepping_granularity: capabilities
-            .supports_stepping_granularity
-            .unwrap_or_default(),
-        supports_terminate_threads_request: capabilities
-            .supports_terminate_threads_request
-            .unwrap_or_default(),
-        supports_restart_frame_request: capabilities.supports_restart_frame.unwrap_or_default(),
-        supports_clipboard_context: capabilities.supports_clipboard_context.unwrap_or_default(),
-    }
-}
-
-impl ProtoConversion for dap_types::SteppingGranularity {
-    type ProtoType = proto::SteppingGranularity;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::SteppingGranularity::Statement => proto::SteppingGranularity::Statement,
-            dap_types::SteppingGranularity::Line => proto::SteppingGranularity::Line,
-            dap_types::SteppingGranularity::Instruction => proto::SteppingGranularity::Instruction,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::SteppingGranularity::Line => dap_types::SteppingGranularity::Line,
-            proto::SteppingGranularity::Instruction => dap_types::SteppingGranularity::Instruction,
-            proto::SteppingGranularity::Statement => dap_types::SteppingGranularity::Statement,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEventCategory {
-    type ProtoType = proto::DapOutputCategory;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            Self::Console => proto::DapOutputCategory::ConsoleOutput,
-            Self::Important => proto::DapOutputCategory::Important,
-            Self::Stdout => proto::DapOutputCategory::Stdout,
-            Self::Stderr => proto::DapOutputCategory::Stderr,
-            _ => proto::DapOutputCategory::Unknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapOutputCategory::ConsoleOutput => Self::Console,
-            proto::DapOutputCategory::Important => Self::Important,
-            proto::DapOutputCategory::Stdout => Self::Stdout,
-            proto::DapOutputCategory::Stderr => Self::Stderr,
-            proto::DapOutputCategory::Unknown => Self::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEvent {
-    type ProtoType = proto::DapOutputEvent;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapOutputEvent {
-            category: self
-                .category
-                .as_ref()
-                .map(|category| category.to_proto().into()),
-            output: self.output.clone(),
-            variables_reference: self.variables_reference,
-            source: self.source.as_ref().map(|source| source.to_proto()),
-            line: self.line.map(|line| line as u32),
-            column: self.column.map(|column| column as u32),
-            group: self.group.map(|group| group.to_proto().into()),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        dap_types::OutputEvent {
-            category: payload
-                .category
-                .and_then(proto::DapOutputCategory::from_i32)
-                .map(OutputEventCategory::from_proto),
-            output: payload.output.clone(),
-            variables_reference: payload.variables_reference,
-            source: payload.source.map(Source::from_proto),
-            line: payload.line.map(|line| line as u64),
-            column: payload.column.map(|column| column as u64),
-            group: payload
-                .group
-                .and_then(proto::DapOutputEventGroup::from_i32)
-                .map(OutputEventGroup::from_proto),
-            data: None,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEventGroup {
-    type ProtoType = proto::DapOutputEventGroup;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::OutputEventGroup::Start => proto::DapOutputEventGroup::Start,
-            dap_types::OutputEventGroup::StartCollapsed => {
-                proto::DapOutputEventGroup::StartCollapsed
-            }
-            dap_types::OutputEventGroup::End => proto::DapOutputEventGroup::End,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapOutputEventGroup::Start => Self::Start,
-            proto::DapOutputEventGroup::StartCollapsed => Self::StartCollapsed,
-            proto::DapOutputEventGroup::End => Self::End,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::CompletionItem {
-    type ProtoType = proto::DapCompletionItem;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapCompletionItem {
-            label: self.label.clone(),
-            text: self.text.clone(),
-            detail: self.detail.clone(),
-            typ: self
-                .type_
-                .as_ref()
-                .map(ProtoConversion::to_proto)
-                .map(|typ| typ.into()),
-            start: self.start,
-            length: self.length,
-            selection_start: self.selection_start,
-            selection_length: self.selection_length,
-            sort_text: self.sort_text.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        let typ = payload.typ(); // todo(debugger): This might be a potential issue/bug because it defaults to a type when it's None
-
-        Self {
-            label: payload.label,
-            detail: payload.detail,
-            sort_text: payload.sort_text,
-            text: payload.text.clone(),
-            type_: Some(dap_types::CompletionItemType::from_proto(typ)),
-            start: payload.start,
-            length: payload.length,
-            selection_start: payload.selection_start,
-            selection_length: payload.selection_length,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::EvaluateArgumentsContext {
-    type ProtoType = DapEvaluateContext;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::EvaluateArgumentsContext::Variables => {
-                proto::DapEvaluateContext::EvaluateVariables
-            }
-            dap_types::EvaluateArgumentsContext::Watch => proto::DapEvaluateContext::Watch,
-            dap_types::EvaluateArgumentsContext::Hover => proto::DapEvaluateContext::Hover,
-            dap_types::EvaluateArgumentsContext::Repl => proto::DapEvaluateContext::Repl,
-            dap_types::EvaluateArgumentsContext::Clipboard => proto::DapEvaluateContext::Clipboard,
-            dap_types::EvaluateArgumentsContext::Unknown => {
-                proto::DapEvaluateContext::EvaluateUnknown
-            }
-            _ => proto::DapEvaluateContext::EvaluateUnknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapEvaluateContext::EvaluateVariables => {
-                dap_types::EvaluateArgumentsContext::Variables
-            }
-            proto::DapEvaluateContext::Watch => dap_types::EvaluateArgumentsContext::Watch,
-            proto::DapEvaluateContext::Hover => dap_types::EvaluateArgumentsContext::Hover,
-            proto::DapEvaluateContext::Repl => dap_types::EvaluateArgumentsContext::Repl,
-            proto::DapEvaluateContext::Clipboard => dap_types::EvaluateArgumentsContext::Clipboard,
-            proto::DapEvaluateContext::EvaluateUnknown => {
-                dap_types::EvaluateArgumentsContext::Unknown
-            }
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::CompletionItemType {
-    type ProtoType = proto::DapCompletionItemType;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::CompletionItemType::Class => proto::DapCompletionItemType::Class,
-            dap_types::CompletionItemType::Color => proto::DapCompletionItemType::Color,
-            dap_types::CompletionItemType::Constructor => proto::DapCompletionItemType::Constructor,
-            dap_types::CompletionItemType::Customcolor => proto::DapCompletionItemType::Customcolor,
-            dap_types::CompletionItemType::Enum => proto::DapCompletionItemType::Enum,
-            dap_types::CompletionItemType::Field => proto::DapCompletionItemType::Field,
-            dap_types::CompletionItemType::File => proto::DapCompletionItemType::CompletionItemFile,
-            dap_types::CompletionItemType::Function => proto::DapCompletionItemType::Function,
-            dap_types::CompletionItemType::Interface => proto::DapCompletionItemType::Interface,
-            dap_types::CompletionItemType::Keyword => proto::DapCompletionItemType::Keyword,
-            dap_types::CompletionItemType::Method => proto::DapCompletionItemType::Method,
-            dap_types::CompletionItemType::Module => proto::DapCompletionItemType::Module,
-            dap_types::CompletionItemType::Property => proto::DapCompletionItemType::Property,
-            dap_types::CompletionItemType::Reference => proto::DapCompletionItemType::Reference,
-            dap_types::CompletionItemType::Snippet => proto::DapCompletionItemType::Snippet,
-            dap_types::CompletionItemType::Text => proto::DapCompletionItemType::Text,
-            dap_types::CompletionItemType::Unit => proto::DapCompletionItemType::Unit,
-            dap_types::CompletionItemType::Value => proto::DapCompletionItemType::Value,
-            dap_types::CompletionItemType::Variable => proto::DapCompletionItemType::Variable,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapCompletionItemType::Class => dap_types::CompletionItemType::Class,
-            proto::DapCompletionItemType::Color => dap_types::CompletionItemType::Color,
-            proto::DapCompletionItemType::CompletionItemFile => dap_types::CompletionItemType::File,
-            proto::DapCompletionItemType::Constructor => dap_types::CompletionItemType::Constructor,
-            proto::DapCompletionItemType::Customcolor => dap_types::CompletionItemType::Customcolor,
-            proto::DapCompletionItemType::Enum => dap_types::CompletionItemType::Enum,
-            proto::DapCompletionItemType::Field => dap_types::CompletionItemType::Field,
-            proto::DapCompletionItemType::Function => dap_types::CompletionItemType::Function,
-            proto::DapCompletionItemType::Interface => dap_types::CompletionItemType::Interface,
-            proto::DapCompletionItemType::Keyword => dap_types::CompletionItemType::Keyword,
-            proto::DapCompletionItemType::Method => dap_types::CompletionItemType::Method,
-            proto::DapCompletionItemType::Module => dap_types::CompletionItemType::Module,
-            proto::DapCompletionItemType::Property => dap_types::CompletionItemType::Property,
-            proto::DapCompletionItemType::Reference => dap_types::CompletionItemType::Reference,
-            proto::DapCompletionItemType::Snippet => dap_types::CompletionItemType::Snippet,
-            proto::DapCompletionItemType::Text => dap_types::CompletionItemType::Text,
-            proto::DapCompletionItemType::Unit => dap_types::CompletionItemType::Unit,
-            proto::DapCompletionItemType::Value => dap_types::CompletionItemType::Value,
-            proto::DapCompletionItemType::Variable => dap_types::CompletionItemType::Variable,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Thread {
-    type ProtoType = proto::DapThread;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapThread {
-            id: self.id,
-            name: self.name.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            id: payload.id,
-            name: payload.name,
-        }
-    }
-}
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -1,882 +0,0 @@
-use anyhow::{anyhow, Context, Result};
-use dap_types::{
-    messages::{Message, Response},
-    ErrorResponse,
-};
-use futures::{channel::oneshot, select, AsyncRead, AsyncReadExt as _, AsyncWrite, FutureExt as _};
-use gpui::AsyncApp;
-use settings::Settings as _;
-use smallvec::SmallVec;
-use smol::{
-    channel::{unbounded, Receiver, Sender},
-    io::{AsyncBufReadExt as _, AsyncWriteExt, BufReader},
-    lock::Mutex,
-    net::{TcpListener, TcpStream},
-    process::Child,
-};
-use std::{
-    collections::HashMap,
-    net::{Ipv4Addr, SocketAddrV4},
-    process::Stdio,
-    sync::Arc,
-    time::Duration,
-};
-use task::TCPHost;
-use util::ResultExt as _;
-
-use crate::{adapters::DebugAdapterBinary, debugger_settings::DebuggerSettings};
-
-pub type IoHandler = Box<dyn Send + FnMut(IoKind, &str)>;
-
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum LogKind {
-    Adapter,
-    Rpc,
-}
-
-pub enum IoKind {
-    StdIn,
-    StdOut,
-    StdErr,
-}
-
-pub struct TransportPipe {
-    input: Box<dyn AsyncWrite + Unpin + Send + 'static>,
-    output: Box<dyn AsyncRead + Unpin + Send + 'static>,
-    stdout: Option<Box<dyn AsyncRead + Unpin + Send + 'static>>,
-    stderr: Option<Box<dyn AsyncRead + Unpin + Send + 'static>>,
-}
-
-impl TransportPipe {
-    pub fn new(
-        input: Box<dyn AsyncWrite + Unpin + Send + 'static>,
-        output: Box<dyn AsyncRead + Unpin + Send + 'static>,
-        stdout: Option<Box<dyn AsyncRead + Unpin + Send + 'static>>,
-        stderr: Option<Box<dyn AsyncRead + Unpin + Send + 'static>>,
-    ) -> Self {
-        TransportPipe {
-            input,
-            output,
-            stdout,
-            stderr,
-        }
-    }
-}
-
-type Requests = Arc<Mutex<HashMap<u64, oneshot::Sender<Result<Response>>>>>;
-type LogHandlers = Arc<parking_lot::Mutex<SmallVec<[(LogKind, IoHandler); 2]>>>;
-
-pub enum Transport {
-    Stdio(StdioTransport),
-    Tcp(TcpTransport),
-    #[cfg(any(test, feature = "test-support"))]
-    Fake(FakeTransport),
-}
-
-impl Transport {
-    async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
-        #[cfg(any(test, feature = "test-support"))]
-        return FakeTransport::start(cx)
-            .await
-            .map(|(transports, fake)| (transports, Self::Fake(fake)));
-
-        if binary.connection.is_some() {
-            TcpTransport::start(binary, cx)
-                .await
-                .map(|(transports, tcp)| (transports, Self::Tcp(tcp)))
-        } else {
-            StdioTransport::start(binary, cx)
-                .await
-                .map(|(transports, stdio)| (transports, Self::Stdio(stdio)))
-        }
-    }
-
-    fn has_adapter_logs(&self) -> bool {
-        match self {
-            Transport::Stdio(stdio_transport) => stdio_transport.has_adapter_logs(),
-            Transport::Tcp(tcp_transport) => tcp_transport.has_adapter_logs(),
-            #[cfg(any(test, feature = "test-support"))]
-            Transport::Fake(fake_transport) => fake_transport.has_adapter_logs(),
-        }
-    }
-
-    async fn kill(&self) -> Result<()> {
-        match self {
-            Transport::Stdio(stdio_transport) => stdio_transport.kill().await,
-            Transport::Tcp(tcp_transport) => tcp_transport.kill().await,
-            #[cfg(any(test, feature = "test-support"))]
-            Transport::Fake(fake_transport) => fake_transport.kill().await,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub(crate) fn as_fake(&self) -> &FakeTransport {
-        match self {
-            Transport::Fake(fake_transport) => fake_transport,
-            _ => panic!("Not a fake transport layer"),
-        }
-    }
-}
-
-pub(crate) struct TransportDelegate {
-    log_handlers: LogHandlers,
-    current_requests: Requests,
-    pending_requests: Requests,
-    transport: Transport,
-    server_tx: Arc<Mutex<Option<Sender<Message>>>>,
-}
-
-impl TransportDelegate {
-    pub(crate) async fn start(
-        binary: &DebugAdapterBinary,
-        cx: AsyncApp,
-    ) -> Result<((Receiver<Message>, Sender<Message>), Self)> {
-        let (transport_pipes, transport) = Transport::start(binary, cx.clone()).await?;
-        let mut this = Self {
-            transport,
-            server_tx: Default::default(),
-            log_handlers: Default::default(),
-            current_requests: Default::default(),
-            pending_requests: Default::default(),
-        };
-        let messages = this.start_handlers(transport_pipes, cx).await?;
-        Ok((messages, this))
-    }
-
-    async fn start_handlers(
-        &mut self,
-        mut params: TransportPipe,
-        cx: AsyncApp,
-    ) -> Result<(Receiver<Message>, Sender<Message>)> {
-        let (client_tx, server_rx) = unbounded::<Message>();
-        let (server_tx, client_rx) = unbounded::<Message>();
-
-        let log_dap_communications =
-            cx.update(|cx| DebuggerSettings::get_global(cx).log_dap_communications)
-                .with_context(|| "Failed to get Debugger Setting log dap communications error in transport::start_handlers. Defaulting to false")
-                .unwrap_or(false);
-
-        let log_handler = if log_dap_communications {
-            Some(self.log_handlers.clone())
-        } else {
-            None
-        };
-
-        cx.update(|cx| {
-            if let Some(stdout) = params.stdout.take() {
-                cx.background_executor()
-                    .spawn(Self::handle_adapter_log(stdout, log_handler.clone()))
-                    .detach_and_log_err(cx);
-            }
-
-            cx.background_executor()
-                .spawn(Self::handle_output(
-                    params.output,
-                    client_tx,
-                    self.pending_requests.clone(),
-                    log_handler.clone(),
-                ))
-                .detach_and_log_err(cx);
-
-            if let Some(stderr) = params.stderr.take() {
-                cx.background_executor()
-                    .spawn(Self::handle_error(stderr, self.log_handlers.clone()))
-                    .detach_and_log_err(cx);
-            }
-
-            cx.background_executor()
-                .spawn(Self::handle_input(
-                    params.input,
-                    client_rx,
-                    self.current_requests.clone(),
-                    self.pending_requests.clone(),
-                    log_handler.clone(),
-                ))
-                .detach_and_log_err(cx);
-        })?;
-
-        {
-            let mut lock = self.server_tx.lock().await;
-            *lock = Some(server_tx.clone());
-        }
-
-        Ok((server_rx, server_tx))
-    }
-
-    pub(crate) async fn add_pending_request(
-        &self,
-        sequence_id: u64,
-        request: oneshot::Sender<Result<Response>>,
-    ) {
-        let mut pending_requests = self.pending_requests.lock().await;
-        pending_requests.insert(sequence_id, request);
-    }
-
-    pub(crate) async fn cancel_pending_request(&self, sequence_id: &u64) {
-        let mut pending_requests = self.pending_requests.lock().await;
-        pending_requests.remove(sequence_id);
-    }
-
-    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
-                .map_err(|e| anyhow!("Failed to send message: {}", e))
-        } else {
-            Err(anyhow!("Server tx already dropped"))
-        }
-    }
-
-    async fn handle_adapter_log<Stdout>(
-        stdout: Stdout,
-        log_handlers: Option<LogHandlers>,
-    ) -> Result<()>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut reader = BufReader::new(stdout);
-        let mut line = String::new();
-
-        let result = loop {
-            line.truncate(0);
-
-            let bytes_read = match reader.read_line(&mut line).await {
-                Ok(bytes_read) => bytes_read,
-                Err(e) => break Err(e.into()),
-            };
-
-            if bytes_read == 0 {
-                break Err(anyhow!("Debugger log stream closed"));
-            }
-
-            if let Some(log_handlers) = log_handlers.as_ref() {
-                for (kind, handler) in log_handlers.lock().iter_mut() {
-                    if matches!(kind, LogKind::Adapter) {
-                        handler(IoKind::StdOut, line.as_str());
-                    }
-                }
-            }
-
-            smol::future::yield_now().await;
-        };
-
-        log::debug!("Handle adapter log dropped");
-
-        result
-    }
-
-    fn build_rpc_message(message: String) -> String {
-        format!("Content-Length: {}\r\n\r\n{}", message.len(), message)
-    }
-
-    async fn handle_input<Stdin>(
-        mut server_stdin: Stdin,
-        client_rx: Receiver<Message>,
-        current_requests: Requests,
-        pending_requests: Requests,
-        log_handlers: Option<LogHandlers>,
-    ) -> Result<()>
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-    {
-        let result = loop {
-            match client_rx.recv().await {
-                Ok(message) => {
-                    if let Message::Request(request) = &message {
-                        if let Some(sender) = current_requests.lock().await.remove(&request.seq) {
-                            pending_requests.lock().await.insert(request.seq, sender);
-                        }
-                    }
-
-                    let message = match serde_json::to_string(&message) {
-                        Ok(message) => message,
-                        Err(e) => break Err(e.into()),
-                    };
-
-                    if let Some(log_handlers) = log_handlers.as_ref() {
-                        for (kind, log_handler) in log_handlers.lock().iter_mut() {
-                            if matches!(kind, LogKind::Rpc) {
-                                log_handler(IoKind::StdIn, &message);
-                            }
-                        }
-                    }
-
-                    if let Err(e) = server_stdin
-                        .write_all(Self::build_rpc_message(message).as_bytes())
-                        .await
-                    {
-                        break Err(e.into());
-                    }
-
-                    if let Err(e) = server_stdin.flush().await {
-                        break Err(e.into());
-                    }
-                }
-                Err(error) => break Err(error.into()),
-            }
-
-            smol::future::yield_now().await;
-        };
-
-        log::debug!("Handle adapter input dropped");
-
-        result
-    }
-
-    async fn handle_output<Stdout>(
-        server_stdout: Stdout,
-        client_tx: Sender<Message>,
-        pending_requests: Requests,
-        log_handlers: Option<LogHandlers>,
-    ) -> Result<()>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut recv_buffer = String::new();
-        let mut reader = BufReader::new(server_stdout);
-
-        let result = loop {
-            let message =
-                Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
-                    .await;
-
-            match message {
-                Ok(Message::Response(res)) => {
-                    if let Some(tx) = pending_requests.lock().await.remove(&res.request_seq) {
-                        if let Err(e) = tx.send(Self::process_response(res)) {
-                            break Err(anyhow!("Failed to send response: {:?}", e));
-                        }
-                    } else {
-                        client_tx.send(Message::Response(res)).await?;
-                    };
-                }
-                Ok(message) => {
-                    client_tx.send(message).await?;
-                }
-                Err(e) => break Err(e),
-            }
-
-            smol::future::yield_now().await;
-        };
-
-        drop(client_tx);
-
-        log::debug!("Handle adapter output dropped");
-
-        result
-    }
-
-    async fn handle_error<Stderr>(stderr: Stderr, log_handlers: LogHandlers) -> Result<()>
-    where
-        Stderr: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut buffer = String::new();
-
-        let mut reader = BufReader::new(stderr);
-
-        let result = loop {
-            match reader.read_line(&mut buffer).await {
-                Ok(0) => break Err(anyhow!("debugger error stream closed")),
-                Ok(_) => {
-                    for (kind, log_handler) in log_handlers.lock().iter_mut() {
-                        if matches!(kind, LogKind::Adapter) {
-                            log_handler(IoKind::StdErr, buffer.as_str());
-                        }
-                    }
-
-                    buffer.truncate(0);
-                }
-                Err(error) => break Err(error.into()),
-            }
-
-            smol::future::yield_now().await;
-        };
-
-        log::debug!("Handle adapter error dropped");
-
-        result
-    }
-
-    fn process_response(response: Response) -> Result<Response> {
-        if response.success {
-            Ok(response)
-        } else {
-            if let Some(body) = response.body.clone() {
-                if let Ok(error) = serde_json::from_value::<ErrorResponse>(body) {
-                    if let Some(message) = error.error {
-                        return Err(anyhow!(message.format));
-                    };
-                };
-            }
-
-            Err(anyhow!(
-                "Received error response from adapter. Response: {:?}",
-                response.clone()
-            ))
-        }
-    }
-
-    async fn receive_server_message<Stdout>(
-        reader: &mut BufReader<Stdout>,
-        buffer: &mut String,
-        log_handlers: Option<&LogHandlers>,
-    ) -> Result<Message>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut content_length = None;
-        loop {
-            buffer.truncate(0);
-
-            if reader
-                .read_line(buffer)
-                .await
-                .with_context(|| "reading a message from server")?
-                == 0
-            {
-                return Err(anyhow!("debugger reader stream closed"));
-            };
-
-            if buffer == "\r\n" {
-                break;
-            }
-
-            let parts = buffer.trim().split_once(": ");
-
-            match parts {
-                Some(("Content-Length", value)) => {
-                    content_length = Some(value.parse().context("invalid content length")?);
-                }
-                _ => {}
-            }
-        }
-
-        let content_length = content_length.context("missing content length")?;
-
-        let mut content = vec![0; content_length];
-        reader
-            .read_exact(&mut content)
-            .await
-            .with_context(|| "reading after a loop")?;
-
-        let message = std::str::from_utf8(&content).context("invalid utf8 from server")?;
-
-        if let Some(log_handlers) = log_handlers {
-            for (kind, log_handler) in log_handlers.lock().iter_mut() {
-                if matches!(kind, LogKind::Rpc) {
-                    log_handler(IoKind::StdOut, &message);
-                }
-            }
-        }
-
-        Ok(serde_json::from_str::<Message>(message)?)
-    }
-
-    pub async fn shutdown(&self) -> Result<()> {
-        log::debug!("Start shutdown client");
-
-        if let Some(server_tx) = self.server_tx.lock().await.take().as_ref() {
-            server_tx.close();
-        }
-
-        let mut current_requests = self.current_requests.lock().await;
-        let mut pending_requests = self.pending_requests.lock().await;
-
-        current_requests.clear();
-        pending_requests.clear();
-
-        let _ = self.transport.kill().await.log_err();
-
-        drop(current_requests);
-        drop(pending_requests);
-
-        log::debug!("Shutdown client completed");
-
-        anyhow::Ok(())
-    }
-
-    pub fn has_adapter_logs(&self) -> bool {
-        self.transport.has_adapter_logs()
-    }
-
-    pub fn transport(&self) -> &Transport {
-        &self.transport
-    }
-
-    pub fn add_log_handler<F>(&self, f: F, kind: LogKind)
-    where
-        F: 'static + Send + FnMut(IoKind, &str),
-    {
-        let mut log_handlers = self.log_handlers.lock();
-        log_handlers.push((kind, Box::new(f)));
-    }
-}
-
-pub struct TcpTransport {
-    pub port: u16,
-    pub host: Ipv4Addr,
-    pub timeout: u64,
-    process: Mutex<Child>,
-}
-
-impl TcpTransport {
-    /// Get an open port to use with the tcp client when not supplied by debug config
-    pub async fn port(host: &TCPHost) -> Result<u16> {
-        if let Some(port) = host.port {
-            Ok(port)
-        } else {
-            Ok(TcpListener::bind(SocketAddrV4::new(host.host(), 0))
-                .await?
-                .local_addr()?
-                .port())
-        }
-    }
-
-    async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
-        let Some(connection_args) = binary.connection.as_ref() else {
-            return Err(anyhow!("No connection arguments provided"));
-        };
-
-        let host = connection_args.host;
-        let port = connection_args.port;
-
-        let mut command = util::command::new_smol_command(&binary.command);
-
-        if let Some(cwd) = &binary.cwd {
-            command.current_dir(cwd);
-        }
-
-        if let Some(args) = &binary.arguments {
-            command.args(args);
-        }
-
-        if let Some(envs) = &binary.envs {
-            command.envs(envs);
-        }
-
-        command
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .kill_on_drop(true);
-
-        let mut process = command
-            .spawn()
-            .with_context(|| "failed to start debug adapter.")?;
-
-        let address = SocketAddrV4::new(host, port);
-
-        let timeout = connection_args.timeout.unwrap_or_else(|| {
-            cx.update(|cx| DebuggerSettings::get_global(cx).timeout)
-                .unwrap_or(2000u64)
-        });
-
-        let (rx, tx) = select! {
-            _ = cx.background_executor().timer(Duration::from_millis(timeout)).fuse() => {
-                return Err(anyhow!(format!("Connection to TCP DAP timeout {}:{}", host, port)))
-            },
-            result = cx.spawn(|cx| async move {
-                loop {
-                    match TcpStream::connect(address).await {
-                        Ok(stream) => return stream.split(),
-                        Err(_) => {
-                            cx.background_executor().timer(Duration::from_millis(100)).await;
-                        }
-                    }
-                }
-            }).fuse() => result
-        };
-        log::info!(
-            "Debug adapter has connected to TCP server {}:{}",
-            host,
-            port
-        );
-        let stdout = process.stdout.take();
-        let stderr = process.stderr.take();
-
-        let this = Self {
-            port,
-            host,
-            process: Mutex::new(process),
-            timeout,
-        };
-
-        let pipe = TransportPipe::new(
-            Box::new(tx),
-            Box::new(BufReader::new(rx)),
-            stdout.map(|s| Box::new(s) as Box<dyn AsyncRead + Unpin + Send>),
-            stderr.map(|s| Box::new(s) as Box<dyn AsyncRead + Unpin + Send>),
-        );
-
-        Ok((pipe, this))
-    }
-
-    fn has_adapter_logs(&self) -> bool {
-        true
-    }
-
-    async fn kill(&self) -> Result<()> {
-        self.process.lock().await.kill()?;
-
-        Ok(())
-    }
-}
-
-pub struct StdioTransport {
-    process: Mutex<Child>,
-}
-
-impl StdioTransport {
-    async fn start(binary: &DebugAdapterBinary, _: AsyncApp) -> Result<(TransportPipe, Self)> {
-        let mut command = util::command::new_smol_command(&binary.command);
-
-        if let Some(cwd) = &binary.cwd {
-            command.current_dir(cwd);
-        }
-
-        if let Some(args) = &binary.arguments {
-            command.args(args);
-        }
-
-        if let Some(envs) = &binary.envs {
-            command.envs(envs);
-        }
-
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .kill_on_drop(true);
-
-        let mut process = command
-            .spawn()
-            .with_context(|| "failed to spawn command.")?;
-
-        let stdin = process
-            .stdin
-            .take()
-            .ok_or_else(|| anyhow!("Failed to open stdin"))?;
-        let stdout = process
-            .stdout
-            .take()
-            .ok_or_else(|| anyhow!("Failed to open stdout"))?;
-        let stderr = process
-            .stdout
-            .take()
-            .map(|io_err| Box::new(io_err) as Box<dyn AsyncRead + Unpin + Send>);
-
-        if stderr.is_none() {
-            log::error!(
-                "Failed to connect to stderr for debug adapter command {}",
-                &binary.command
-            );
-        }
-
-        log::info!("Debug adapter has connected to stdio adapter");
-
-        let process = Mutex::new(process);
-
-        Ok((
-            TransportPipe::new(
-                Box::new(stdin),
-                Box::new(BufReader::new(stdout)),
-                None,
-                stderr,
-            ),
-            Self { process },
-        ))
-    }
-
-    fn has_adapter_logs(&self) -> bool {
-        false
-    }
-
-    async fn kill(&self) -> Result<()> {
-        self.process.lock().await.kill()?;
-        Ok(())
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-type RequestHandler = Box<
-    dyn Send
-        + FnMut(
-            u64,
-            serde_json::Value,
-            Arc<Mutex<async_pipe::PipeWriter>>,
-        ) -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>,
->;
-
-#[cfg(any(test, feature = "test-support"))]
-type ResponseHandler = Box<dyn Send + Fn(Response)>;
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeTransport {
-    // for sending fake response back from adapter side
-    request_handlers: Arc<Mutex<HashMap<&'static str, RequestHandler>>>,
-    // for reverse request responses
-    response_handlers: Arc<Mutex<HashMap<&'static str, ResponseHandler>>>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeTransport {
-    pub async fn on_request<R: dap_types::requests::Request, F>(&self, mut handler: F)
-    where
-        F: 'static + Send + FnMut(u64, R::Arguments) -> Result<R::Response, ErrorResponse>,
-    {
-        self.request_handlers.lock().await.insert(
-            R::COMMAND,
-            Box::new(
-                move |seq, args, writer: Arc<Mutex<async_pipe::PipeWriter>>| {
-                    let response = handler(seq, serde_json::from_value(args).unwrap());
-
-                    let message = serde_json::to_string(&Message::Response(Response {
-                        seq: seq + 1,
-                        request_seq: seq,
-                        success: response.as_ref().is_ok(),
-                        command: R::COMMAND.into(),
-                        body: util::maybe!({ serde_json::to_value(response.ok()?).ok() }),
-                    }))
-                    .unwrap();
-
-                    let writer = writer.clone();
-
-                    Box::pin(async move {
-                        let mut writer = writer.lock().await;
-                        writer
-                            .write_all(TransportDelegate::build_rpc_message(message).as_bytes())
-                            .await
-                            .unwrap();
-                        writer.flush().await.unwrap();
-                    })
-                },
-            ),
-        );
-    }
-
-    pub async fn on_response<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static + Send + Fn(Response),
-    {
-        self.response_handlers
-            .lock()
-            .await
-            .insert(R::COMMAND, Box::new(handler));
-    }
-
-    async fn start(cx: AsyncApp) -> Result<(TransportPipe, Self)> {
-        let this = Self {
-            request_handlers: Arc::new(Mutex::new(HashMap::default())),
-            response_handlers: Arc::new(Mutex::new(HashMap::default())),
-        };
-        use dap_types::requests::{Request, RunInTerminal, StartDebugging};
-        use serde_json::json;
-
-        let (stdin_writer, stdin_reader) = async_pipe::pipe();
-        let (stdout_writer, stdout_reader) = async_pipe::pipe();
-
-        let request_handlers = this.request_handlers.clone();
-        let response_handlers = this.response_handlers.clone();
-        let stdout_writer = Arc::new(Mutex::new(stdout_writer));
-
-        cx.background_executor()
-            .spawn(async move {
-                let mut reader = BufReader::new(stdin_reader);
-                let mut buffer = String::new();
-
-                loop {
-                    let message =
-                        TransportDelegate::receive_server_message(&mut reader, &mut buffer, None)
-                            .await;
-
-                    match message {
-                        Err(error) => {
-                            break anyhow!(error);
-                        }
-                        Ok(message) => {
-                            match message {
-                                Message::Request(request) => {
-                                    // redirect reverse requests to stdout writer/reader
-                                    if request.command == RunInTerminal::COMMAND
-                                        || request.command == StartDebugging::COMMAND
-                                    {
-                                        let message =
-                                            serde_json::to_string(&Message::Request(request))
-                                                .unwrap();
-
-                                        let mut writer = stdout_writer.lock().await;
-                                        writer
-                                            .write_all(
-                                                TransportDelegate::build_rpc_message(message)
-                                                    .as_bytes(),
-                                            )
-                                            .await
-                                            .unwrap();
-                                        writer.flush().await.unwrap();
-                                    } else {
-                                        if let Some(handle) = request_handlers
-                                            .lock()
-                                            .await
-                                            .get_mut(request.command.as_str())
-                                        {
-                                            handle(
-                                                request.seq,
-                                                request.arguments.unwrap_or(json!({})),
-                                                stdout_writer.clone(),
-                                            )
-                                            .await;
-                                        } else {
-                                            log::error!(
-                                                "No request handler for {}",
-                                                request.command
-                                            );
-                                        }
-                                    }
-                                }
-                                Message::Event(event) => {
-                                    let message =
-                                        serde_json::to_string(&Message::Event(event)).unwrap();
-
-                                    let mut writer = stdout_writer.lock().await;
-                                    writer
-                                        .write_all(
-                                            TransportDelegate::build_rpc_message(message)
-                                                .as_bytes(),
-                                        )
-                                        .await
-                                        .unwrap();
-                                    writer.flush().await.unwrap();
-                                }
-                                Message::Response(response) => {
-                                    if let Some(handle) = response_handlers
-                                        .lock()
-                                        .await
-                                        .get(response.command.as_str())
-                                    {
-                                        handle(response);
-                                    } else {
-                                        log::error!("No response handler for {}", response.command);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            })
-            .detach();
-
-        Ok((
-            TransportPipe::new(Box::new(stdin_writer), Box::new(stdout_reader), None, None),
-            this,
-        ))
-    }
-
-    fn has_adapter_logs(&self) -> bool {
-        false
-    }
-
-    async fn kill(&self) -> Result<()> {
-        Ok(())
-    }
-}
--- a/crates/dap_adapters/Cargo.toml
+++ b/crates/dap_adapters/Cargo.toml
@@ -1,41 +0,0 @@
-[package]
-name = "dap_adapters"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = [
-    "dap/test-support",
-    "gpui/test-support",
-    "task/test-support",
-    "util/test-support",
-]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/dap_adapters.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-dap.workspace = true
-gpui.workspace = true
-language.workspace = true
-paths.workspace = true
-regex.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-sysinfo.workspace = true
-task.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-dap = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-task = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
--- a/crates/dap_adapters/LICENSE-GPL
+++ b/crates/dap_adapters/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/dap_adapters/src/custom.rs
+++ b/crates/dap_adapters/src/custom.rs
@@ -1,79 +0,0 @@
-use dap::transport::TcpTransport;
-use gpui::AsyncApp;
-use serde_json::Value;
-use std::{ffi::OsString, path::PathBuf};
-use task::DebugAdapterConfig;
-
-use crate::*;
-
-pub(crate) struct CustomDebugAdapter {
-    custom_args: CustomArgs,
-}
-
-impl CustomDebugAdapter {
-    const ADAPTER_NAME: &'static str = "custom_dap";
-
-    pub(crate) async fn new(custom_args: CustomArgs) -> Result<Self> {
-        Ok(CustomDebugAdapter { custom_args })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for CustomDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        _: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let connection = if let DebugConnectionType::TCP(connection) = &self.custom_args.connection
-        {
-            Some(adapters::TcpArguments {
-                host: connection.host(),
-                port: TcpTransport::port(&connection).await?,
-                timeout: connection.timeout,
-            })
-        } else {
-            None
-        };
-        let ret = DebugAdapterBinary {
-            command: self.custom_args.command.clone(),
-            arguments: self
-                .custom_args
-                .args
-                .clone()
-                .map(|args| args.iter().map(OsString::from).collect()),
-            cwd: config.cwd.clone(),
-            envs: self.custom_args.envs.clone(),
-            connection,
-        };
-        Ok(ret)
-    }
-
-    async fn fetch_latest_adapter_version(&self, _: &dyn DapDelegate) -> Result<AdapterVersion> {
-        bail!("Custom debug adapters don't have latest versions")
-    }
-
-    async fn install_binary(&self, _: AdapterVersion, _: &dyn DapDelegate) -> Result<()> {
-        bail!("Custom debug adapters cannot be installed")
-    }
-
-    async fn get_installed_binary(
-        &self,
-        _: &dyn DapDelegate,
-        _: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        bail!("Custom debug adapters cannot be installed")
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        json!({"program": config.program})
-    }
-}
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ b/crates/dap_adapters/src/dap_adapters.rs
@@ -1,49 +0,0 @@
-mod custom;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-mod gdb;
-mod go;
-mod javascript;
-mod lldb;
-mod php;
-mod python;
-
-use std::sync::Arc;
-
-use anyhow::{anyhow, bail, Result};
-use async_trait::async_trait;
-use custom::CustomDebugAdapter;
-use dap::adapters::{
-    self, AdapterVersion, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName,
-    GithubRepo,
-};
-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-use gdb::GdbDebugAdapter;
-use go::GoDebugAdapter;
-use javascript::JsDebugAdapter;
-use lldb::LldbDebugAdapter;
-use php::PhpDebugAdapter;
-use python::PythonDebugAdapter;
-use serde_json::{json, Value};
-use task::{CustomArgs, DebugAdapterConfig, DebugAdapterKind, DebugConnectionType, TCPHost};
-
-pub async fn build_adapter(kind: &DebugAdapterKind) -> Result<Arc<dyn DebugAdapter>> {
-    match kind {
-        DebugAdapterKind::Custom(start_args) => {
-            Ok(Arc::new(CustomDebugAdapter::new(start_args.clone()).await?))
-        }
-        DebugAdapterKind::Python(host) => Ok(Arc::new(PythonDebugAdapter::new(host).await?)),
-        DebugAdapterKind::Php(host) => Ok(Arc::new(PhpDebugAdapter::new(host.clone()).await?)),
-        DebugAdapterKind::Javascript(host) => {
-            Ok(Arc::new(JsDebugAdapter::new(host.clone()).await?))
-        }
-        DebugAdapterKind::Lldb => Ok(Arc::new(LldbDebugAdapter::new())),
-        DebugAdapterKind::Go(host) => Ok(Arc::new(GoDebugAdapter::new(host).await?)),
-        #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-        DebugAdapterKind::Gdb => Ok(Arc::new(GdbDebugAdapter::new())),
-        #[cfg(any(test, feature = "test-support"))]
-        DebugAdapterKind::Fake => Ok(Arc::new(dap::adapters::FakeAdapter::new())),
-        #[cfg(not(any(test, feature = "test-support")))]
-        #[allow(unreachable_patterns)]
-        _ => unreachable!("Fake variant only exists with test-support feature"),
-    }
-}
--- a/crates/dap_adapters/src/gdb.rs
+++ b/crates/dap_adapters/src/gdb.rs
@@ -1,83 +0,0 @@
-use std::ffi::OsStr;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use gpui::AsyncApp;
-use task::DebugAdapterConfig;
-
-use crate::*;
-
-pub(crate) struct GdbDebugAdapter {}
-
-impl GdbDebugAdapter {
-    const ADAPTER_NAME: &'static str = "gdb";
-
-    pub(crate) fn new() -> Self {
-        GdbDebugAdapter {}
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for GdbDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<std::path::PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let user_setting_path = user_installed_path
-            .filter(|p| p.exists())
-            .and_then(|p| p.to_str().map(|s| s.to_string()));
-
-        /* GDB implements DAP natively so just need to  */
-        let gdb_path = delegate
-            .which(OsStr::new("gdb"))
-            .and_then(|p| p.to_str().map(|s| s.to_string()))
-            .ok_or(anyhow!("Could not find gdb in path"));
-
-        if gdb_path.is_err() && user_setting_path.is_none() {
-            bail!("Could not find gdb path or it's not installed");
-        }
-
-        let gdb_path = user_setting_path.unwrap_or(gdb_path?);
-
-        Ok(DebugAdapterBinary {
-            command: gdb_path,
-            arguments: Some(vec!["-i=dap".into()]),
-            envs: None,
-            cwd: config.cwd.clone(),
-            connection: None,
-        })
-    }
-
-    async fn install_binary(
-        &self,
-        _version: AdapterVersion,
-        _delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        unimplemented!("GDB debug adapter cannot be installed by Zed (yet)")
-    }
-
-    async fn fetch_latest_adapter_version(&self, _: &dyn DapDelegate) -> Result<AdapterVersion> {
-        unimplemented!("Fetch latest GDB version not implemented (yet)")
-    }
-
-    async fn get_installed_binary(
-        &self,
-        _: &dyn DapDelegate,
-        _: &DebugAdapterConfig,
-        _: Option<std::path::PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        unimplemented!("GDB cannot be installed by Zed (yet)")
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        json!({"program": config.program, "cwd": config.cwd})
-    }
-}
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -1,100 +0,0 @@
-use dap::transport::TcpTransport;
-use gpui::AsyncApp;
-use std::{ffi::OsStr, net::Ipv4Addr, path::PathBuf};
-
-use crate::*;
-
-pub(crate) struct GoDebugAdapter {
-    port: u16,
-    host: Ipv4Addr,
-    timeout: Option<u64>,
-}
-
-impl GoDebugAdapter {
-    const ADAPTER_NAME: &'static str = "delve";
-
-    pub(crate) async fn new(host: &TCPHost) -> Result<Self> {
-        Ok(GoDebugAdapter {
-            port: TcpTransport::port(host).await?,
-            host: host.host(),
-            timeout: host.timeout,
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for GoDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        self.get_installed_binary(delegate, config, user_installed_path, cx)
-            .await
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        _delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion> {
-        unimplemented!("This adapter is used from path for now");
-    }
-
-    async fn install_binary(
-        &self,
-        version: AdapterVersion,
-        delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        adapters::download_adapter_from_github(
-            self.name(),
-            version,
-            adapters::DownloadedFileType::Zip,
-            delegate,
-        )
-        .await?;
-        Ok(())
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let delve_path = delegate
-            .which(OsStr::new("dlv"))
-            .and_then(|p| p.to_str().map(|p| p.to_string()))
-            .ok_or(anyhow!("Dlv not found in path"))?;
-
-        Ok(DebugAdapterBinary {
-            command: delve_path,
-            arguments: Some(vec![
-                "dap".into(),
-                "--listen".into(),
-                format!("{}:{}", self.host, self.port).into(),
-            ]),
-            cwd: config.cwd.clone(),
-            envs: None,
-            connection: Some(adapters::TcpArguments {
-                host: self.host,
-                port: self.port,
-                timeout: self.timeout,
-            }),
-        })
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        json!({
-            "program": config.program,
-            "cwd": config.cwd,
-            "subProcess": true,
-        })
-    }
-}
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -1,153 +0,0 @@
-use adapters::latest_github_release;
-use dap::transport::TcpTransport;
-use gpui::AsyncApp;
-use regex::Regex;
-use std::{collections::HashMap, net::Ipv4Addr, path::PathBuf};
-use sysinfo::{Pid, Process};
-use task::DebugRequestType;
-
-use crate::*;
-
-pub(crate) struct JsDebugAdapter {
-    port: u16,
-    host: Ipv4Addr,
-    timeout: Option<u64>,
-}
-
-impl JsDebugAdapter {
-    const ADAPTER_NAME: &'static str = "vscode-js-debug";
-    const ADAPTER_PATH: &'static str = "js-debug/src/dapDebugServer.js";
-
-    pub(crate) async fn new(host: TCPHost) -> Result<Self> {
-        Ok(JsDebugAdapter {
-            host: host.host(),
-            timeout: host.timeout,
-            port: TcpTransport::port(&host).await?,
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for JsDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion> {
-        let release = latest_github_release(
-            &format!("{}/{}", "microsoft", Self::ADAPTER_NAME),
-            true,
-            false,
-            delegate.http_client(),
-        )
-        .await?;
-
-        let asset_name = format!("js-debug-dap-{}.tar.gz", release.tag_name);
-
-        Ok(AdapterVersion {
-            tag_name: release.tag_name,
-            url: release
-                .assets
-                .iter()
-                .find(|asset| asset.name == asset_name)
-                .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?
-                .browser_download_url
-                .clone(),
-        })
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        _: &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());
-
-            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
-            .ok_or_else(|| anyhow!("Couldn't find JavaScript dap directory"))?
-        };
-
-        Ok(DebugAdapterBinary {
-            command: delegate
-                .node_runtime()
-                .binary_path()
-                .await?
-                .to_string_lossy()
-                .into_owned(),
-            arguments: Some(vec![
-                adapter_path.join(Self::ADAPTER_PATH).into(),
-                self.port.to_string().into(),
-                self.host.to_string().into(),
-            ]),
-            cwd: config.cwd.clone(),
-            envs: None,
-            connection: Some(adapters::TcpArguments {
-                host: self.host,
-                port: self.port,
-                timeout: self.timeout,
-            }),
-        })
-    }
-
-    async fn install_binary(
-        &self,
-        version: AdapterVersion,
-        delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        adapters::download_adapter_from_github(
-            self.name(),
-            version,
-            adapters::DownloadedFileType::GzipTar,
-            delegate,
-        )
-        .await?;
-
-        return Ok(());
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        let pid = if let DebugRequestType::Attach(attach_config) = &config.request {
-            attach_config.process_id
-        } else {
-            None
-        };
-
-        json!({
-            "program": config.program,
-            "type": "pwa-node",
-            "request": match config.request {
-                DebugRequestType::Launch => "launch",
-                DebugRequestType::Attach(_) => "attach",
-            },
-            "processId": pid,
-            "cwd": config.cwd,
-        })
-    }
-
-    fn attach_processes<'a>(
-        &self,
-        processes: &'a HashMap<Pid, Process>,
-    ) -> Option<Vec<(&'a Pid, &'a Process)>> {
-        let regex = Regex::new(r"(?i)^(?:node|bun|iojs)(?:$|\b)").unwrap();
-
-        Some(
-            processes
-                .iter()
-                .filter(|(_, process)| regex.is_match(&process.name().to_string_lossy()))
-                .collect::<Vec<_>>(),
-        )
-    }
-}
--- a/crates/dap_adapters/src/lldb.rs
+++ b/crates/dap_adapters/src/lldb.rs
@@ -1,107 +0,0 @@
-use std::{collections::HashMap, ffi::OsStr, path::PathBuf};
-
-use anyhow::Result;
-use async_trait::async_trait;
-use gpui::AsyncApp;
-use sysinfo::{Pid, Process};
-use task::{DebugAdapterConfig, DebugRequestType};
-
-use crate::*;
-
-pub(crate) struct LldbDebugAdapter {}
-
-impl LldbDebugAdapter {
-    const ADAPTER_NAME: &'static str = "lldb";
-
-    pub(crate) fn new() -> Self {
-        LldbDebugAdapter {}
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for LldbDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let lldb_dap_path = if let Some(user_installed_path) = user_installed_path {
-            user_installed_path.to_string_lossy().into()
-        } else if cfg!(target_os = "macos") {
-            util::command::new_smol_command("xcrun")
-                .args(&["-f", "lldb-dap"])
-                .output()
-                .await
-                .ok()
-                .and_then(|output| String::from_utf8(output.stdout).ok())
-                .map(|path| path.trim().to_string())
-                .ok_or(anyhow!("Failed to find lldb-dap in user's path"))?
-        } else {
-            delegate
-                .which(OsStr::new("lldb-dap"))
-                .and_then(|p| p.to_str().map(|s| s.to_string()))
-                .ok_or(anyhow!("Could not find lldb-dap in path"))?
-        };
-
-        Ok(DebugAdapterBinary {
-            command: lldb_dap_path,
-            arguments: None,
-            envs: None,
-            cwd: config.cwd.clone(),
-            connection: None,
-        })
-    }
-
-    async fn install_binary(
-        &self,
-        _version: AdapterVersion,
-        _delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        unimplemented!("LLDB debug adapter cannot be installed by Zed (yet)")
-    }
-
-    async fn fetch_latest_adapter_version(&self, _: &dyn DapDelegate) -> Result<AdapterVersion> {
-        unimplemented!("Fetch latest adapter version not implemented for lldb (yet)")
-    }
-
-    async fn get_installed_binary(
-        &self,
-        _: &dyn DapDelegate,
-        _: &DebugAdapterConfig,
-        _: Option<PathBuf>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        unimplemented!("LLDB debug adapter cannot be installed by Zed (yet)")
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        let pid = if let DebugRequestType::Attach(attach_config) = &config.request {
-            attach_config.process_id
-        } else {
-            None
-        };
-
-        json!({
-            "program": config.program,
-            "request": match config.request {
-                DebugRequestType::Launch => "launch",
-                DebugRequestType::Attach(_) => "attach",
-            },
-            "pid": pid,
-            "cwd": config.cwd,
-        })
-    }
-
-    fn attach_processes<'a>(
-        &self,
-        processes: &'a HashMap<Pid, Process>,
-    ) -> Option<Vec<(&'a Pid, &'a Process)>> {
-        Some(processes.iter().collect::<Vec<_>>())
-    }
-}
--- a/crates/dap_adapters/src/php.rs
+++ b/crates/dap_adapters/src/php.rs
@@ -1,123 +0,0 @@
-use adapters::latest_github_release;
-use dap::{adapters::TcpArguments, transport::TcpTransport};
-use gpui::AsyncApp;
-use std::{net::Ipv4Addr, path::PathBuf};
-
-use crate::*;
-
-pub(crate) struct PhpDebugAdapter {
-    port: u16,
-    _host: Ipv4Addr,
-    _timeout: Option<u64>,
-}
-
-impl PhpDebugAdapter {
-    const ADAPTER_NAME: &'static str = "vscode-php-debug";
-    const ADAPTER_PATH: &'static str = "extension/out/phpDebug.js";
-
-    pub(crate) async fn new(host: TCPHost) -> Result<Self> {
-        Ok(PhpDebugAdapter {
-            port: TcpTransport::port(&host).await?,
-            _host: host.host(),
-            _timeout: host.timeout,
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for PhpDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion> {
-        let release = latest_github_release(
-            &format!("{}/{}", "xdebug", Self::ADAPTER_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)
-                .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?
-                .browser_download_url
-                .clone(),
-        })
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        _: &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());
-
-            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
-            .ok_or_else(|| anyhow!("Couldn't find PHP dap directory"))?
-        };
-
-        Ok(DebugAdapterBinary {
-            command: delegate
-                .node_runtime()
-                .binary_path()
-                .await?
-                .to_string_lossy()
-                .into_owned(),
-            arguments: Some(vec![
-                adapter_path.join(Self::ADAPTER_PATH).into(),
-                format!("--server={}", self.port).into(),
-            ]),
-            connection: Some(TcpArguments {
-                port: self.port,
-                host: self._host,
-                timeout: self._timeout,
-            }),
-            cwd: config.cwd.clone(),
-            envs: None,
-        })
-    }
-
-    async fn install_binary(
-        &self,
-        version: AdapterVersion,
-        delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        adapters::download_adapter_from_github(
-            self.name(),
-            version,
-            adapters::DownloadedFileType::Vsix,
-            delegate,
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        json!({
-            "program": config.program,
-            "cwd": config.cwd,
-        })
-    }
-}
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -1,141 +0,0 @@
-use crate::*;
-use dap::transport::TcpTransport;
-use gpui::AsyncApp;
-use std::{ffi::OsStr, net::Ipv4Addr, path::PathBuf};
-
-pub(crate) struct PythonDebugAdapter {
-    port: u16,
-    host: Ipv4Addr,
-    timeout: Option<u64>,
-}
-
-impl PythonDebugAdapter {
-    const ADAPTER_NAME: &'static str = "debugpy";
-    const ADAPTER_PATH: &'static str = "src/debugpy/adapter";
-    const LANGUAGE_NAME: &'static str = "Python";
-
-    pub(crate) async fn new(host: &TCPHost) -> Result<Self> {
-        Ok(PythonDebugAdapter {
-            port: TcpTransport::port(host).await?,
-            host: host.host(),
-            timeout: host.timeout,
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for PythonDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &dyn DapDelegate,
-    ) -> Result<AdapterVersion> {
-        let github_repo = GithubRepo {
-            repo_name: Self::ADAPTER_NAME.into(),
-            repo_owner: "microsoft".into(),
-        };
-
-        adapters::fetch_latest_adapter_version_from_github(github_repo, delegate).await
-    }
-
-    async fn install_binary(
-        &self,
-        version: AdapterVersion,
-        delegate: &dyn DapDelegate,
-    ) -> Result<()> {
-        let version_path = adapters::download_adapter_from_github(
-            self.name(),
-            version,
-            adapters::DownloadedFileType::Zip,
-            delegate,
-        )
-        .await?;
-
-        // only needed when you install the latest version for the first time
-        if let Some(debugpy_dir) =
-            util::fs::find_file_name_in_dir(version_path.as_path(), |file_name| {
-                file_name.starts_with("microsoft-debugpy-")
-            })
-            .await
-        {
-            // TODO Debugger: Rename folder instead of moving all files to another folder
-            // We're doing uncessary IO work right now
-            util::fs::move_folder_files_to_folder(debugpy_dir.as_path(), version_path.as_path())
-                .await?;
-        }
-
-        Ok(())
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        config: &DebugAdapterConfig,
-        user_installed_path: Option<PathBuf>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        const BINARY_NAMES: [&str; 3] = ["python3", "python", "py"];
-
-        let debugpy_dir = if let Some(user_installed_path) = user_installed_path {
-            user_installed_path
-        } else {
-            let adapter_path = paths::debug_adapters_dir().join(self.name());
-            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
-            .ok_or_else(|| anyhow!("Debugpy directory not found"))?
-        };
-
-        let toolchain = delegate
-            .toolchain_store()
-            .active_toolchain(
-                delegate.worktree_id(),
-                language::LanguageName::new(Self::LANGUAGE_NAME),
-                cx,
-            )
-            .await;
-
-        let python_path = if let Some(toolchain) = toolchain {
-            Some(toolchain.path.to_string())
-        } else {
-            BINARY_NAMES
-                .iter()
-                .filter_map(|cmd| {
-                    delegate
-                        .which(OsStr::new(cmd))
-                        .map(|path| path.to_string_lossy().to_string())
-                })
-                .find(|_| true)
-        };
-
-        Ok(DebugAdapterBinary {
-            command: python_path.ok_or(anyhow!("failed to find binary path for python"))?,
-            arguments: Some(vec![
-                debugpy_dir.join(Self::ADAPTER_PATH).into(),
-                format!("--port={}", self.port).into(),
-                format!("--host={}", self.host).into(),
-            ]),
-            connection: Some(adapters::TcpArguments {
-                host: self.host,
-                port: self.port,
-                timeout: self.timeout,
-            }),
-            cwd: config.cwd.clone(),
-            envs: None,
-        })
-    }
-
-    fn request_args(&self, config: &DebugAdapterConfig) -> Value {
-        json!({
-            "program": config.program,
-            "subProcess": true,
-            "cwd": config.cwd,
-        })
-    }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle"><circle cx="12" cy="12" r="10"/></svg>`