Remove log

Clean up ProjectEnvironment constructor
Remove buggy attempt to GC environments
2025-04-08 16:11:31 -04:00 · 2025-04-08 16:06:57 -04:00 · 2025-04-08 16:01:53 -04:00 · 2025-04-08 15:53:37 -04:00 · 2025-04-07 08:22:24 -04:00 · 2025-04-06 22:18:58 -04:00
279 changed files with 8595 additions and 13010 deletions
--- a/.github/ISSUE_TEMPLATE/00_edit_predictions_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/00_edit_predictions_bug_report.yml
@@ -1,51 +0,0 @@
-name: Edit Predictions Bug Report
-description: There is a bug related to Edit Predictions in Zed
-type: "Bug"
-labels: ["ai", "inline completion", "zeta"]
-title: "Edit Predictions: <a short description of the Edit Prediction bug>"
-body:
-  - type: textarea
-    attributes:
-      label: Summary
-      description: Describe the bug with a one line summary, and provide detailed reproduction steps
-      value: |
-        <!-- Please insert a one line summary of the issue below -->
-
-        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
-        Steps to trigger the problem:
-        1.
-        2.
-        3.
-
-        Actual Behavior:
-
-        Expected Behavior:
-
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
-      placeholder: |
-        Output of "zed: Copy System Specs Into Clipboard"
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
-      description: |
-        macOS: `~/Library/Logs/Zed/Zed.log`
-        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
-        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
-      value: |
-        <details><summary>Zed.log</summary>
-
-        <!-- Click below this line and paste or drag-and-drop your log-->
-        ```
-
-        ```
-        <!-- Click above this line and paste or drag-and-drop your log--></details>
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/01_git_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_git_bug_report.yml
@@ -1,51 +0,0 @@
-name: Git Bug Report
-description: There is a bug related to Git features in Zed
-type: "Bug"
-labels: ["git"]
-title: "Git: <a short description of the Git bug>"
-body:
-  - type: textarea
-    attributes:
-      label: Summary
-      description: Describe the bug with a one line summary, and provide detailed reproduction steps
-      value: |
-        <!-- Please insert a one line summary of the issue below -->
-
-        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
-        Steps to trigger the problem:
-        1.
-        2.
-        3.
-
-        Actual Behavior:
-
-        Expected Behavior:
-
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
-      placeholder: |
-        Output of "zed: Copy System Specs Into Clipboard"
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
-      description: |
-        macOS: `~/Library/Logs/Zed/Zed.log`
-        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
-        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
-      value: |
-        <details><summary>Zed.log</summary>
-
-        <!-- Click below this line and paste or drag-and-drop your log-->
-        ```
-
-        ```
-        <!-- Click above this line and paste or drag-and-drop your log--></details>
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/02_agent_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/02_agent_bug_report.yml
@@ -1,51 +0,0 @@
-name: Agent Panel Bug Report
-description: There is a bug related to the Agent Panel in Zed
-type: "Bug"
-labels: ["agent", "ai"]
-title: "Agent Panel: <a short description of the Agent Panel bug>"
-body:
-  - type: textarea
-    attributes:
-      label: Summary
-      description: Describe the bug with a one line summary, and provide detailed reproduction steps
-      value: |
-        <!-- Please insert a one line summary of the issue below -->
-
-        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
-        Steps to trigger the problem:
-        1.
-        2.
-        3.
-
-        Actual Behavior:
-
-        Expected Behavior:
-
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
-      placeholder: |
-        Output of "zed: Copy System Specs Into Clipboard"
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
-      description: |
-        macOS: `~/Library/Logs/Zed/Zed.log`
-        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
-        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
-      value: |
-        <details><summary>Zed.log</summary>
-
-        <!-- Click below this line and paste or drag-and-drop your log-->
-        ```
-
-        ```
-        <!-- Click above this line and paste or drag-and-drop your log--></details>
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
--- a/.github/ISSUE_TEMPLATE/11_crash_report.yml
+++ b/.github/ISSUE_TEMPLATE/11_crash_report.yml
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -23,4 +23,4 @@ runs:
    - name: Run tests
      shell: pwsh
      working-directory: ${{ inputs.working-directory }}
-      run: cargo nextest run --workspace --no-fail-fast --config='profile.dev.debug="limited"'
+      run: cargo nextest run --workspace --no-fail-fast
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,13 +131,13 @@ jobs:
      - name: Check workspace-hack Cargo.toml is up-to-date
        run: |
          cargo hakari generate --diff || {
-            echo "To fix, run script/update-workspace-hack or script/update-workspace-hack.ps1";
+            echo "To fix, run script/update-workspace-hack";
            false
          }
      - name: Check all crates depend on workspace-hack
        run: |
          cargo hakari manage-deps --dry-run || {
-            echo "To fix, run script/update-workspace-hack or script/update-workspace-hack.ps1"
+            echo "To fix, run script/update-workspace-hack"
            false
          }

@@ -706,51 +706,6 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  nix-build:
-    timeout-minutes: 60
-    name: Nix Build
-    continue-on-error: true
-    if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
-    strategy:
-      fail-fast: false
-      matrix:
-        system:
-          - os: x86 Linux
-            runner: buildjet-16vcpu-ubuntu-2204
-            install_nix: true
-          - os: arm Mac
-            runner: [macOS, ARM64, test]
-            install_nix: false
-    runs-on: ${{ matrix.system.runner }}
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-      - name: Set path
-        if: ${{ ! matrix.system.install_nix }}
-        run: |
-          echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
-          echo "/Users/administrator/.nix-profile/bin" >> $GITHUB_PATH
-
-      - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
-        if: ${{ matrix.system.install_nix }}
-        with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
-        with:
-          name: zed-industries
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          skipPush: true
-      - run: nix build .#debug
-      - name: Limit /nix/store to 50GB
-        run: "[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d"
-
  auto-release-preview:
    name: Auto release preview
    if: |
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -216,8 +216,7 @@ jobs:
          name: zed-industries
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
      - run: nix build
-      - name: Limit /nix/store to 50GB
-        run: '[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d'
+      - run: nix-collect-garbage -d

  update-nightly-tag:
    name: Update nightly tag
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -1,14 +1,14 @@
 [
  {
    "label": "Debug Zed with LLDB",
-    "adapter": "LLDB",
+    "adapter": "lldb",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT"
  },
  {
    "label": "Debug Zed with GDB",
-    "adapter": "GDB",
+    "adapter": "gdb",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT",
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -119,48 +119,12 @@ dependencies = [
 "ui_input",
 "util",
 "uuid",
+ "vim_mode_setting",
 "workspace",
 "workspace-hack",
 "zed_actions",
 ]

-[[package]]
-name = "agent_eval"
-version = "0.1.0"
-dependencies = [
- "agent",
- "anyhow",
- "assistant_tool",
- "assistant_tools",
- "clap",
- "client",
- "collections",
- "context_server",
- "dap",
- "env_logger 0.11.8",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "language",
- "language_model",
- "language_models",
- "node_runtime",
- "project",
- "prompt_store",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "smol",
- "tempfile",
- "util",
- "walkdir",
- "workspace-hack",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -616,6 +580,43 @@ dependencies = [
 "zed_actions",
 ]

+[[package]]
+name = "assistant_eval"
+version = "0.1.0"
+dependencies = [
+ "agent",
+ "anyhow",
+ "assistant_tool",
+ "assistant_tools",
+ "clap",
+ "client",
+ "collections",
+ "context_server",
+ "dap",
+ "env_logger 0.11.8",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "gpui_tokio",
+ "language",
+ "language_model",
+ "language_models",
+ "node_runtime",
+ "project",
+ "prompt_store",
+ "release_channel",
+ "reqwest_client",
+ "serde",
+ "serde_json",
+ "serde_json_lenient",
+ "settings",
+ "smol",
+ "tempfile",
+ "util",
+ "walkdir",
+ "workspace-hack",
+]
+
 [[package]]
 name = "assistant_settings"
 version = "0.1.0"
@@ -739,8 +740,6 @@ dependencies = [
 "assistant_tool",
 "chrono",
 "collections",
- "editor",
- "feature_flags",
 "futures 0.3.31",
 "gpui",
 "html_to_markdown",
@@ -915,6 +914,18 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "async-native-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
+dependencies = [
+ "futures-util",
+ "native-tls",
+ "thiserror 1.0.69",
+ "url",
+]
+
 [[package]]
 name = "async-net"
 version = "2.0.0"
@@ -1084,6 +1095,18 @@ version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"

+[[package]]
+name = "async-tls"
+version = "0.13.0"
+source = "git+https://github.com/zed-industries/async-tls?rev=1e759a4b5e370f87dc15e40756ac4f8815b61d9d#1e759a4b5e370f87dc15e40756ac4f8815b61d9d"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "rustls 0.23.25",
+ "rustls-pemfile 2.2.0",
+ "webpki-roots",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.88"
@@ -1097,10 +1120,12 @@ dependencies = [

 [[package]]
 name = "async-tungstenite"
-version = "0.29.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0f7efedeac57d9b26170f72965ecfd31473ca52ca7a64e925b0b6f5f079886"
+checksum = "1c348fb0b6d132c596eca3dcd941df48fb597aafcb07a738ec41c004b087dc99"
 dependencies = [
+ "async-std",
+ "async-tls",
 "atomic-waker",
 "futures-core",
 "futures-io",
@@ -1108,10 +1133,7 @@ dependencies = [
 "futures-util",
 "log",
 "pin-project-lite",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.2",
- "tungstenite 0.26.2",
+ "tungstenite 0.24.0",
 ]

 [[package]]
@@ -2817,6 +2839,7 @@ name = "client"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "async-native-tls",
 "async-recursion 0.3.2",
 "async-tungstenite",
 "chrono",
@@ -2827,7 +2850,6 @@ dependencies = [
 "feature_flags",
 "futures 0.3.31",
 "gpui",
- "gpui_tokio",
 "http_client",
 "http_client_tls",
 "log",
@@ -2849,7 +2871,6 @@ dependencies = [
 "thiserror 2.0.12",
 "time",
 "tiny_http",
- "tokio",
 "tokio-socks",
 "url",
 "util",
@@ -3435,19 +3456,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "core-graphics-helmer-fork"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5"
-dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
- "libc",
-]
-
 [[package]]
 name = "core-graphics-types"
 version = "0.1.3"
@@ -4030,7 +4038,7 @@ dependencies = [
 [[package]]
 name = "dap-types"
 version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=be69a016ba710191b9fdded28c8b042af4b617f7#be69a016ba710191b9fdded28c8b042af4b617f7"
+source = "git+https://github.com/zed-industries/dap-types?rev=bfd4af0#bfd4af084bbaa5f344e6925370d7642e41d0b5b8"
 dependencies = [
 "schemars",
 "serde",
@@ -4423,12 +4431,6 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -6099,7 +6101,6 @@ dependencies = [
 "refineable",
 "reqwest_client",
 "resvg",
- "scap",
 "schemars",
 "seahash",
 "semantic_version",
@@ -7432,7 +7433,8 @@ dependencies = [
 [[package]]
 name = "jupyter-protocol"
 version = "0.6.0"
-source = "git+https://github.com/ConradIrwin/runtimed?rev=7130c804216b6914355d15d0b91ea91f6babd734#7130c804216b6914355d15d0b91ea91f6babd734"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9ae6296f9476658b3550293c113996daf75fa542cd8d078abb4c60207bded14"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -7447,7 +7449,8 @@ dependencies = [
 [[package]]
 name = "jupyter-websocket-client"
 version = "0.9.0"
-source = "git+https://github.com/ConradIrwin/runtimed?rev=7130c804216b6914355d15d0b91ea91f6babd734#7130c804216b6914355d15d0b91ea91f6babd734"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49c1ba895c5271ff8dcae51c347fd3588905ba0025a57e20955fd231fe1228cc"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -7878,7 +7881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
 "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -8123,7 +8126,6 @@ dependencies = [
 "objc",
 "parking_lot",
 "postage",
- "scap",
 "serde",
 "serde_json",
 "sha2",
@@ -8340,7 +8342,6 @@ dependencies = [
 "node_runtime",
 "pulldown-cmark 0.12.2",
 "settings",
- "sum_tree",
 "theme",
 "ui",
 "util",
@@ -8661,6 +8662,7 @@ dependencies = [
 "collections",
 "ctor",
 "env_logger 0.11.8",
+ "futures 0.3.31",
 "gpui",
 "indoc",
 "itertools 0.14.0",
@@ -8754,7 +8756,8 @@ dependencies = [
 [[package]]
 name = "nbformat"
 version = "0.10.0"
-source = "git+https://github.com/ConradIrwin/runtimed?rev=7130c804216b6914355d15d0b91ea91f6babd734#7130c804216b6914355d15d0b91ea91f6babd734"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "244c1673f02b4d5f3c51b6f8ed28d57182cb166a50a6dbf651a3d53e23dc81c0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -9135,18 +9138,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
 "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
 ]

 [[package]]
@@ -9351,24 +9342,6 @@ dependencies = [
 "objc2-foundation",
 ]

-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -9533,6 +9506,15 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

+[[package]]
+name = "openssl-src"
+version = "300.4.2+3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.107"
@@ -9541,6 +9523,7 @@ checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
 "cc",
 "libc",
+ "openssl-src",
 "pkg-config",
 "vcpkg",
 ]
@@ -9964,7 +9947,7 @@ dependencies = [
 [[package]]
 name = "pet"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "clap",
 "env_logger 0.10.2",
@@ -10001,7 +9984,7 @@ dependencies = [
 [[package]]
 name = "pet-conda"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -10020,7 +10003,7 @@ dependencies = [
 [[package]]
 name = "pet-core"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "clap",
 "lazy_static",
@@ -10035,7 +10018,7 @@ dependencies = [
 [[package]]
 name = "pet-env-var-path"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "lazy_static",
 "log",
@@ -10051,7 +10034,7 @@ dependencies = [
 [[package]]
 name = "pet-fs"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10060,7 +10043,7 @@ dependencies = [
 [[package]]
 name = "pet-global-virtualenvs"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10073,7 +10056,7 @@ dependencies = [
 [[package]]
 name = "pet-homebrew"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "lazy_static",
 "log",
@@ -10091,7 +10074,7 @@ dependencies = [
 [[package]]
 name = "pet-jsonrpc"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "env_logger 0.10.2",
 "log",
@@ -10104,7 +10087,7 @@ dependencies = [
 [[package]]
 name = "pet-linux-global-python"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10117,7 +10100,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-commandlinetools"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10130,7 +10113,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-python-org"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10143,7 +10126,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-xcode"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10156,7 +10139,7 @@ dependencies = [
 [[package]]
 name = "pet-pipenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10169,7 +10152,7 @@ dependencies = [
 [[package]]
 name = "pet-pixi"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10181,7 +10164,7 @@ dependencies = [
 [[package]]
 name = "pet-poetry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "base64 0.22.1",
 "lazy_static",
@@ -10202,7 +10185,7 @@ dependencies = [
 [[package]]
 name = "pet-pyenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "lazy_static",
 "log",
@@ -10220,7 +10203,7 @@ dependencies = [
 [[package]]
 name = "pet-python-utils"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -10237,7 +10220,7 @@ dependencies = [
 [[package]]
 name = "pet-reporter"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "env_logger 0.10.2",
 "log",
@@ -10251,7 +10234,7 @@ dependencies = [
 [[package]]
 name = "pet-telemetry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -10266,7 +10249,7 @@ dependencies = [
 [[package]]
 name = "pet-venv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10278,7 +10261,7 @@ dependencies = [
 [[package]]
 name = "pet-virtualenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10290,7 +10273,7 @@ dependencies = [
 [[package]]
 name = "pet-virtualenvwrapper"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -10303,7 +10286,7 @@ dependencies = [
 [[package]]
 name = "pet-windows-registry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "lazy_static",
 "log",
@@ -10315,13 +10298,13 @@ dependencies = [
 "pet-virtualenv",
 "pet-windows-store",
 "regex",
- "winreg 0.55.0",
+ "winreg 0.52.0",
 ]

 [[package]]
 name = "pet-windows-store"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=845945b830297a50de0e24020b980a65e4820559#845945b830297a50de0e24020b980a65e4820559"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
 dependencies = [
 "lazy_static",
 "log",
@@ -10331,7 +10314,7 @@ dependencies = [
 "pet-python-utils",
 "pet-virtualenv",
 "regex",
- "winreg 0.55.0",
+ "winreg 0.52.0",
 ]

 [[package]]
@@ -11165,15 +11148,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

-[[package]]
-name = "quick-xml"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.32.0"
@@ -12069,7 +12043,8 @@ dependencies = [
 [[package]]
 name = "runtimelib"
 version = "0.25.0"
-source = "git+https://github.com/ConradIrwin/runtimed?rev=7130c804216b6914355d15d0b91ea91f6babd734#7130c804216b6914355d15d0b91ea91f6babd734"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9af6ed9fd10d7ee940676945510c197c2a472806bb652096a713985c44ffd643"
 dependencies = [
 "anyhow",
 "async-dispatcher",
@@ -12401,27 +12376,6 @@ dependencies = [
 "winapi-util",
 ]

-[[package]]
-name = "scap"
-version = "0.0.8"
-source = "git+https://github.com/zed-industries/scap?rev=08f0a01417505cc0990b9931a37e5120db92e0d0#08f0a01417505cc0990b9931a37e5120db92e0d0"
-dependencies = [
- "anyhow",
- "cocoa 0.25.0",
- "core-graphics-helmer-fork",
- "log",
- "objc",
- "rand 0.8.5",
- "screencapturekit",
- "screencapturekit-sys",
- "sysinfo",
- "tao-core-video-sys",
- "windows 0.61.1",
- "windows-capture",
- "x11",
- "xcb",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.27"
@@ -12488,29 +12442,6 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f6280af86e5f559536da57a45ebc84948833b3bee313a7dd25232e09c878a52"

-[[package]]
-name = "screencapturekit"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5eeeb57ac94960cfe5ff4c402be6585ae4c8d29a2cf41b276048c2e849d64e"
-dependencies = [
- "screencapturekit-sys",
-]
-
-[[package]]
-name = "screencapturekit-sys"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22411b57f7d49e7fe08025198813ee6fd65e1ee5eff4ebc7880c12c82bde4c60"
-dependencies = [
- "block",
- "dispatch",
- "objc",
- "objc-foundation",
- "objc_id",
- "once_cell",
-]
-
 [[package]]
 name = "scrypt"
 version = "0.11.0"
@@ -14073,18 +14004,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bdb6fa0dfa67b38c1e66b7041ba9dcf23b99d8121907cd31c807a332f7a0bbb"

-[[package]]
-name = "tao-core-video-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -14625,9 +14544,9 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
 "backtrace",
 "bytes 1.10.1",
@@ -15296,6 +15215,24 @@ dependencies = [
 "utf-8",
 ]

+[[package]]
+name = "tungstenite"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+dependencies = [
+ "byteorder",
+ "bytes 1.10.1",
+ "data-encoding",
+ "http 1.3.1",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror 1.0.69",
+ "utf-8",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.26.2"
@@ -16736,20 +16673,6 @@ dependencies = [
 "windows-numerics",
 ]

-[[package]]
-name = "windows-capture"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6001b777f61cafce437201de46a019ed7f4afed3b669f02e5ce4e0759164cb3e"
-dependencies = [
- "clap",
- "ctrlc",
- "parking_lot",
- "rayon",
- "thiserror 1.0.69",
- "windows 0.58.0",
-]
-
 [[package]]
 name = "windows-collections"
 version = "0.2.0"
@@ -17199,16 +17122,6 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "winreg"
-version = "0.55.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
-dependencies = [
- "cfg-if",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "winresource"
 version = "0.1.20"
@@ -17659,6 +17572,7 @@ dependencies = [
 "scopeguard",
 "sea-orm",
 "sea-query-binder",
+ "security-framework 2.11.1",
 "security-framework 3.2.0",
 "security-framework-sys",
 "semver",
@@ -17689,7 +17603,6 @@ dependencies = [
 "toml_edit",
 "tracing",
 "tracing-core",
- "tungstenite 0.26.2",
 "unicode-properties",
 "url",
 "uuid",
@@ -17763,16 +17676,6 @@ dependencies = [
 "tap",
 ]

-[[package]]
-name = "x11"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "x11-clipboard"
 version = "0.9.3"
@@ -17811,18 +17714,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "xcb"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e2f212bb1a92cd8caac8051b829a6582ede155ccb60b5d5908b81b100952be"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "quick-xml 0.30.0",
- "x11",
-]
-
 [[package]]
 name = "xcursor"
 version = "0.3.8"
@@ -18043,7 +17934,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.182.0"
+version = "0.181.4"
 dependencies = [
 "activity_indicator",
 "agent",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
    "crates/assets",
    "crates/assistant",
    "crates/assistant_context_editor",
-    "crates/agent_eval",
+    "crates/assistant_eval",
    "crates/assistant_settings",
    "crates/assistant_slash_command",
    "crates/assistant_slash_commands",
@@ -215,7 +215,7 @@ askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
-assistant_eval = { path = "crates/agent_eval" }
+assistant_eval = { path = "crates/assistant_eval" }
 assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
@@ -396,7 +396,7 @@ async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "8
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-trait = "0.1"
-async-tungstenite = "0.29.1"
+async-tungstenite = "0.28"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
@@ -425,7 +425,7 @@ core-foundation = "0.10.0"
 core-foundation-sys = "0.8.6"
 ctor = "0.4.0"
 dashmap = "6.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "be69a016ba710191b9fdded28c8b042af4b617f7" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "bfd4af0" }
 derive_more = "0.99.17"
 dirs = "4.0"
 ec4rs = "1.1"
@@ -453,8 +453,8 @@ indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
 jsonwebtoken = "9.3"
-jupyter-protocol = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
-jupyter-websocket-client = {  git = "https://github.com/ConradIrwin/runtimed" ,rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+jupyter-protocol = { version = "0.6.0" }
+jupyter-websocket-client = { version = "0.9.0" }
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
@@ -463,22 +463,21 @@ log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
 mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
 nanoid = "0.4"
-nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+nbformat = { version = "0.10.0" }
 nix = "0.29"
-objc = "0.2"
 open = "5.0.0"
 num-format = "0.4.4"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 pathdiff = "0.2"
-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
+pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
 proc-macro2 = "1.0.93"
@@ -501,7 +500,7 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f
    "stream",
 ] }
 rsa = "0.9.6"
-runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
+runtimelib = { version = "0.25.0", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rustc-demangle = "0.1.23"
@@ -509,7 +508,6 @@ rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.22" }
 rustls-platform-verifier = "0.5.0"
-scap = { git = "https://github.com/zed-industries/scap", rev = "08f0a01417505cc0990b9931a37e5120db92e0d0", default-features = false }
 schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -549,7 +547,7 @@ time = { version = "0.3", features = [
 tiny_http = "0.8"
 toml = "0.8"
 tokio = { version = "1" }
-tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
+tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"]}
 tower-http = "0.4.4"
 tree-sitter = { version = "0.25.3", features = ["wasm"] }
 tree-sitter-bash = "0.23"
@@ -661,6 +659,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" }
 notify = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }
 notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }

@@ -669,6 +668,7 @@ workspace-hack = { path = "tooling/workspace-hack" }

 [profile.dev]
 split-debuginfo = "unpacked"
+debug = "limited"
 codegen-units = 16

 [profile.dev.package]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.86-bookworm as builder
+FROM rust:1.81-bookworm as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/arrow_down_right.svg
+++ b/assets/icons/arrow_down_right.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-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></svg>
--- a/assets/icons/arrow_up_right.svg
+++ b/assets/icons/arrow_up_right.svg
@@ -1 +1,3 @@
-<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-right-icon lucide-arrow-up-right"><path d="M7 7h10v10"/><path d="M7 17 17 7"/></svg>
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 2H6.5C6.5 1.86739 6.44732 1.74021 6.35355 1.64645C6.25979 1.55268 6.13261 1.5 6 1.5V2ZM2 1.5C1.72386 1.5 1.5 1.72386 1.5 2C1.5 2.27614 1.72386 2.5 2 2.5L2 1.5ZM5.5 6C5.5 6.27614 5.72386 6.5 6 6.5C6.27614 6.5 6.5 6.27614 6.5 6H5.5ZM1.64645 5.64645C1.45118 5.84171 1.45118 6.15829 1.64645 6.35355C1.84171 6.54882 2.15829 6.54882 2.35355 6.35355L1.64645 5.64645ZM6 1.5H2L2 2.5H6V1.5ZM5.5 2V6H6.5V2H5.5ZM5.64645 1.64645L1.64645 5.64645L2.35355 6.35355L6.35355 2.35355L5.64645 1.64645Z" fill="white"/>
+</svg>
--- a/assets/icons/bug_off.svg
+++ b/assets/icons/bug_off.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-off-icon lucide-bug-off"><path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2"/><path d="M14.12 3.88 16 2"/><path d="M22 13h-4v-2a4 4 0 0 0-4-4h-1.3"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="m2 2 20 20"/><path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13"/><path d="M12 20v-8"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/></svg>
--- a/assets/icons/circle_off.svg
+++ b/assets/icons/circle_off.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-icon 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/power.svg
+++ b/assets/icons/power.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-power-icon lucide-power"><path d="M12 2v10"/><path d="M18.4 6.6a9 9 0 1 1-12.77.04"/></svg>
--- a/assets/icons/send.svg
+++ b/assets/icons/send.svg
@@ -1,4 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.09666 3.02263C3.0567 3.00312 3.01178 2.9961 2.96778 3.0025C2.92377 3.00889 2.88271 3.02839 2.84995 3.05847C2.8172 3.08854 2.79426 3.12778 2.78413 3.17108C2.77401 3.21439 2.77716 3.25973 2.79319 3.30121L4.05638 6.69C4.13088 6.89005 4.13088 7.11022 4.05638 7.31027L2.79363 10.6991C2.77769 10.7405 2.77457 10.7858 2.78469 10.829C2.79481 10.8722 2.8177 10.9114 2.85038 10.9414C2.88306 10.9715 2.92402 10.991 2.96794 10.9975C3.01186 11.0039 3.05671 10.997 3.09666 10.9776L11.0943 7.20097C11.1324 7.18297 11.1645 7.15455 11.187 7.11899C11.2096 7.08344 11.2215 7.04222 11.2215 7.00014C11.2215 6.95805 11.2096 6.91683 11.187 6.88128C11.1645 6.84573 11.1324 6.8173 11.0943 6.79931L3.09666 3.02263Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.11255 7.00014H11.2216" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/stop_filled.svg
+++ b/assets/icons/stop_filled.svg
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 9.8V4.2C4 4.08954 4.08954 4 4.2 4H9.8C9.91046 4 10 4.08954 10 4.2V9.8C10 9.91046 9.91046 10 9.8 10H4.2C4.08954 10 4 9.91046 4 9.8Z" fill="#C56757" stroke="#C56757" stroke-width="1.25" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -311,7 +311,6 @@
      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
      "back": "pane::GoBack",
      "ctrl-alt--": "pane::GoBack",
      "ctrl-alt-_": "pane::GoForward",
@@ -482,8 +481,6 @@
      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
      // also possible to spawn tasks by name:
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
  {
@@ -624,6 +621,7 @@
    "context": "AgentPanel",
    "bindings": {
      "ctrl-n": "agent::NewThread",
+      "new": "agent::NewThread",
      "ctrl-alt-n": "agent::NewPromptEditor",
      "ctrl-shift-h": "agent::OpenHistory",
      "ctrl-alt-c": "agent::OpenConfiguration",
@@ -634,13 +632,6 @@
      "ctrl-alt-e": "agent::RemoveAllContext"
    }
  },
-  {
-    "context": "AgentPanel > Markdown",
-    "bindings": {
-      "copy": "markdown::CopyAsMarkdown",
-      "ctrl-c": "markdown::CopyAsMarkdown"
-    }
-  },
  {
    "context": "AgentPanel && prompt_editor",
    "use_key_equivalents": true,
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -291,13 +291,6 @@
      "cmd-alt-e": "agent::RemoveAllContext"
    }
  },
-  {
-    "context": "AgentPanel > Markdown",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-c": "markdown::CopyAsMarkdown"
-    }
-  },
  {
    "context": "AgentPanel && prompt_editor",
    "use_key_equivalents": true,
@@ -345,24 +338,6 @@
      "enter": "agent::AcceptSuggestedContext"
    }
  },
-  {
-    "context": "AgentConfiguration",
-    "bindings": {
-      "ctrl--": "pane::GoBack"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "bindings": {
-      "ctrl--": "pane::GoBack"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "bindings": {
-      "ctrl--": "pane::GoBack"
-    }
-  },
  {
    "context": "ThreadHistory > Editor",
    "bindings": {
@@ -455,8 +430,7 @@
      "cmd-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
      "cmd-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "cmd-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "cmd-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "cmd-k cmd-w": "workspace::CloseAllItemsAndPanes",
+      "cmd-k cmd-w": ["pane::CloseAllItems", { "close_pinned": false }],
      "cmd-f": "project_search::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPreviousMatch",
@@ -525,7 +499,7 @@
      "cmd-k cmd-9": ["editor::FoldAtLevel", 9],
      "cmd-k cmd-0": "editor::FoldAll",
      "cmd-k cmd-j": "editor::UnfoldAll",
-      // Using `ctrl-space` / `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
+      // Using `ctrl-space` in Zed requires disabling the macOS global shortcut.
      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
      "ctrl-space": "editor::ShowCompletions",
      "ctrl-shift-space": "editor::ShowWordCompletions",
@@ -633,8 +607,6 @@
      "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
      // also possible to spawn tasks by name:
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
  // Bindings from Sublime Text
@@ -1003,8 +975,6 @@
      "cmd-home": "terminal::ScrollToTop",
      "shift-end": "terminal::ScrollToBottom",
      "cmd-end": "terminal::ScrollToBottom",
-      // Using `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
-      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
      "ctrl-shift-space": "terminal::ToggleViMode",
      "ctrl-k up": "pane::SplitUp",
      "ctrl-k down": "pane::SplitDown",
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -44,12 +44,6 @@
      "[ /": "vim::PreviousComment",
      "] *": "vim::NextComment",
      "] /": "vim::NextComment",
-      "[ -": "vim::PreviousLesserIndent",
-      "[ +": "vim::PreviousGreaterIndent",
-      "[ =": "vim::PreviousSameIndent",
-      "] -": "vim::NextLesserIndent",
-      "] +": "vim::NextGreaterIndent",
-      "] =": "vim::NextSameIndent",
      // Word motions
      "w": "vim::NextWordStart",
      "e": "vim::NextWordEnd",
@@ -341,106 +335,27 @@
    }
  },
  {
-    "context": "vim_mode == helix_normal && !menu",
+    "context": "vim_mode == helix_normal",
    "bindings": {
-      "escape": "editor::Cancel",
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "y": "editor::Copy",
-      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
-      "shift-i": "vim::InsertFirstNonWhitespace",
      "a": "vim::InsertAfter",
-      "shift-a": "vim::InsertEndOfLine",
-      "o": "vim::InsertLineBelow",
-      "shift-o": "vim::InsertLineAbove",
-      "~": "vim::ChangeCase",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "before": true }],
-      "u": "vim::Undo",
-      "ctrl-r": "vim::Redo",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      ">": "vim::Indent",
-      "<": "vim::Outdent",
-      "=": "vim::AutoIndent",
-      "g u": "vim::PushLowercase",
-      "g shift-u": "vim::PushUppercase",
-      "g ~": "vim::PushOppositeCase",
-      "\"": "vim::PushRegister",
-      "g q": "vim::PushRewrap",
-      "g w": "vim::PushRewrap",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "insert": "vim::InsertBefore",
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPreviousDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPreviousHunk",
-      // Goto mode
-      "g n": "pane::ActivateNextItem",
-      "g p": "pane::ActivatePreviousItem",
-      // "tab": "pane::ActivateNextItem",
-      // "shift-tab": "pane::ActivatePrevItem",
-      "shift-h": "pane::ActivatePreviousItem",
-      "shift-l": "pane::ActivateNextItem",
-      "g l": "vim::EndOfLine",
-      "g h": "vim::StartOfLine",
-      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
-      "g e": "vim::EndOfDocument",
-      "g y": "editor::GoToTypeDefinition",
-      "g r": "editor::FindAllReferences", // zed specific
-      "g t": "vim::WindowTop",
-      "g c": "vim::WindowMiddle",
-      "g b": "vim::WindowBottom",
-
-      "x": "editor::SelectLine",
-      "shift-x": "editor::SelectLine",
-      // Window mode
-      "space w h": "workspace::ActivatePaneLeft",
-      "space w l": "workspace::ActivatePaneRight",
-      "space w k": "workspace::ActivatePaneUp",
-      "space w j": "workspace::ActivatePaneDown",
-      "space w q": "pane::CloseActiveItem",
-      "space w s": "pane::SplitRight",
-      "space w r": "pane::SplitRight",
-      "space w v": "pane::SplitDown",
-      "space w d": "pane::SplitDown",
-      // Space mode
-      "space f": "file_finder::Toggle",
-      "space k": "editor::Hover",
-      "space s": "outline::Toggle",
-      "space shift-s": "project_symbols::Toggle",
-      "space d": "editor::GoToDiagnostic",
-      "space r": "editor::Rename",
-      "space a": "editor::ToggleCodeActions",
-      "space h": "editor::SelectAllMatches",
-      "space c": "editor::ToggleComments",
-      "space y": "editor::Copy",
-      "space p": "editor::Paste",
-      // Match mode
-      "m m": "vim::Matching",
-      "m i w": ["workspace::SendKeystrokes", "v i w"],
-      "shift-u": "editor::Redo",
-      "ctrl-c": "editor::ToggleComments",
      "d": "vim::HelixDelete",
-      "c": "vim::Substitute",
-      "shift-c": "editor::AddSelectionBelow"
+      "w": "vim::NextWordStart",
+      "e": "vim::NextWordEnd",
+      "b": "vim::PreviousWordStart",
+
+      "h": "vim::Left",
+      "j": "vim::Down",
+      "k": "vim::Up",
+      "l": "vim::Right"
    }
  },
+
  {
    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
    "bindings": {
-      "ctrl-p": "editor::ShowWordCompletions",
-      "ctrl-n": "editor::ShowWordCompletions"
+      "ctrl-p": "editor::ShowCompletions",
+      "ctrl-n": "editor::ShowCompletions"
    }
  },
  {
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -9,9 +9,6 @@ You should only perform actions that modify the user's system if explicitly requ
 - If the user asks a question about how to accomplish a task, provide guidance or information, and use read-only tools (e.g., search) to assist. You may suggest potential actions, but do not directly modify the user’s system without explicit instruction.
 - If the user clearly requests that you perform an action, carry out the action directly without explaining why you are doing so.

-When answering questions, it's okay to give incomplete examples containing comments about what would go there in a real version. When being asked to directly perform tasks on the code base, you must ALWAYS make fully working code. You may never "simplify" the code by omitting or deleting functionality you know the user has requested, and you must NEVER write comments like "in a full version, this would..." - instead, you must actually implement the real version. Don't be lazy!
-
-<style>
 Editing code:
 - Make sure to take previous edits into account.
 - The edits you perform might lead to errors or warnings. At the end of your changes, check whether you introduced any problems, and fix them before providing a summary of the changes you made.
@@ -37,106 +34,6 @@ Responding:
    For example, don't say "Now I'm going to check diagnostics to see if there are any warnings or errors," followed by running a tool which checks diagnostics and reports warnings or errors; instead, just request the tool call without saying anything.
 - All tool results are provided to you automatically, so DO NOT thank the user when this happens.

-Whenever you mention a code block, you MUST use ONLY the following format:
-
-```language path/to/Something.blah#L123-456
-(code goes here)
-```
-
-The `#L123-456` means the line number range 123 through 456, and the path/to/Something.blah
-is a path in the project. (If there is no valid path in the project, then you can use
-/dev/null/path.extension for its path.) This is the ONLY valid way to format code blocks, because the Markdown parser
-does not understand the more common ```language syntax, or bare ``` blocks. It only
-understands this path-based syntax, and if the path is missing, then it will error and you will have to do it over again.
-
-Just to be really clear about this, if you ever find yourself writing three backticks followed by a language name, STOP!
-You have made a mistake. You can only ever put paths after triple backticks!
-
-<example>
-Based on all the information I've gathered, here's a summary of how this system works:
-1. The README file is loaded into the system.
-2. The system finds the first two headers, including everything in between. In this case, that would be:
-
-```path/to/README.md#L8-12
-# First Header
-
-This is the info under the first header.
-
-## Sub-header
-```
-
-3. Then the system finds the last header in the README:
-
-```path/to/README.md#L27-29
-## Last Header
-
-This is the last header in the README.
-```
-
-4. Finally, it passes this information on to the next process.
-</example>
-
-<example>
-In Markdown, hash marks signify headings. For example:
-
-```/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</example>
-
-Here are examples of ways you must never render code blocks:
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-
-```
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-
-This example is unacceptable because it does not include the path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-
-```markdown
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-
-This example is unacceptable because it has the language instead of the path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-
-    # Level 1 heading
-    ## Level 2 heading
-    ### Level 3 heading
-</bad_example_do_not_do_this>
-
-This example is unacceptable because it uses indentation to mark the code block
-instead of backticks with a path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-
-```markdown
-/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-
-This example is unacceptable because the path is in the wrong place. The path must be directly after the opening backticks.
-</style>
-
 The user has opened a project that contains the following root directories/files. Whenever you specify a path in the project, it must be a relative path which begins with one of these root directories/files:

 {{#each worktrees}}
--- a/assets/prompts/project_slash_command.hbs
+++ b/assets/prompts/project_slash_command.hbs
@@ -0,0 +1,8 @@
+A software developer is asking a question about their project. The source files in their project have been indexed into a database of semantic text embeddings.
+Your task is to generate a list of 4 diverse search queries that can be run on this embedding database, in order to retrieve a list of code snippets
+that are relevant to the developer's question. Redundant search queries will be heavily penalized, so only include another query if it's sufficiently
+distinct from previous ones.
+
+Here is the question that's been asked, together with context that the developer has added manually:
+
+{{{context_buffer}}}
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1200,27 +1200,7 @@
    // When set to 0, waits indefinitely.
    //
    // Default: 0
-    "lsp_fetch_timeout_ms": 0,
-    // Controls what range to replace when accepting LSP completions.
-    //
-    // When LSP servers give an `InsertReplaceEdit` completion, they provides two ranges: `insert` and `replace`. Usually, `insert`
-    // contains the word prefix before your cursor and `replace` contains the whole word.
-    //
-    // Effectively, this setting just changes whether Zed will use the received range for `insert` or `replace`, so the results may
-    // differ depending on the underlying LSP server.
-    //
-    // Possible values:
-    // 1. "insert"
-    //   Replaces text before the cursor, using the `insert` range described in the LSP specification.
-    // 2. "replace"
-    //   Replaces text before and after the cursor, using the `replace` range described in the LSP specification.
-    // 3. "replace_subsequence"
-    //   Behaves like `"replace"` if the text that would be replaced is a subsequence of the completion text,
-    //   and like `"insert"` otherwise.
-    // 4. "replace_suffix"
-    //   Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
-    //   `"insert"` otherwise.
-    "lsp_insert_mode": "replace_suffix"
+    "lsp_fetch_timeout_ms": 0
  },
  // Different settings for specific languages.
  "languages": {
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -43,8 +43,6 @@
    //           "args": ["--login"]
    //         }
    //     }
-    "shell": "system",
-    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    "tags": []
+    "shell": "system"
  }
 ]
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -87,9 +87,9 @@
        "terminal.ansi.blue": "#83a598ff",
        "terminal.ansi.bright_blue": "#414f4aff",
        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.magenta": "#a89984ff",
+        "terminal.ansi.bright_magenta": "#514a41ff",
+        "terminal.ansi.dim_magenta": "#d2cabfff",
        "terminal.ansi.cyan": "#8ec07cff",
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
@@ -472,9 +472,9 @@
        "terminal.ansi.blue": "#83a598ff",
        "terminal.ansi.bright_blue": "#414f4aff",
        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.magenta": "#a89984ff",
+        "terminal.ansi.bright_magenta": "#514a41ff",
+        "terminal.ansi.dim_magenta": "#d2cabfff",
        "terminal.ansi.cyan": "#8ec07cff",
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
@@ -857,9 +857,9 @@
        "terminal.ansi.blue": "#83a598ff",
        "terminal.ansi.bright_blue": "#414f4aff",
        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.magenta": "#a89984ff",
+        "terminal.ansi.bright_magenta": "#514a41ff",
+        "terminal.ansi.dim_magenta": "#d2cabfff",
        "terminal.ansi.cyan": "#8ec07cff",
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
@@ -1242,9 +1242,9 @@
        "terminal.ansi.blue": "#0b6678ff",
        "terminal.ansi.bright_blue": "#8fb0baff",
        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.magenta": "#7c6f64ff",
+        "terminal.ansi.bright_magenta": "#bcb5afff",
+        "terminal.ansi.dim_magenta": "#3e3833ff",
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
@@ -1627,9 +1627,9 @@
        "terminal.ansi.blue": "#0b6678ff",
        "terminal.ansi.bright_blue": "#8fb0baff",
        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.magenta": "#7c6f64ff",
+        "terminal.ansi.bright_magenta": "#bcb5afff",
+        "terminal.ansi.dim_magenta": "#3e3833ff",
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
@@ -2012,9 +2012,9 @@
        "terminal.ansi.blue": "#0b6678ff",
        "terminal.ansi.bright_blue": "#8fb0baff",
        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.magenta": "#7c6f64ff",
+        "terminal.ansi.bright_magenta": "#bcb5afff",
+        "terminal.ansi.dim_magenta": "#3e3833ff",
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -11,22 +11,13 @@ use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
 use project::{
    EnvironmentErrorMessage, LanguageServerProgress, LspStoreEvent, Project,
    ProjectEnvironmentEvent,
-    git_store::{GitStoreEvent, Repository},
 };
 use smallvec::SmallVec;
-use std::{
-    cmp::Reverse,
-    fmt::Write,
-    path::Path,
-    sync::Arc,
-    time::{Duration, Instant},
-};
+use std::{cmp::Reverse, fmt::Write, path::Path, sync::Arc, time::Duration};
 use ui::{ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
 use util::truncate_and_trailoff;
 use workspace::{StatusItemView, Workspace, item::ItemHandle};

-const GIT_OPERATION_DELAY: Duration = Duration::from_millis(0);
-
 actions!(activity_indicator, [ShowErrorMessage]);

 pub enum Event {
@@ -114,15 +105,6 @@ impl ActivityIndicator {
            )
            .detach();

-            cx.subscribe(
-                &project.read(cx).git_store().clone(),
-                |_, _, event: &GitStoreEvent, cx| match event {
-                    project::git_store::GitStoreEvent::JobsUpdated => cx.notify(),
-                    _ => {}
-                },
-            )
-            .detach();
-
            if let Some(auto_updater) = auto_updater.as_ref() {
                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach();
            }
@@ -303,34 +285,6 @@ impl ActivityIndicator {
            });
        }

-        let current_job = self
-            .project
-            .read(cx)
-            .active_repository(cx)
-            .map(|r| r.read(cx))
-            .and_then(Repository::current_job);
-        // Show any long-running git command
-        if let Some(job_info) = current_job {
-            if Instant::now() - job_info.start >= GIT_OPERATION_DELAY {
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            )
-                            .into_any_element(),
-                    ),
-                    message: job_info.message.into(),
-                    on_click: None,
-                });
-            }
-        }
-
        // Show any language server installation info.
        let mut downloading = SmallVec::<[_; 3]>::new();
        let mut checking_for_update = SmallVec::<[_; 3]>::new();
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -84,6 +84,7 @@ ui.workspace = true
 ui_input.workspace = true
 util.workspace = true
 uuid.workspace = true
+vim_mode_setting.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 workspace-hack.workspace = true
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -792,11 +792,15 @@ impl editor::Addon for AgentDiffAddon {

 pub struct AgentDiffToolbar {
    agent_diff: Option<WeakEntity<AgentDiff>>,
+    _workspace: WeakEntity<Workspace>,
 }

 impl AgentDiffToolbar {
-    pub fn new() -> Self {
-        Self { agent_diff: None }
+    pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
+        Self {
+            agent_diff: None,
+            _workspace: workspace.weak_handle(),
+        }
    }

    fn agent_diff(&self, _: &App) -> Option<Entity<AgentDiff>> {
--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -409,7 +409,6 @@ impl Render for AssistantConfiguration {

        v_flex()
            .id("assistant-configuration")
-            .key_context("AgentConfiguration")
            .track_focus(&self.focus_handle(cx))
            .bg(cx.theme().colors().panel_background)
            .size_full()
--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
@@ -178,7 +178,6 @@ pub struct AssistantPanel {
    configuration_subscription: Option<Subscription>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
-    previous_view: Option<ActiveView>,
    history_store: Entity<HistoryStore>,
    history: Entity<ThreadHistory>,
    assistant_dropdown_menu_handle: PopoverMenuHandle<ContextMenu>,
@@ -293,7 +292,6 @@ impl AssistantPanel {
                chrono::Local::now().offset().local_minus_utc(),
            )
            .unwrap(),
-            previous_view: None,
            history_store: history_store.clone(),
            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
            assistant_dropdown_menu_handle: PopoverMenuHandle::default(),
@@ -339,8 +337,7 @@ impl AssistantPanel {
            .thread_store
            .update(cx, |this, cx| this.create_thread(cx));

-        let thread_view = ActiveView::thread(thread.clone(), window, cx);
-        self.set_active_view(thread_view, window, cx);
+        self.active_view = ActiveView::thread(thread.clone(), window, cx);

        let message_editor_context_store = cx.new(|_cx| {
            crate::context_store::ContextStore::new(
@@ -403,7 +400,7 @@ impl AssistantPanel {
    }

    fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_active_view(ActiveView::PromptEditor, window, cx);
+        self.active_view = ActiveView::PromptEditor;

        let context = self
            .context_store
@@ -453,16 +450,11 @@ impl AssistantPanel {
    }

    fn open_history(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if matches!(self.active_view, ActiveView::History) {
-            if let Some(previous_view) = self.previous_view.take() {
-                self.set_active_view(previous_view, window, cx);
-            }
-        } else {
-            self.thread_store
-                .update(cx, |thread_store, cx| thread_store.reload(cx))
-                .detach_and_log_err(cx);
-            self.set_active_view(ActiveView::History, window, cx);
-        }
+        self.thread_store
+            .update(cx, |thread_store, cx| thread_store.reload(cx))
+            .detach_and_log_err(cx);
+        self.active_view = ActiveView::History;
+        self.history.focus_handle(cx).focus(window);
        cx.notify();
    }

@@ -495,7 +487,7 @@ impl AssistantPanel {
                        cx,
                    )
                });
-                this.set_active_view(ActiveView::PromptEditor, window, cx);
+                this.active_view = ActiveView::PromptEditor;
                this.context_editor = Some(editor);

                anyhow::Ok(())
@@ -517,8 +509,7 @@ impl AssistantPanel {
        cx.spawn_in(window, async move |this, cx| {
            let thread = open_thread_task.await?;
            this.update_in(cx, |this, window, cx| {
-                let thread_view = ActiveView::thread(thread.clone(), window, cx);
-                this.set_active_view(thread_view, window, cx);
+                this.active_view = ActiveView::thread(thread.clone(), window, cx);
                let message_editor_context_store = cx.new(|_cx| {
                    crate::context_store::ContextStore::new(
                        this.workspace.clone(),
@@ -552,17 +543,6 @@ impl AssistantPanel {
        })
    }

-    pub fn go_back(&mut self, _: &workspace::GoBack, window: &mut Window, cx: &mut Context<Self>) {
-        match self.active_view {
-            ActiveView::Configuration | ActiveView::History => {
-                self.active_view =
-                    ActiveView::thread(self.thread.read(cx).thread().clone(), window, cx);
-                cx.notify();
-            }
-            _ => {}
-        }
-    }
-
    pub fn open_agent_diff(
        &mut self,
        _: &OpenAgentDiff,
@@ -582,7 +562,7 @@ impl AssistantPanel {
        let tools = self.thread_store.read(cx).tools();
        let fs = self.fs.clone();

-        self.set_active_view(ActiveView::Configuration, window, cx);
+        self.active_view = ActiveView::Configuration;
        self.configuration =
            Some(cx.new(|cx| {
                AssistantConfiguration::new(fs, context_server_manager, tools, window, cx)
@@ -710,29 +690,6 @@ impl AssistantPanel {
        self.context_store
            .update(cx, |this, cx| this.delete_local_context(path, cx))
    }
-
-    fn set_active_view(
-        &mut self,
-        new_view: ActiveView,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_is_history = matches!(self.active_view, ActiveView::History);
-        let new_is_history = matches!(new_view, ActiveView::History);
-
-        if current_is_history && !new_is_history {
-            self.active_view = new_view;
-        } else if !current_is_history && new_is_history {
-            self.previous_view = Some(std::mem::replace(&mut self.active_view, new_view));
-        } else {
-            if !new_is_history {
-                self.previous_view = None;
-            }
-            self.active_view = new_view;
-        }
-
-        self.focus_handle(cx).focus(window);
-    }
 }

 impl Focusable for AssistantPanel {
@@ -882,6 +839,7 @@ impl AssistantPanel {
        h_flex()
            .key_context("TitleEditor")
            .id("TitleEditor")
+            .pl_2()
            .flex_grow()
            .w_full()
            .max_w_full()
@@ -900,37 +858,12 @@ impl AssistantPanel {
        let is_empty = active_thread.is_empty();
        let focus_handle = self.focus_handle(cx);

-        let is_history = matches!(self.active_view, ActiveView::History);
-
        let show_token_count = match &self.active_view {
            ActiveView::Thread { .. } => !is_empty,
            ActiveView::PromptEditor => self.context_editor.is_some(),
            _ => false,
        };

-        let go_back_button = match &self.active_view {
-            ActiveView::History | ActiveView::Configuration => Some(
-                IconButton::new("go-back", IconName::ArrowLeft)
-                    .icon_size(IconSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.go_back(&workspace::GoBack, window, cx);
-                    }))
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |window, cx| {
-                            Tooltip::for_action_in(
-                                "Go Back",
-                                &workspace::GoBack,
-                                &focus_handle,
-                                window,
-                                cx,
-                            )
-                        }
-                    }),
-            ),
-            _ => None,
-        };
-
        h_flex()
            .id("assistant-toolbar")
            .h(Tab::container_height(cx))
@@ -941,14 +874,7 @@ impl AssistantPanel {
            .bg(cx.theme().colors().tab_bar_background)
            .border_b_1()
            .border_color(cx.theme().colors().border)
-            .child(
-                h_flex()
-                    .w_full()
-                    .pl_2()
-                    .gap_2()
-                    .children(go_back_button)
-                    .child(self.render_title_view(window, cx)),
-            )
+            .child(self.render_title_view(window, cx))
            .child(
                h_flex()
                    .h_full()
@@ -1043,27 +969,6 @@ impl AssistantPanel {
                                        );
                                    }),
                            )
-                            .child(
-                                IconButton::new("open-history", IconName::HistoryRerun)
-                                    .icon_size(IconSize::Small)
-                                    .toggle_state(is_history)
-                                    .selected_icon_color(Color::Accent)
-                                    .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(
                                PopoverMenu::new("assistant-menu")
                                    .trigger_with_tooltip(
@@ -1080,6 +985,12 @@ impl AssistantPanel {
                                            cx,
                                            |menu, _window, _cx| {
                                                menu.action(
+                                                    "New Thread",
+                                                    Box::new(NewThread {
+                                                        from_thread_id: None,
+                                                    }),
+                                                )
+                                                .action(
                                                    "New Prompt Editor",
                                                    NewPromptEditor.boxed_clone(),
                                                )
@@ -1092,6 +1003,7 @@ impl AssistantPanel {
                                                    )
                                                })
                                                .separator()
+                                                .action("History", OpenHistory.boxed_clone())
                                                .action("Settings", OpenConfiguration.boxed_clone())
                                            },
                                        ))
@@ -1588,7 +1500,6 @@ impl Render for AssistantPanel {
            .on_action(cx.listener(Self::open_active_thread_as_markdown))
            .on_action(cx.listener(Self::deploy_prompt_library))
            .on_action(cx.listener(Self::open_agent_diff))
-            .on_action(cx.listener(Self::go_back))
            .child(self.render_toolbar(window, cx))
            .map(|parent| match self.active_view {
                ActiveView::Thread { .. } => parent
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -28,7 +28,7 @@ use std::{
    time::Instant,
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};

 pub struct BufferCodegen {
    alternatives: Vec<Entity<CodegenAlternative>>,
@@ -601,7 +601,7 @@ impl CodegenAlternative {

                        let error_message = result.as_ref().err().map(|error| error.to_string());
                        report_assistant_event(
-                            AssistantEventData {
+                            AssistantEvent {
                                conversation_id: None,
                                message_id,
                                kind: AssistantKind::Inline,
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -451,15 +451,6 @@ fn supported_context_picker_modes(
    modes
 }

-pub fn active_singleton_buffer_path(workspace: &Workspace, cx: &App) -> Option<PathBuf> {
-    let active_item = workspace.active_item(cx)?;
-
-    let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
-    let buffer = editor.buffer().read(cx).as_singleton()?;
-
-    let path = buffer.read(cx).file()?.path().to_path_buf();
-    Some(path)
-}
 fn recent_context_picker_entries(
    context_store: Entity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -112,7 +112,6 @@ impl ContextPickerCompletionProvider {
                        icon_path: Some(mode.icon().path().into()),
                        documentation: None,
                        source: project::CompletionSource::Custom,
-                        insert_text_mode: None,
                        // This ensures that when a user accepts this completion, the
                        // completion menu will still be shown after "@category " is
                        // inserted
@@ -164,7 +163,6 @@ impl ContextPickerCompletionProvider {
            new_text,
            label: CodeLabel::plain(thread_entry.summary.to_string(), None),
            documentation: None,
-            insert_text_mode: None,
            source: project::CompletionSource::Custom,
            icon_path: Some(icon_for_completion.path().into()),
            confirm: Some(confirm_completion_callback(
@@ -211,7 +209,6 @@ impl ContextPickerCompletionProvider {
            documentation: None,
            source: project::CompletionSource::Custom,
            icon_path: Some(IconName::Globe.path().into()),
-            insert_text_mode: None,
            confirm: Some(confirm_completion_callback(
                IconName::Globe.path().into(),
                url_to_fetch.clone(),
@@ -293,7 +290,6 @@ impl ContextPickerCompletionProvider {
            documentation: None,
            source: project::CompletionSource::Custom,
            icon_path: Some(completion_icon_path),
-            insert_text_mode: None,
            confirm: Some(confirm_completion_callback(
                crease_icon_path,
                file_name,
@@ -356,7 +352,6 @@ impl ContextPickerCompletionProvider {
            documentation: None,
            source: project::CompletionSource::Custom,
            icon_path: Some(IconName::Code.path().into()),
-            insert_text_mode: None,
            confirm: Some(confirm_completion_callback(
                IconName::Code.path().into(),
                symbol.name.clone().into(),
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -31,7 +31,7 @@ use project::LspAction;
 use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
@@ -402,7 +402,7 @@ impl InlineAssistant {
            codegen_ranges.push(anchor_range);

            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
-                self.telemetry.report_assistant_event(AssistantEventData {
+                self.telemetry.report_assistant_event(AssistantEvent {
                    conversation_id: None,
                    kind: AssistantKind::Inline,
                    phase: AssistantPhase::Invoked,
@@ -987,7 +987,7 @@ impl InlineAssistant {
                        .map(|language| language.name())
                });
                report_assistant_event(
-                    AssistantEventData {
+                    AssistantEvent {
                        conversation_id: None,
                        kind: AssistantKind::Inline,
                        message_id,
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -8,7 +8,7 @@ use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
    Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription, TextStyle,
-    WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
+    WeakEntity, linear_color_stop, linear_gradient, point,
 };
 use language::Buffer;
 use language_model::{ConfiguredModel, LanguageModelRegistry};
@@ -18,8 +18,12 @@ use project::Project;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
-use ui::{Disclosure, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{
+    ButtonLike, Disclosure, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle, Tooltip,
+    prelude::*,
+};
 use util::ResultExt as _;
+use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;

 use crate::assistant_model_selector::AssistantModelSelector;
@@ -222,8 +226,7 @@ impl MessageEditor {

        let thread = self.thread.clone();
        let context_store = self.context_store.clone();
-        let git_store = self.project.read(cx).git_store().clone();
-        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
+        let checkpoint = self.project.read(cx).git_store().read(cx).checkpoint(cx);

        cx.spawn(async move |this, cx| {
            let checkpoint = checkpoint.await.ok();
@@ -351,7 +354,24 @@ impl Render for MessageEditor {
        let total_token_usage = thread.total_token_usage(cx);
        let is_model_selected = self.is_model_selected(cx);
        let is_editor_empty = self.is_editor_empty(cx);
-        let is_edit_changes_expanded = self.edits_expanded;
+        let needs_confirmation =
+            thread.has_pending_tool_uses() && thread.tools_needing_confirmation().next().is_some();
+
+        let submit_label_color = if is_editor_empty {
+            Color::Muted
+        } else {
+            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(82.)
+        } else {
+            px(64.)
+        };

        let action_log = self.thread.read(cx).action_log();
        let changed_buffers = action_log.read(cx).changed_buffers(cx);
@@ -399,6 +419,70 @@ impl Render for MessageEditor {
                    ),
                )
            })
+            .when(is_generating, |parent| {
+                let focus_handle = self.editor.focus_handle(cx).clone();
+                parent.child(
+                    h_flex().py_3().w_full().justify_center().child(
+                        h_flex()
+                            .flex_none()
+                            .pl_2()
+                            .pr_1()
+                            .py_1()
+                            .bg(editor_bg_color)
+                            .border_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .rounded_lg()
+                            .shadow_md()
+                            .gap_1()
+                            .child(
+                                Icon::new(IconName::ArrowCircle)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Muted)
+                                    .with_animation(
+                                        "arrow-circle",
+                                        Animation::new(Duration::from_secs(2)).repeat(),
+                                        |icon, delta| {
+                                            icon.transform(gpui::Transformation::rotate(
+                                                gpui::percentage(delta),
+                                            ))
+                                        },
+                                    ),
+                            )
+                            .child({
+
+
+                                Label::new(if needs_confirmation {
+                                    "Waiting for confirmation…"
+                                } else {
+                                    "Generating…"
+                                })
+                                .size(LabelSize::XSmall)
+                                .color(Color::Muted)
+                            })
+                            .child(ui::Divider::vertical())
+                            .child(
+                                Button::new("cancel-generation", "Cancel")
+                                    .label_size(LabelSize::XSmall)
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &editor::actions::Cancel,
+                                            &focus_handle,
+                                            window,
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(rems_from_px(10.))),
+                                    )
+                                    .on_click(move |_event, window, cx| {
+                                        focus_handle.dispatch_action(
+                                            &editor::actions::Cancel,
+                                            window,
+                                            cx,
+                                        );
+                                    }),
+                            ),
+                    ),
+                )
+            })
            .when(changed_buffers_count > 0, |parent| {
                parent.child(
                    v_flex()
@@ -417,12 +501,12 @@ impl Render for MessageEditor {
                        .child(
                            h_flex()
                                .id("edits-container")
-                                .cursor_pointer()
                                .p_1p5()
                                .justify_between()
-                                .when(is_edit_changes_expanded, |this| {
+                                .when(self.edits_expanded, |this| {
                                    this.border_b_1().border_color(border_color)
                                })
+                                .cursor_pointer()
                                .on_click(cx.listener(|this, _, window, cx| {
                                    this.handle_review_click(window, cx)
                                }))
@@ -432,7 +516,7 @@ impl Render for MessageEditor {
                                        .child(
                                            Disclosure::new(
                                                "edits-disclosure",
-                                                is_edit_changes_expanded,
+                                                self.edits_expanded,
                                            )
                                            .on_click(
                                                cx.listener(|this, _ev, _window, cx| {
@@ -482,9 +566,9 @@ impl Render for MessageEditor {
                                        })),
                                ),
                        )
-                        .when(is_edit_changes_expanded, |parent| {
+                        .when(self.edits_expanded, |parent| {
                            parent.child(
-                                v_flex().children(
+                                v_flex().bg(cx.theme().colors().editor_background).children(
                                    changed_buffers.into_iter().enumerate().flat_map(
                                        |(index, (buffer, _diff))| {
                                            let file = buffer.read(cx).file()?;
@@ -498,7 +582,7 @@ impl Render for MessageEditor {
                                                } else {
                                                    Some(
                                                        Label::new(format!(
-                                                            "/{}{}",
+                                                            "{}{}",
                                                            parent_str,
                                                            std::path::MAIN_SEPARATOR_STR
                                                        ))
@@ -526,105 +610,70 @@ impl Render for MessageEditor {
                                                        .size(IconSize::Small)
                                                });

-                                            let hover_color = cx.theme()
-                                                .colors()
-                                                .element_background
-                                                .blend(cx.theme().colors().editor_foreground.opacity(0.025));
-
-                                            let overlay_gradient = linear_gradient(
-                                                90.,
-                                                linear_color_stop(
-                                                    editor_bg_color,
-                                                    1.,
-                                                ),
-                                                linear_color_stop(
-                                                    editor_bg_color
-                                                        .opacity(0.2),
-                                                    0.,
-                                                ),
-                                            );
-
-                                            let overlay_gradient_hover = linear_gradient(
-                                                90.,
-                                                linear_color_stop(
-                                                    hover_color,
-                                                    1.,
-                                                ),
-                                                linear_color_stop(
-                                                    hover_color
-                                                        .opacity(0.2),
-                                                    0.,
-                                                ),
-                                            );
-
-                                            let element = h_flex()
-                                                .group("edited-code")
-                                                .id(("file-container", index))
-                                                .cursor_pointer()
+                                            let element = div()
                                                .relative()
                                                .py_1()
-                                                .pl_2()
-                                                .pr_1()
-                                                .gap_2()
-                                                .justify_between()
-                                                .bg(cx.theme().colors().editor_background)
-                                                .hover(|style| style.bg(hover_color))
+                                                .px_2()
                                                .when(index + 1 < changed_buffers_count, |parent| {
                                                    parent.border_color(border_color).border_b_1()
                                                })
                                                .child(
                                                    h_flex()
-                                                        .id("file-name")
-                                                        .pr_8()
-                                                        .gap_1p5()
-                                                        .max_w_full()
-                                                        .overflow_x_scroll()
-                                                        .child(file_icon)
+                                                        .gap_2()
+                                                        .justify_between()
                                                        .child(
                                                            h_flex()
-                                                                .gap_0p5()
-                                                                .children(name_label)
-                                                                .children(parent_label)
-                                                        ) // TODO: show lines changed
-                                                        .child(
-                                                            Label::new("+")
-                                                                .color(Color::Created),
+                                                                .id(("file-container", index))
+                                                                .pr_8()
+                                                                .gap_1p5()
+                                                                .max_w_full()
+                                                                .overflow_x_scroll()
+                                                                .cursor_pointer()
+                                                                .on_click({
+                                                                    let buffer = buffer.clone();
+                                                                    cx.listener(move |this, _, window, cx| {
+                                                                        this.handle_file_click(buffer.clone(), window, cx);
+                                                                    })
+                                                                })
+                                                                .tooltip(
+                                                                    Tooltip::text(format!("Review {}", path.display()))
+                                                                )
+                                                                .child(file_icon)
+                                                                .child(
+                                                                    h_flex()
+                                                                        .children(parent_label)
+                                                                        .children(name_label),
+                                                                ) // TODO: show lines changed
+                                                                .child(
+                                                                    Label::new("+")
+                                                                        .color(Color::Created),
+                                                                )
+                                                                .child(
+                                                                    Label::new("-")
+                                                                        .color(Color::Deleted),
+                                                                ),
                                                        )
                                                        .child(
-                                                            Label::new("-")
-                                                                .color(Color::Deleted),
+                                                            div()
+                                                                .h_full()
+                                                                .absolute()
+                                                                .w_8()
+                                                                .bottom_0()
+                                                                .right_0()
+                                                                .bg(linear_gradient(
+                                                                    90.,
+                                                                    linear_color_stop(
+                                                                        editor_bg_color,
+                                                                        1.,
+                                                                    ),
+                                                                    linear_color_stop(
+                                                                        editor_bg_color
+                                                                            .opacity(0.2),
+                                                                        0.,
+                                                                    ),
+                                                                )),
                                                        ),
-                                                )
-                                                .child(
-                                                    div().visible_on_hover("edited-code").child(
-                                                        Button::new("review", "Review")
-                                                            .label_size(LabelSize::Small)
-                                                            .on_click({
-                                                                let buffer = buffer.clone();
-                                                                cx.listener(move |this, _, window, cx| {
-                                                                    this.handle_file_click(buffer.clone(), window, cx);
-                                                                })
-                                                            })
-                                                    )
-                                                )
-                                                .child(
-                                                    div()
-                                                        .id("gradient-overlay")
-                                                        .absolute()
-                                                        .h_5_6()
-                                                        .w_12()
-                                                        .bottom_0()
-                                                        .right(px(52.))
-                                                        .bg(overlay_gradient)
-                                                        .group_hover("edited-code", |style| style.bg(overlay_gradient_hover))
-                                                    ,
-                                                )
-                                                .on_click({
-                                                    let buffer = buffer.clone();
-                                                    cx.listener(move |this, _, window, cx| {
-                                                        this.handle_file_click(buffer.clone(), window, cx);
-                                                    })
-                                                });
+                                                );

                                            Some(element)
                                        },
@@ -684,6 +733,7 @@ impl Render for MessageEditor {
                                            ..Default::default()
                                        },
                                    ).into_any()
+
                            })
                            .child(
                                PopoverMenu::new("inline-context-picker")
@@ -691,6 +741,7 @@ impl Render for MessageEditor {
                                        inline_context_picker.update(cx, |this, cx| {
                                            this.init(window, cx);
                                        });
+
                                        Some(inline_context_picker.clone())
                                    })
                                    .attach(gpui::Corner::TopLeft)
@@ -707,72 +758,60 @@ impl Render for MessageEditor {
                                    .justify_between()
                                    .child(h_flex().gap_2().child(self.profile_selector.clone()))
                                    .child(
-                                        h_flex().gap_1().child(self.model_selector.clone())
-                                            .map(|parent| {
-                                                if is_generating {
-                                                    parent.child(
-                                                        IconButton::new("stop-generation", IconName::StopFilled)
-                                                            .icon_color(Color::Error)
-                                                            .style(ButtonStyle::Tinted(ui::TintColor::Error))
-                                                            .tooltip(move |window, cx| {
-                                                                Tooltip::for_action(
-                                                                    "Stop Generation",
-                                                                    &editor::actions::Cancel,
-                                                                    window,
-                                                                    cx,
-                                                                )
-                                                            })
-                                                            .on_click(move |_event, window, cx| {
-                                                                focus_handle.dispatch_action(
-                                                                    &editor::actions::Cancel,
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                            })
-                                                            .with_animation(
-                                                                "pulsating-label",
-                                                                Animation::new(Duration::from_secs(2))
-                                                                    .repeat()
-                                                                    .with_easing(pulsating_between(0.4, 1.0)),
-                                                                |icon_button, delta| icon_button.alpha(delta),
-                                                            ),
-                                                    )
-                                                } else {
-                                                    parent.child(
-                                                        IconButton::new("send-message", IconName::Send)
-                                                            .icon_color(Color::Accent)
-                                                            .style(ButtonStyle::Filled)
-                                                            .disabled(
-                                                                is_editor_empty
-                                                                    || !is_model_selected
-                                                                    || self.waiting_for_summaries_to_send
+                                        h_flex().gap_1().child(self.model_selector.clone()).child(
+                                            ButtonLike::new("submit-message")
+                                                .width(button_width.into())
+                                                .style(ButtonStyle::Filled)
+                                                .disabled(
+                                                    is_editor_empty
+                                                        || !is_model_selected
+                                                        || is_generating
+                                                        || self.waiting_for_summaries_to_send
+                                                )
+                                                .child(
+                                                    h_flex()
+                                                        .w_full()
+                                                        .justify_between()
+                                                        .child(
+                                                            Label::new("Submit")
+                                                                .size(LabelSize::Small)
+                                                                .color(submit_label_color),
+                                                        )
+                                                        .children(
+                                                            KeyBinding::for_action_in(
+                                                                &Chat,
+                                                                &focus_handle,
+                                                                window,
+                                                                cx,
                                                            )
-                                                            .on_click(move |_event, window, cx| {
-                                                                focus_handle.dispatch_action(&Chat, window, cx);
-                                                            })
-                                                            .when(!is_editor_empty && is_model_selected, |button| {
-                                                                button.tooltip(move |window, cx| {
-                                                                    Tooltip::for_action(
-                                                                        "Send",
-                                                                        &Chat,
-                                                                        window,
-                                                                        cx,
-                                                                    )
-                                                                })
-                                                            })
-                                                            .when(is_editor_empty, |button| {
-                                                                button.tooltip(Tooltip::text(
-                                                                    "Type a message to submit",
-                                                                ))
-                                                            })
-                                                            .when(!is_model_selected, |button| {
-                                                                button.tooltip(Tooltip::text(
-                                                                    "Select a model to continue",
-                                                                ))
-                                                            })
-                                                    )
-                                                }
-                                            })
+                                                            .map(|binding| {
+                                                                binding
+                                                                    .when(vim_mode_enabled, |kb| {
+                                                                        kb.size(rems_from_px(12.))
+                                                                    })
+                                                                    .into_any_element()
+                                                            }),
+                                                        ),
+                                                )
+                                                .on_click(move |_event, window, cx| {
+                                                    focus_handle.dispatch_action(&Chat, window, cx);
+                                                })
+                                                .when(is_editor_empty, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Type a message to submit",
+                                                    ))
+                                                })
+                                                .when(is_generating, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Cancel to submit a new message",
+                                                    ))
+                                                })
+                                                .when(!is_model_selected, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Select a model to continue",
+                                                    ))
+                                                }),
+                                        ),
                                    ),
                            ),
                    )
--- a/crates/agent/src/terminal_codegen.rs
+++ b/crates/agent/src/terminal_codegen.rs
@@ -6,7 +6,7 @@ use language_model::{
    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, report_assistant_event,
 };
 use std::{sync::Arc, time::Instant};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;

 pub struct TerminalCodegen {
@@ -79,7 +79,7 @@ impl TerminalCodegen {

                        let error_message = result.as_ref().err().map(|error| error.to_string());
                        report_assistant_event(
-                            AssistantEventData {
+                            AssistantEvent {
                                conversation_id: None,
                                kind: AssistantKind::InlineTerminal,
                                message_id,
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -18,7 +18,7 @@ use language_model::{
 };
 use prompt_store::PromptBuilder;
 use std::sync::Arc;
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::TerminalView;
 use ui::prelude::*;
 use util::ResultExt;
@@ -292,7 +292,7 @@ impl TerminalInlineAssistant {
                let codegen = assist.codegen.read(cx);
                let executor = cx.background_executor().clone();
                report_assistant_event(
-                    AssistantEventData {
+                    AssistantEvent {
                        conversation_id: None,
                        kind: AssistantKind::InlineTerminal,
                        message_id: codegen.message_id.clone(),
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -21,7 +21,6 @@ use language_model::{
 };
 use project::git_store::{GitStore, GitStoreCheckpoint, RepositoryState};
 use project::{Project, Worktree};
-use workspace::Workspace;
 use prompt_store::{
    AssistantSystemPromptContext, PromptBuilder, RulesFile, WorktreeInfoForSystemPrompt,
 };
@@ -32,7 +31,6 @@ use util::{ResultExt as _, TryFutureExt as _, maybe, post_inc};
 use uuid::Uuid;

 use crate::context::{AssistantContext, ContextId, format_context_as_string};
-use crate::context_picker::active_singleton_buffer_path;
 use crate::thread_store::{
    SerializedMessage, SerializedMessageSegment, SerializedThread, SerializedToolResult,
    SerializedToolUse,
@@ -263,7 +261,6 @@ pub struct Thread {
    initial_project_snapshot: Shared<Task<Option<Arc<ProjectSnapshot>>>>,
    cumulative_token_usage: TokenUsage,
    feedback: Option<ThreadFeedback>,
-    workspace: Option<WeakEntity<Workspace>>,
 }

 impl Thread {
@@ -271,7 +268,6 @@ impl Thread {
        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
-        workspace: Option<WeakEntity<Workspace>>,
        cx: &mut Context<Self>,
    ) -> Self {
        Self {
@@ -303,7 +299,6 @@ impl Thread {
            },
            cumulative_token_usage: TokenUsage::default(),
            feedback: None,
-            workspace,
        }
    }

@@ -313,7 +308,6 @@ impl Thread {
        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
-        workspace: Option<WeakEntity<Workspace>>,
        cx: &mut Context<Self>,
    ) -> Self {
        let next_message_id = MessageId(
@@ -368,7 +362,6 @@ impl Thread {
            initial_project_snapshot: Task::ready(serialized.initial_project_snapshot).shared(),
            cumulative_token_usage: serialized.cumulative_token_usage,
            feedback: None,
-            workspace,
        }
    }

@@ -478,11 +471,11 @@ impl Thread {
        cx.emit(ThreadEvent::CheckpointChanged);
        cx.notify();

-        let git_store = self.project().read(cx).git_store().clone();
-        let restore = git_store.update(cx, |git_store, cx| {
-            git_store.restore_checkpoint(checkpoint.git_checkpoint.clone(), cx)
-        });
-
+        let project = self.project.read(cx);
+        let restore = project
+            .git_store()
+            .read(cx)
+            .restore_checkpoint(checkpoint.git_checkpoint.clone(), cx);
        cx.spawn(async move |this, cx| {
            let result = restore.await;
            this.update(cx, |this, cx| {
@@ -513,11 +506,11 @@ impl Thread {
        };

        let git_store = self.project.read(cx).git_store().clone();
-        let final_checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
+        let final_checkpoint = git_store.read(cx).checkpoint(cx);
        cx.spawn(async move |this, cx| match final_checkpoint.await {
            Ok(final_checkpoint) => {
                let equal = git_store
-                    .update(cx, |store, cx| {
+                    .read_with(cx, |store, cx| {
                        store.compare_checkpoints(
                            pending_checkpoint.git_checkpoint.clone(),
                            final_checkpoint.clone(),
@@ -529,7 +522,7 @@ impl Thread {

                if equal {
                    git_store
-                        .update(cx, |store, cx| {
+                        .read_with(cx, |store, cx| {
                            store.delete_checkpoint(pending_checkpoint.git_checkpoint, cx)
                        })?
                        .detach();
@@ -540,7 +533,7 @@ impl Thread {
                }

                git_store
-                    .update(cx, |store, cx| {
+                    .read_with(cx, |store, cx| {
                        store.delete_checkpoint(final_checkpoint, cx)
                    })?
                    .detach();
@@ -836,15 +829,8 @@ impl Thread {
                )
            })
            .collect::<Vec<_>>();
-        
-        // Try to get active tab path
-        let active_tab_path = self.workspace
-            .as_ref()
-            .and_then(|weak_workspace| weak_workspace.upgrade())
-            .and_then(|workspace| active_singleton_buffer_path(&workspace.read(cx), cx))
-            .map(|path| path.to_string_lossy().to_string());

-        cx.spawn(async move |_cx| {
+        cx.spawn(async |_cx| {
            let results = futures::future::join_all(tasks).await;
            let mut first_err = None;
            let worktrees = results
@@ -856,7 +842,7 @@ impl Thread {
                    worktree
                })
                .collect::<Vec<_>>();
-            (AssistantSystemPromptContext::new(worktrees).with_active_tab_path(active_tab_path), first_err)
+            (AssistantSystemPromptContext::new(worktrees), first_err)
        })
    }

@@ -1501,7 +1487,6 @@ impl Thread {
                            tool_use_id.clone(),
                            tool_name,
                            output,
-                            cx,
                        );

                        cx.emit(ThreadEvent::ToolFinished {
@@ -1665,10 +1650,10 @@ impl Thread {
                .ok()
                .flatten()
                .map(|repo| {
-                    repo.update(cx, |repo, _| {
+                    repo.read_with(cx, |repo, _| {
                        let current_branch =
                            repo.branch.as_ref().map(|branch| branch.name.to_string());
-                        repo.send_job(None, |state, _| async move {
+                        repo.send_job(|state, _| async move {
                            let RepositoryState::Local { backend, .. } = state else {
                                return GitState {
                                    remote_url: None,
@@ -1846,7 +1831,7 @@ impl Thread {
        ));

        self.tool_use
-            .insert_tool_output(tool_use_id.clone(), tool_name, err, cx);
+            .insert_tool_output(tool_use_id.clone(), tool_name, err);

        cx.emit(ThreadEvent::ToolFinished {
            tool_use_id,
--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -558,14 +558,7 @@ impl RenderOnce for PastContext {
                    IconButton::new("delete", IconName::TrashAlt)
                        .shape(IconButtonShape::Square)
                        .icon_size(IconSize::XSmall)
-                        .tooltip(move |window, cx| {
-                            Tooltip::for_action(
-                                "Delete Prompt Editor",
-                                &RemoveSelectedThread,
-                                window,
-                                cx,
-                            )
-                        })
+                        .tooltip(Tooltip::text("Delete Prompt Editor"))
                        .on_click({
                            let assistant_panel = self.assistant_panel.clone();
                            let path = self.context.path.clone();
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -107,7 +107,6 @@ impl ThreadStore {
                self.project.clone(),
                self.tools.clone(),
                self.prompt_builder.clone(),
-                None,
                cx,
            )
        })
@@ -135,7 +134,6 @@ impl ThreadStore {
                        this.project.clone(),
                        this.tools.clone(),
                        this.prompt_builder.clone(),
-                        None,
                        cx,
                    )
                })
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -7,11 +7,10 @@ use futures::FutureExt as _;
 use futures::future::Shared;
 use gpui::{App, SharedString, Task};
 use language_model::{
-    LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolResult,
-    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
+    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
+    LanguageModelToolUseId, MessageContent, Role,
 };
 use ui::IconName;
-use util::truncate_lines_to_byte_limit;

 use crate::thread::MessageId;
 use crate::thread_store::SerializedMessage;
@@ -332,32 +331,9 @@ impl ToolUseState {
        tool_use_id: LanguageModelToolUseId,
        tool_name: Arc<str>,
        output: Result<String>,
-        cx: &App,
    ) -> Option<PendingToolUse> {
        match output {
            Ok(tool_result) => {
-                let model_registry = LanguageModelRegistry::read_global(cx);
-
-                const BYTES_PER_TOKEN_ESTIMATE: usize = 3;
-
-                // Protect from clearly large output
-                let tool_output_limit = model_registry
-                    .default_model()
-                    .map(|model| model.model.max_token_count() * BYTES_PER_TOKEN_ESTIMATE)
-                    .unwrap_or(usize::MAX);
-
-                let tool_result = if tool_result.len() <= tool_output_limit {
-                    tool_result
-                } else {
-                    let truncated = truncate_lines_to_byte_limit(&tool_result, tool_output_limit);
-
-                    format!(
-                        "Tool result too long. The first {} bytes:\n\n{}",
-                        truncated.len(),
-                        truncated
-                    )
-                };
-
                self.tool_results.insert(
                    tool_use_id.clone(),
                    LanguageModelToolResult {
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -321,54 +321,38 @@ pub async fn stream_completion(
        .map(|output| output.0)
 }

-/// An individual rate limit.
-#[derive(Debug)]
-pub struct RateLimit {
-    pub limit: usize,
-    pub remaining: usize,
-    pub reset: DateTime<Utc>,
-}
-
-impl RateLimit {
-    fn from_headers(resource: &str, headers: &HeaderMap<HeaderValue>) -> Result<Self> {
-        let limit =
-            get_header(&format!("anthropic-ratelimit-{resource}-limit"), headers)?.parse()?;
-        let remaining = get_header(
-            &format!("anthropic-ratelimit-{resource}-remaining"),
-            headers,
-        )?
-        .parse()?;
-        let reset = DateTime::parse_from_rfc3339(get_header(
-            &format!("anthropic-ratelimit-{resource}-reset"),
-            headers,
-        )?)?
-        .to_utc();
-
-        Ok(Self {
-            limit,
-            remaining,
-            reset,
-        })
-    }
-}
-
 /// <https://docs.anthropic.com/en/api/rate-limits#response-headers>
 #[derive(Debug)]
 pub struct RateLimitInfo {
-    pub requests: Option<RateLimit>,
-    pub tokens: Option<RateLimit>,
-    pub input_tokens: Option<RateLimit>,
-    pub output_tokens: Option<RateLimit>,
+    pub requests_limit: usize,
+    pub requests_remaining: usize,
+    pub requests_reset: DateTime<Utc>,
+    pub tokens_limit: usize,
+    pub tokens_remaining: usize,
+    pub tokens_reset: DateTime<Utc>,
 }

 impl RateLimitInfo {
-    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Self {
-        Self {
-            requests: RateLimit::from_headers("requests", headers).log_err(),
-            tokens: RateLimit::from_headers("tokens", headers).log_err(),
-            input_tokens: RateLimit::from_headers("input-tokens", headers).log_err(),
-            output_tokens: RateLimit::from_headers("output-tokens", headers).log_err(),
-        }
+    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Result<Self> {
+        let tokens_limit = get_header("anthropic-ratelimit-tokens-limit", headers)?.parse()?;
+        let requests_limit = get_header("anthropic-ratelimit-requests-limit", headers)?.parse()?;
+        let tokens_remaining =
+            get_header("anthropic-ratelimit-tokens-remaining", headers)?.parse()?;
+        let requests_remaining =
+            get_header("anthropic-ratelimit-requests-remaining", headers)?.parse()?;
+        let requests_reset = get_header("anthropic-ratelimit-requests-reset", headers)?;
+        let tokens_reset = get_header("anthropic-ratelimit-tokens-reset", headers)?;
+        let requests_reset = DateTime::parse_from_rfc3339(requests_reset)?.to_utc();
+        let tokens_reset = DateTime::parse_from_rfc3339(tokens_reset)?.to_utc();
+
+        Ok(Self {
+            requests_limit,
+            tokens_limit,
+            requests_remaining,
+            tokens_remaining,
+            requests_reset,
+            tokens_reset,
+        })
    }
 }

@@ -434,7 +418,7 @@ pub async fn stream_completion_with_rate_limit_info(
                }
            })
            .boxed();
-        Ok((stream, Some(rate_limits)))
+        Ok((stream, rate_limits.log_err()))
    } else {
        let mut body = Vec::new();
        response
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -57,7 +57,7 @@ use std::{
    time::{Duration, Instant},
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
@@ -315,7 +315,7 @@ impl InlineAssistant {
            if let Some(ConfiguredModel { model, .. }) =
                LanguageModelRegistry::read_global(cx).default_model()
            {
-                self.telemetry.report_assistant_event(AssistantEventData {
+                self.telemetry.report_assistant_event(AssistantEvent {
                    conversation_id: None,
                    kind: AssistantKind::Inline,
                    phase: AssistantPhase::Invoked,
@@ -892,7 +892,7 @@ impl InlineAssistant {
                        .map(|language| language.name())
                });
                report_assistant_event(
-                    AssistantEventData {
+                    AssistantEvent {
                        conversation_id: None,
                        kind: AssistantKind::Inline,
                        message_id,
@@ -3148,7 +3148,7 @@ impl CodegenAlternative {

                        let error_message = result.as_ref().err().map(|error| error.to_string());
                        report_assistant_event(
-                            AssistantEventData {
+                            AssistantEvent {
                                conversation_id: None,
                                message_id,
                                kind: AssistantKind::Inline,
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -27,7 +27,7 @@ use std::{
    sync::Arc,
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
@@ -324,7 +324,7 @@ impl TerminalInlineAssistant {
                let codegen = assist.codegen.read(cx);
                let executor = cx.background_executor().clone();
                report_assistant_event(
-                    AssistantEventData {
+                    AssistantEvent {
                        conversation_id: None,
                        kind: AssistantKind::InlineTerminal,
                        message_id: codegen.message_id.clone(),
@@ -1183,7 +1183,7 @@ impl Codegen {

                        let error_message = result.as_ref().err().map(|error| error.to_string());
                        report_assistant_event(
-                            AssistantEventData {
+                            AssistantEvent {
                                conversation_id: None,
                                kind: AssistantKind::InlineTerminal,
                                message_id,
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -40,7 +40,7 @@ use std::{
    sync::Arc,
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use text::{BufferSnapshot, ToPoint};
 use ui::IconName;
 use util::{ResultExt, TryFutureExt, post_inc};
@@ -2498,7 +2498,7 @@ impl AssistantContext {
                        .language()
                        .map(|language| language.name());
                    report_assistant_event(
-                        AssistantEventData {
+                        AssistantEvent {
                            conversation_id: Some(this.id.0.clone()),
                            kind: AssistantKind::Panel,
                            phase: AssistantPhase::Response,
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -127,7 +127,6 @@ impl SlashCommandCompletionProvider {
                                new_text,
                                label: command.label(cx),
                                icon_path: None,
-                                insert_text_mode: None,
                                confirm,
                                source: CompletionSource::Custom,
                            })
@@ -229,7 +228,6 @@ impl SlashCommandCompletionProvider {
                                new_text,
                                documentation: None,
                                confirm,
-                                insert_text_mode: None,
                                source: CompletionSource::Custom,
                            }
                        })
--- a/crates/assistant_eval/Cargo.toml
+++ b/crates/assistant_eval/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "agent_eval"
+name = "assistant_eval"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later"
 workspace = true

 [[bin]]
-name = "agent_eval"
+name = "assistant_eval"
 path = "src/main.rs"

 [dependencies]
--- a/crates/assistant_eval/LICENSE-GPL
+++ b/crates/assistant_eval/LICENSE-GPL
--- a/crates/assistant_eval/README.md
+++ b/crates/assistant_eval/README.md
@@ -0,0 +1,68 @@
+# Tool Evals
+
+A framework for evaluating and benchmarking the agent panel generations.
+
+## Overview
+
+Tool Evals provides a headless environment for running assistants evaluations on code repositories. It automates the process of:
+
+1. Setting up test code and repositories
+2. Sending prompts to language models
+3. Allowing the assistant to use tools to modify code
+4. Collecting metrics on performance and tool usage
+5. Evaluating results against known good solutions
+
+## How It Works
+
+The system consists of several key components:
+
+- **Eval**: Loads exercises from the zed-ace-framework repository, creates temporary repos, and executes evaluations
+- **HeadlessAssistant**: Provides a headless environment for running the AI assistant
+- **Judge**: Evaluates AI-generated solutions against reference implementations and assigns scores
+- **Templates**: Defines evaluation frameworks for different tasks (Project Creation, Code Modification, Conversational Guidance)
+
+## Setup Requirements
+
+### Prerequisites
+
+- Rust and Cargo
+- Git
+- Python (for report generation)
+- Network access to clone repositories
+- Appropriate API keys for language models and git services (Anthropic, GitHub, etc.)
+
+### Environment Variables
+
+Ensure you have the required API keys set, either from a dev run of Zed or via these environment variables:
+- `ZED_ANTHROPIC_API_KEY` for Claude models
+- `ZED_GITHUB_API_KEY` for GitHub API (or similar)
+
+## Usage
+
+### Running Evaluations
+
+```bash
+# Run all tests
+cargo run -p assistant_eval -- --all
+
+# Run only specific languages
+cargo run -p assistant_eval -- --all --languages python,rust
+
+# Limit concurrent evaluations
+cargo run -p assistant_eval -- --all --concurrency 5
+
+# Limit number of exercises per language
+cargo run -p assistant_eval -- --all --max-exercises-per-language 3
+```
+
+### Evaluation Template Types
+
+The system supports three types of evaluation templates:
+
+1. **ProjectCreation**: Tests the model's ability to create new implementations from scratch
+2. **CodeModification**: Tests the model's ability to modify existing code to meet new requirements
+3. **ConversationalGuidance**: Tests the model's ability to provide guidance without writing code
+
+### Support Repo
+
+The [zed-industries/zed-ace-framework](https://github.com/zed-industries/zed-ace-framework) contains the analytics and reporting scripts.
--- a/crates/assistant_eval/build.rs
+++ b/crates/assistant_eval/build.rs
--- a/crates/assistant_eval/src/eval.rs
+++ b/crates/assistant_eval/src/eval.rs
@@ -1,6 +1,6 @@
 use crate::git_commands::{run_git, setup_temp_repo};
 use crate::headless_assistant::{HeadlessAppState, HeadlessAssistant};
-use crate::{get_exercise_language, get_exercise_name};
+use crate::{get_exercise_language, get_exercise_name, templates_eval::Template};
 use agent::RequestKind;
 use anyhow::{Result, anyhow};
 use collections::HashMap;
@@ -18,6 +18,8 @@ use std::{
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct EvalResult {
    pub exercise_name: String,
+    pub template_name: String,
+    pub score: String,
    pub diff: String,
    pub assistant_response: String,
    pub elapsed_time_ms: u128,
@@ -27,6 +29,7 @@ pub struct EvalResult {
    pub output_tokens: usize,
    pub total_tokens: usize,
    pub tool_use_counts: usize,
+    pub judge_model_name: String, // Added field for judge model name
 }

 pub struct EvalOutput {
@@ -248,6 +251,29 @@ pub async fn read_instructions(exercise_path: &Path) -> Result<String> {
    Ok(instructions)
 }

+pub async fn read_example_solution(exercise_path: &Path, language: &str) -> Result<String> {
+    // Map the language to the file extension
+    let language_extension = match language {
+        "python" => "py",
+        "go" => "go",
+        "rust" => "rs",
+        "typescript" => "ts",
+        "javascript" => "js",
+        "ruby" => "rb",
+        "php" => "php",
+        "bash" => "sh",
+        "multi" => "diff",
+        "internal" => "diff",
+        _ => return Err(anyhow!("Unsupported language: {}", language)),
+    };
+    let example_path = exercise_path
+        .join(".meta")
+        .join(format!("example.{}", language_extension));
+    println!("Reading example solution from: {}", example_path.display());
+    let example = smol::unblock(move || std::fs::read_to_string(&example_path)).await?;
+    Ok(example)
+}
+
 pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -> Result<()> {
    let eval_dir = exercise_path.join("evaluation");
    fs::create_dir_all(&eval_dir)?;
@@ -285,8 +311,12 @@ pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -
    // Group the new results by test name (exercise name)
    for result in results {
        let exercise_name = &result.exercise_name;
+        let template_name = &result.template_name;

-        println!("Adding result: exercise={}", exercise_name);
+        println!(
+            "Adding result: exercise={}, template={}",
+            exercise_name, template_name
+        );

        // Ensure the exercise entry exists
        if eval_data.get(exercise_name).is_none() {
@@ -299,7 +329,7 @@ pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -
        }

        // Add this result under the timestamp with template name as key
-        eval_data[exercise_name][&timestamp] = serde_json::to_value(&result)?;
+        eval_data[exercise_name][&timestamp][template_name] = serde_json::to_value(&result)?;
    }

    // Write back to file with pretty formatting
@@ -314,7 +344,9 @@ pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -

 pub async fn run_exercise_eval(
    exercise_path: PathBuf,
+    template: Template,
    model: Arc<dyn LanguageModel>,
+    judge_model: Arc<dyn LanguageModel>,
    app_state: Arc<HeadlessAppState>,
    base_sha: String,
    _framework_path: PathBuf,
@@ -327,15 +359,68 @@ pub async fn run_exercise_eval(
        "\n\nWhen writing the code for this prompt, use {} to achieve the goal.",
        language
    ));
+    let example_solution = read_example_solution(&exercise_path, &language).await?;

-    println!("Running evaluation for exercise: {}", exercise_name);
+    println!(
+        "Running evaluation for exercise: {} with template: {}",
+        exercise_name, template.name
+    );

    // Create temporary directory with exercise files
    let temp_dir = setup_temp_repo(&exercise_path, &base_sha).await?;
    let temp_path = temp_dir.path().to_path_buf();

+    if template.name == "ProjectCreation" {
+        for entry in fs::read_dir(&temp_path)? {
+            let entry = entry?;
+            let path = entry.path();
+
+            // Skip directories that start with dot (like .docs, .meta, .git)
+            if path.is_dir()
+                && path
+                    .file_name()
+                    .and_then(|name| name.to_str())
+                    .map(|name| name.starts_with("."))
+                    .unwrap_or(false)
+            {
+                continue;
+            }
+
+            // Delete regular files
+            if path.is_file() {
+                println!("  Deleting file: {}", path.display());
+                fs::remove_file(path)?;
+            }
+        }
+
+        // Commit the deletion so it shows up in the diff
+        run_git(&temp_path, &["add", "."]).await?;
+        run_git(
+            &temp_path,
+            &["commit", "-m", "Remove root files for clean slate"],
+        )
+        .await?;
+    }
+
    let local_commit_sha = run_git(&temp_path, &["rev-parse", "HEAD"]).await?;

+    // Prepare prompt based on template
+    let prompt = match template.name {
+        "ProjectCreation" => format!(
+            "I need to create a new implementation for this exercise. Please create all the necessary files in the best location.\n\n{}",
+            instructions
+        ),
+        "CodeModification" => format!(
+            "I need help updating my code to meet these requirements. Please modify the appropriate files:\n\n{}",
+            instructions
+        ),
+        "ConversationalGuidance" => format!(
+            "I'm trying to solve this coding exercise but I'm not sure where to start. Can you help me understand the requirements and guide me through the solution process without writing code for me?\n\n{}",
+            instructions
+        ),
+        _ => instructions.clone(),
+    };
+
    let start_time = SystemTime::now();

    // Create a basic eval struct to work with the existing system
@@ -345,7 +430,7 @@ pub async fn run_exercise_eval(
            url: format!("file://{}", temp_path.display()),
            base_sha: local_commit_sha, // Use the local commit SHA instead of the framework base SHA
        },
-        user_prompt: instructions.clone(),
+        user_prompt: prompt,
    };

    // Run the evaluation
@@ -356,6 +441,79 @@ pub async fn run_exercise_eval(
    // Get diff from git
    let diff = eval_output.diff.clone();

+    // For project creation template, we need to compare with reference implementation
+    let judge_output = if template.name == "ProjectCreation" {
+        let project_judge_prompt = template
+            .content
+            .replace(
+                "<!-- ```requirements go here``` -->",
+                &format!("```\n{}\n```", instructions),
+            )
+            .replace(
+                "<!-- ```reference code goes here``` -->",
+                &format!("```{}\n{}\n```", language, example_solution),
+            )
+            .replace(
+                "<!-- ```git diff goes here``` -->",
+                &format!("```\n{}\n```", diff),
+            );
+
+        // Use the run_with_prompt method which we'll add to judge.rs
+        let judge = crate::judge::Judge {
+            original_diff: None,
+            original_message: Some(project_judge_prompt),
+            model: judge_model.clone(),
+        };
+
+        cx.update(|cx| judge.run_with_prompt(cx))?.await?
+    } else if template.name == "CodeModification" {
+        // For CodeModification, we'll compare the example solution with the LLM-generated solution
+        let code_judge_prompt = template
+            .content
+            .replace(
+                "<!-- ```reference code goes here``` -->",
+                &format!("```{}\n{}\n```", language, example_solution),
+            )
+            .replace(
+                "<!-- ```git diff goes here``` -->",
+                &format!("```\n{}\n```", diff),
+            );
+
+        // Use the run_with_prompt method
+        let judge = crate::judge::Judge {
+            original_diff: None,
+            original_message: Some(code_judge_prompt),
+            model: judge_model.clone(),
+        };
+
+        cx.update(|cx| judge.run_with_prompt(cx))?.await?
+    } else {
+        // Conversational template
+        let conv_judge_prompt = template
+            .content
+            .replace(
+                "<!-- ```query goes here``` -->",
+                &format!("```\n{}\n```", instructions),
+            )
+            .replace(
+                "<!-- ```transcript goes here``` -->",
+                &format!("```\n{}\n```", eval_output.last_message),
+            )
+            .replace(
+                "<!-- ```git diff goes here``` -->",
+                &format!("```\n{}\n```", diff),
+            );
+
+        // Use the run_with_prompt method for consistency
+        let judge = crate::judge::Judge {
+            original_diff: None,
+            original_message: Some(conv_judge_prompt),
+            model: judge_model.clone(),
+        };
+
+        cx.update(|cx| judge.run_with_prompt(cx))?.await?
+    };
+
    let elapsed_time = start_time.elapsed()?;

    // Calculate total tokens as the sum of input and output tokens
@@ -364,9 +522,14 @@ pub async fn run_exercise_eval(
    let tool_use_counts = eval_output.tool_use_counts.values().sum::<u32>();
    let total_tokens = input_tokens + output_tokens;

+    // Get judge model name
+    let judge_model_name = judge_model.id().0.to_string();
+
    // Save results to evaluation directory
    let result = EvalResult {
        exercise_name: exercise_name.clone(),
+        template_name: template.name.to_string(),
+        score: judge_output.trim().to_string(),
        diff,
        assistant_response: eval_output.last_message.clone(),
        elapsed_time_ms: elapsed_time.as_millis(),
@@ -378,6 +541,7 @@ pub async fn run_exercise_eval(
        output_tokens: output_tokens.try_into().unwrap(),
        total_tokens: total_tokens.try_into().unwrap(),
        tool_use_counts: tool_use_counts.try_into().unwrap(),
+        judge_model_name, // Add judge model name to result
    };

    Ok(result)
--- a/crates/assistant_eval/src/get_exercise.rs
+++ b/crates/assistant_eval/src/get_exercise.rs
--- a/crates/assistant_eval/src/git_commands.rs
+++ b/crates/assistant_eval/src/git_commands.rs
--- a/crates/assistant_eval/src/headless_assistant.rs
+++ b/crates/assistant_eval/src/headless_assistant.rs
@@ -4,10 +4,12 @@ use assistant_tool::ToolWorkingSet;
 use client::{Client, UserStore};
 use collections::HashMap;
 use dap::DapRegistry;
-use gpui::{App, Entity, SemanticVersion, Subscription, Task, prelude::*};
+use futures::StreamExt;
+use gpui::{App, AsyncApp, Entity, SemanticVersion, Subscription, Task, prelude::*};
 use language::LanguageRegistry;
 use language_model::{
    AuthenticateError, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
+    LanguageModelRequest,
 };
 use node_runtime::NodeRuntime;
 use project::{Project, RealFs};
@@ -244,3 +246,34 @@ pub fn authenticate_model_provider(
    let model_provider = model_registry.provider(&provider_id).unwrap();
    model_provider.authenticate(cx)
 }
+
+pub async fn send_language_model_request(
+    model: Arc<dyn LanguageModel>,
+    request: LanguageModelRequest,
+    cx: &mut AsyncApp,
+) -> anyhow::Result<String> {
+    match model.stream_completion_text(request, &cx).await {
+        Ok(mut stream) => {
+            let mut full_response = String::new();
+
+            // Process the response stream
+            while let Some(chunk_result) = stream.stream.next().await {
+                match chunk_result {
+                    Ok(chunk_str) => {
+                        full_response.push_str(&chunk_str);
+                    }
+                    Err(err) => {
+                        return Err(anyhow!(
+                            "Error receiving response from language model: {err}"
+                        ));
+                    }
+                }
+            }
+
+            Ok(full_response)
+        }
+        Err(err) => Err(anyhow!(
+            "Failed to get response from language model. Error was: {err}"
+        )),
+    }
+}
--- a/crates/assistant_eval/src/judge.rs
+++ b/crates/assistant_eval/src/judge.rs
@@ -0,0 +1,37 @@
+use crate::headless_assistant::send_language_model_request;
+use anyhow::anyhow;
+use gpui::{App, Task};
+use language_model::{
+    LanguageModel, LanguageModelRequest, LanguageModelRequestMessage, MessageContent, Role,
+};
+use std::sync::Arc;
+
+pub struct Judge {
+    #[allow(dead_code)]
+    pub original_diff: Option<String>,
+    pub original_message: Option<String>,
+    pub model: Arc<dyn LanguageModel>,
+}
+
+impl Judge {
+    pub fn run_with_prompt(&self, cx: &mut App) -> Task<anyhow::Result<String>> {
+        let Some(prompt) = self.original_message.as_ref() else {
+            return Task::ready(Err(anyhow!("No prompt provided in original_message")));
+        };
+
+        let request = LanguageModelRequest {
+            messages: vec![LanguageModelRequestMessage {
+                role: Role::User,
+                content: vec![MessageContent::Text(prompt.clone())],
+                cache: false,
+            }],
+            temperature: Some(0.0),
+            tools: Vec::new(),
+            stop: Vec::new(),
+        };
+
+        let model = self.model.clone();
+        let request = request.clone();
+        cx.spawn(async move |cx| send_language_model_request(model, request, cx).await)
+    }
+}
--- a/crates/assistant_eval/src/main.rs
+++ b/crates/assistant_eval/src/main.rs
@@ -2,6 +2,8 @@ mod eval;
 mod get_exercise;
 mod git_commands;
 mod headless_assistant;
+mod judge;
+mod templates_eval;

 use clap::Parser;
 use eval::{run_exercise_eval, save_eval_results};
@@ -13,10 +15,11 @@ use headless_assistant::{authenticate_model_provider, find_model};
 use language_model::LanguageModelRegistry;
 use reqwest_client::ReqwestClient;
 use std::{path::PathBuf, sync::Arc};
+use templates_eval::all_templates;

 #[derive(Parser, Debug)]
 #[command(
-    name = "agent_eval",
+    name = "assistant_eval",
    disable_version_flag = true,
    before_help = "Tool eval runner"
 )]
@@ -34,17 +37,24 @@ struct Args {
    /// Name of the model (default: "claude-3-7-sonnet-latest")
    #[arg(long, default_value = "claude-3-7-sonnet-latest")]
    model_name: String,
-    /// Name of the editor model (default: value of `--model_name`).
+    /// Name of the judge model (default: value of `--model_name`).
    #[arg(long)]
-    editor_model_name: Option<String>,
+    judge_model_name: Option<String>,
    /// Number of evaluations to run concurrently (default: 3)
-    #[arg(short, long, default_value = "5")]
+    #[arg(short, long, default_value = "3")]
    concurrency: usize,
    /// Maximum number of exercises to evaluate per language
    #[arg(long)]
    max_exercises_per_language: Option<usize>,
 }

+// First, let's define the order in which templates should be executed
+const TEMPLATE_EXECUTION_ORDER: [&str; 3] = [
+    "ProjectCreation",
+    "CodeModification",
+    "ConversationalGuidance",
+];
+
 fn main() {
    env_logger::init();
    let args = Args::parse();
@@ -66,7 +76,7 @@ fn main() {
        let app_state = headless_assistant::init(cx);

        let model = find_model(&args.model_name, cx).unwrap();
-        let editor_model = if let Some(model_name) = &args.editor_model_name {
+        let judge_model = if let Some(model_name) = &args.judge_model_name {
            find_model(model_name, cx).unwrap()
        } else {
            model.clone()
@@ -77,7 +87,7 @@ fn main() {
        });

        let model_provider_id = model.provider_id();
-        let editor_model_provider_id = editor_model.provider_id();
+        let judge_model_provider_id = judge_model.provider_id();

        let framework_path_clone = framework_path.clone();
        let languages_clone = languages.clone();
@@ -90,17 +100,15 @@ fn main() {
                .unwrap()
                .await
                .unwrap();
-            cx.update(|cx| authenticate_model_provider(editor_model_provider_id.clone(), cx))
+            cx.update(|cx| authenticate_model_provider(judge_model_provider_id.clone(), cx))
                .unwrap()
                .await
                .unwrap();

-            println!("framework path: {}", framework_path_clone.display());
-
+            // Read base SHA from setup.json
            let base_sha = read_base_sha(&framework_path_clone).await.unwrap();

-            println!("base sha: {}", base_sha);
-
+            // Find all exercises for the specified languages
            let all_exercises = find_exercises(
                &framework_path_clone,
                &languages_clone
@@ -132,12 +140,23 @@ fn main() {

            println!("Will run {} exercises", exercises_to_run.len());

+            // Get all templates and sort them according to the execution order
+            let mut templates = all_templates();
+            templates.sort_by_key(|template| {
+                TEMPLATE_EXECUTION_ORDER
+                    .iter()
+                    .position(|&name| name == template.name)
+                    .unwrap_or(usize::MAX)
+            });
+
            // Create exercise eval tasks - each exercise is a single task that will run templates sequentially
            let exercise_tasks: Vec<_> = exercises_to_run
                .into_iter()
                .map(|exercise_path| {
                    let exercise_name = get_exercise_name(&exercise_path);
+                    let templates_clone = templates.clone();
                    let model_clone = model.clone();
+                    let judge_model_clone = judge_model.clone();
                    let app_state_clone = app_state.clone();
                    let base_sha_clone = base_sha.clone();
                    let framework_path_clone = framework_path_clone.clone();
@@ -147,22 +166,56 @@ fn main() {
                        println!("Processing exercise: {}", exercise_name);
                        let mut exercise_results = Vec::new();

-                        match run_exercise_eval(
-                            exercise_path.clone(),
-                            model_clone.clone(),
-                            app_state_clone.clone(),
-                            base_sha_clone.clone(),
-                            framework_path_clone.clone(),
-                            cx_clone.clone(),
-                        )
-                        .await
-                        {
-                            Ok(result) => {
-                                println!("Completed {}", exercise_name);
-                                exercise_results.push(result);
-                            }
+                        // Determine the language for this exercise
+                        let language = match get_exercise_language(&exercise_path) {
+                            Ok(lang) => lang,
                            Err(err) => {
-                                println!("Error running {}: {}", exercise_name, err);
+                                println!(
+                                    "Error determining language for {}: {}",
+                                    exercise_name, err
+                                );
+                                return exercise_results;
+                            }
+                        };
+
+                        // Run each template sequentially for this exercise
+                        for template in templates_clone {
+                            // For "multi" or "internal" language, only run the CodeModification template
+                            if (language == "multi" || language == "internal")
+                                && template.name != "CodeModification"
+                            {
+                                println!(
+                                    "Skipping {} template for {} language",
+                                    template.name, language
+                                );
+                                continue;
+                            }
+
+                            match run_exercise_eval(
+                                exercise_path.clone(),
+                                template.clone(),
+                                model_clone.clone(),
+                                judge_model_clone.clone(),
+                                app_state_clone.clone(),
+                                base_sha_clone.clone(),
+                                framework_path_clone.clone(),
+                                cx_clone.clone(),
+                            )
+                            .await
+                            {
+                                Ok(result) => {
+                                    println!(
+                                        "Completed {} with template {} - score: {}",
+                                        exercise_name, template.name, result.score
+                                    );
+                                    exercise_results.push(result);
+                                }
+                                Err(err) => {
+                                    println!(
+                                        "Error running {} with template {}: {}",
+                                        exercise_name, template.name, err
+                                    );
+                                }
                            }
                        }

--- a/crates/assistant_eval/src/templates_eval.rs
+++ b/crates/assistant_eval/src/templates_eval.rs
@@ -0,0 +1,210 @@
+#[derive(Clone, Debug)]
+pub struct Template {
+    pub name: &'static str,
+    pub content: &'static str,
+}
+
+pub fn all_templates() -> Vec<Template> {
+    vec![
+        Template {
+            name: "ProjectCreation",
+            content: r#"
+# Project Creation Evaluation Template
+
+## Instructions
+
+Evaluate how well the AI assistant created a new implementation from scratch. Score it between 0.0 and 1.0 based on quality and fulfillment of requirements.
+- 1.0 = Perfect implementation that creates all necessary files with correct functionality.
+- 0.0 = Completely fails to create working files or meet requirements.
+
+Note: A git diff output is required. If no code changes are provided (i.e., no git diff output), the score must be 0.0.
+
+## Evaluation Criteria
+
+Please consider the following aspects in order of importance:
+
+1. **File Creation (25%)**
+   - Did the assistant create all necessary files?
+   - Are the files appropriately named and organized?
+   - Did the assistant create a complete solution without missing components?
+
+2. **Functional Correctness (40%)**
+   - Does the implementation fulfill all specified requirements?
+   - Does it handle edge cases properly?
+   - Is it free of logical errors and bugs?
+   - Do all components work together as expected?
+
+3. **Code Quality (20%)**
+   - Is the code well-structured, readable and well-documented?
+   - Does it follow language-specific best practices?
+   - Is there proper error handling?
+   - Are naming conventions clear and consistent?
+
+4. **Architecture Design (15%)**
+   - Is the code modular and extensible?
+   - Is there proper separation of concerns?
+   - Are appropriate design patterns used?
+   - Is the overall architecture appropriate for the requirements?
+
+## Input
+
+Requirements:
+<!-- ```requirements go here``` -->
+
+Reference Implementation:
+<!-- ```reference code goes here``` -->
+
+AI-Generated Implementation (git diff output):
+<!-- ```git diff goes here``` -->
+
+## Output Format
+
+THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
+
+EXAMPLE ONE:
+
+0.92
+
+EXAMPLE TWO:
+
+0.85
+
+EXAMPLE THREE:
+
+0.78
+"#,
+        },
+        Template {
+            name: "CodeModification",
+            content: r#"
+# Code Modification Evaluation Template
+
+## Instructions
+
+Evaluate how well the AI assistant modified existing code to meet requirements. Score between 0.0 and 1.0 based on quality and appropriateness of changes.
+- 1.0 = Perfect modifications that correctly implement all requirements.
+- 0.0 = Failed to make appropriate changes or introduced serious errors.
+
+## Evaluation Criteria
+
+Please consider the following aspects in order of importance:
+
+1. **Functional Correctness (50%)**
+   - Do the modifications correctly implement the requirements?
+   - Did the assistant modify the right files and code sections?
+   - Are the changes free of bugs and logical errors?
+   - Do the modifications maintain compatibility with existing code?
+
+2. **Modification Approach (25%)**
+   - Are the changes minimal and focused on what needs to be changed?
+   - Did the assistant avoid unnecessary modifications?
+   - Are the changes integrated seamlessly with the existing codebase?
+   - Did the assistant preserve the original code style and patterns?
+
+3. **Code Quality (15%)**
+   - Are the modifications well-structured and documented?
+   - Do they follow the same conventions as the original code?
+   - Is there proper error handling in the modified code?
+   - Are the changes readable and maintainable?
+
+4. **Solution Completeness (10%)**
+   - Do the modifications completely address all requirements?
+   - Are there any missing changes or overlooked requirements?
+   - Did the assistant consider all necessary edge cases?
+
+## Input
+
+Original:
+<!-- ```reference code goes here``` -->
+
+New (git diff output):
+<!-- ```git diff goes here``` -->
+
+## Output Format
+
+THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
+
+EXAMPLE ONE:
+
+0.92
+
+EXAMPLE TWO:
+
+0.85
+
+EXAMPLE THREE:
+
+0.78
+"#,
+        },
+        Template {
+            name: "ConversationalGuidance",
+            content: r#"
+# Conversational Guidance Evaluation Template
+
+## Instructions
+
+Evaluate the quality of the AI assistant's conversational guidance and score it between 0.0 and 1.0.
+- 1.0 = Perfect guidance with ideal information gathering, clarification, and advice without writing code.
+- 0.0 = Completely unhelpful, inappropriate guidance, or wrote code when it should not have.
+
+## Evaluation Criteria
+
+ABSOLUTE REQUIREMENT:
+   - The assistant should NOT generate complete code solutions in conversation mode.
+   - If the git diff shows the assistant wrote complete code, the score should be significantly reduced.
+
+1. **Information Gathering Effectiveness (30%)**
+   - Did the assistant ask relevant and precise questions?
+   - Did it efficiently narrow down the problem scope?
+   - Did it avoid unnecessary or redundant questions?
+   - Was questioning appropriately paced and contextual?
+
+2. **Conceptual Guidance (30%)**
+   - Did the assistant provide high-level approaches and strategies?
+   - Did it explain relevant concepts and algorithms?
+   - Did it offer planning advice without implementing the solution?
+   - Did it suggest a structured approach to solving the problem?
+
+3. **Educational Value (20%)**
+   - Did the assistant help the user understand the problem better?
+   - Did it provide explanations that would help the user learn?
+   - Did it guide without simply giving away answers?
+   - Did it encourage the user to think through parts of the problem?
+
+4. **Conversation Quality (20%)**
+   - Was the conversation logically structured and easy to follow?
+   - Did the assistant maintain appropriate context throughout?
+   - Was the interaction helpful without being condescending?
+   - Did the conversation reach a satisfactory conclusion with clear next steps?
+
+## Input
+
+Initial Query:
+<!-- ```query goes here``` -->
+
+Conversation Transcript:
+<!-- ```transcript goes here``` -->
+
+Git Diff:
+<!-- ```git diff goes here``` -->
+
+## Output Format
+
+THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
+
+EXAMPLE ONE:
+
+0.92
+
+EXAMPLE TWO:
+
+0.85
+
+EXAMPLE THREE:
+
+0.78
+"#,
+        },
+    ]
+}
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -16,8 +16,6 @@ anyhow.workspace = true
 assistant_tool.workspace = true
 chrono.workspace = true
 collections.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
 html_to_markdown.workspace = true
@@ -33,7 +31,6 @@ serde.workspace = true
 serde_json.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace.workspace = true
 worktree.workspace = true
 open = { workspace = true }
 workspace-hack.workspace = true
--- a/crates/assistant_tools/src/active_tab_tool.rs
+++ b/crates/assistant_tools/src/active_tab_tool.rs
@@ -1,58 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{anyhow, Result};
-use assistant_tool::{ActionLog, Tool};
-use gpui::{App, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use ui::IconName;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ActiveTabToolInput {}
-
-pub struct ActiveTabTool;
-
-impl Tool for ActiveTabTool {
-    fn name(&self) -> String {
-        "active-tab".into()
-    }
-
-    fn needs_confirmation(&self) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./active_tab_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Eye
-    }
-
-    fn input_schema(&self, _format: LanguageModelToolSchemaFormat) -> serde_json::Value {
-        let schema = schemars::schema_for!(ActiveTabToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn ui_text(&self, _input: &serde_json::Value) -> String {
-        "Get active tabs".to_string()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        _project: Entity<Project>,
-        _action_log: Entity<ActionLog>,
-        _cx: &mut App,
-    ) -> Task<Result<String>> {
-        let _input = match serde_json::from_value::<ActiveTabToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        Task::ready(Ok("Active tab information would be shown here".to_string()))
-    }
-}
--- a/crates/assistant_tools/src/active_tab_tool/description.md
+++ b/crates/assistant_tools/src/active_tab_tool/description.md
@@ -1 +0,0 @@
-Returns the path of the user's currently active tab.
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,4 +1,3 @@
-mod active_tab_tool;
 mod bash_tool;
 mod batch_tool;
 mod code_symbol_iter;
@@ -24,7 +23,6 @@ mod thinking_tool;

 use std::sync::Arc;

-use active_tab_tool::ActiveTabTool;
 use assistant_tool::ToolRegistry;
 use copy_path_tool::CopyPathTool;
 use gpui::App;
@@ -53,7 +51,6 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    assistant_tool::init(cx);

    let registry = ToolRegistry::global(cx);
-    registry.register_tool(ActiveTabTool);
    registry.register_tool(BashTool);
    registry.register_tool(BatchTool);
    registry.register_tool(CreateDirectoryTool);
--- a/crates/assistant_tools/src/bash_tool.rs
+++ b/crates/assistant_tools/src/bash_tool.rs
@@ -1,8 +1,6 @@
 use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool};
-use futures::io::BufReader;
-use futures::{AsyncBufReadExt, AsyncReadExt};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
@@ -127,90 +125,29 @@ impl Tool for BashTool {
            // Add 2>&1 to merge stderr into stdout for proper interleaving.
            let command = format!("({}) 2>&1", input.command);

-            let mut cmd = new_smol_command("bash")
+            let output = new_smol_command("bash")
                .arg("-c")
                .arg(&command)
                .current_dir(working_dir)
-                .stdout(std::process::Stdio::piped())
-                .spawn()
+                .output()
+                .await
                .context("Failed to execute bash command")?;

-            // Capture stdout with a limit
-            let stdout = cmd.stdout.take().unwrap();
-            let mut reader = BufReader::new(stdout);
+            let output_string = String::from_utf8_lossy(&output.stdout).to_string();

-            const MESSAGE_1: &str = "Command output too long. The first ";
-            const MESSAGE_2: &str = " bytes:\n\n";
-            const ERR_MESSAGE_1: &str = "Command failed with exit code ";
-            const ERR_MESSAGE_2: &str = "\n\n";
-
-            const STDOUT_LIMIT: usize = 8192;
-
-            const LIMIT: usize = STDOUT_LIMIT
-                - (MESSAGE_1.len()
-                    + (STDOUT_LIMIT.ilog10() as usize + 1) // byte count
-                    + MESSAGE_2.len()
-                    + ERR_MESSAGE_1.len()
-                    + 3 // status code
-                    + ERR_MESSAGE_2.len());
-
-            // Read one more byte to determine whether the output was truncated
-            let mut buffer = vec![0; LIMIT + 1];
-            let bytes_read = reader.read(&mut buffer).await?;
-
-            // Repeatedly fill the output reader's buffer without copying it.
-            loop {
-                let skipped_bytes = reader.fill_buf().await?;
-                if skipped_bytes.is_empty() {
-                    break;
-                }
-                let skipped_bytes_len = skipped_bytes.len();
-                reader.consume_unpin(skipped_bytes_len);
-            }
-
-            let output_bytes = &buffer[..bytes_read];
-
-            // Let the process continue running
-            let status = cmd.status().await.context("Failed to get command status")?;
-
-            let output_string = if bytes_read > LIMIT {
-                // Valid to find `\n` in UTF-8 since 0-127 ASCII characters are not used in
-                // multi-byte characters.
-                let last_line_ix = output_bytes.iter().rposition(|b| *b == b'\n');
-                let output_string = String::from_utf8_lossy(
-                    &output_bytes[..last_line_ix.unwrap_or(output_bytes.len())],
-                );
-
-                format!(
-                    "{}{}{}{}",
-                    MESSAGE_1,
-                    output_string.len(),
-                    MESSAGE_2,
-                    output_string
-                )
-            } else {
-                String::from_utf8_lossy(&output_bytes).into()
-            };
-
-            let output_with_status = if status.success() {
+            if output.status.success() {
                if output_string.is_empty() {
-                    "Command executed successfully.".to_string()
+                    Ok("Command executed successfully.".to_string())
                } else {
-                    output_string.to_string()
+                    Ok(output_string)
                }
            } else {
-                format!(
-                    "{}{}{}{}",
-                    ERR_MESSAGE_1,
-                    status.code().unwrap_or(-1),
-                    ERR_MESSAGE_2,
-                    output_string,
-                )
-            };
-
-            debug_assert!(output_with_status.len() <= STDOUT_LIMIT);
-
-            Ok(output_with_status)
+                Ok(format!(
+                    "Command failed with exit code {}\n{}",
+                    output.status.code().unwrap_or(-1),
+                    &output_string
+                ))
+            }
        })
    }
 }
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -131,9 +131,8 @@ impl Render for Breadcrumbs {
                    }),
            ),
            None => element
-                // Match the height and padding of the `ButtonLike` in the other arm.
+                // Match the height of the `ButtonLike` in the other arm.
                .h(rems_from_px(22.))
-                .pl_1()
                .child(breadcrumbs_stack),
        }
    }
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -19,7 +19,7 @@ use livekit_client::{self as livekit, TrackSid};
 use postage::{sink::Sink, stream::Stream, watch};
 use project::Project;
 use settings::Settings as _;
-use std::{any::Any, future::Future, mem, rc::Rc, sync::Arc, time::Duration};
+use std::{any::Any, future::Future, mem, sync::Arc, time::Duration};
 use util::{ResultExt, TryFutureExt, post_inc};

 pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
@@ -944,8 +944,8 @@ impl Room {
                    )
                })?;
                if self.live_kit.as_ref().map_or(true, |kit| kit.deafened) {
-                    if publication.is_audio() {
-                        publication.set_enabled(false, cx);
+                    if matches!(track, livekit_client::RemoteTrack::Audio(_)) {
+                        track.set_enabled(false, cx);
                    }
                }
                match track {
@@ -1594,7 +1594,7 @@ fn spawn_room_connection(

                let muted_by_user = Room::mute_on_join(cx);
                this.live_kit = Some(LiveKitRoom {
-                    room: Rc::new(room),
+                    room: Arc::new(room),
                    screen_track: LocalTrack::None,
                    microphone_track: LocalTrack::None,
                    next_publish_id: 0,
@@ -1617,7 +1617,7 @@ fn spawn_room_connection(
 }

 struct LiveKitRoom {
-    room: Rc<livekit::Room>,
+    room: Arc<livekit::Room>,
    screen_track: LocalTrack,
    microphone_track: LocalTrack,
    /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -18,7 +18,7 @@ test-support = ["clock/test-support", "collections/test-support", "gpui/test-sup
 [dependencies]
 anyhow.workspace = true
 async-recursion = "0.3"
-async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
+async-tungstenite = { workspace = true, features = ["async-std", "async-tls"] }
 chrono = { workspace = true, features = ["serde"] }
 clock.workspace = true
 collections.workspace = true
@@ -26,7 +26,6 @@ credentials_provider.workspace = true
 feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
-gpui_tokio.workspace = true
 http_client.workspace = true
 http_client_tls.workspace = true
 log.workspace = true
@@ -52,7 +51,6 @@ url.workspace = true
 util.workspace = true
 worktree.workspace = true
 telemetry.workspace = true
-tokio.workspace = true
 workspace-hack.workspace = true

 [dev-dependencies]
@@ -69,3 +67,4 @@ windows.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa.workspace = true
+async-native-tls = { version = "0.5.0", features = ["vendored"] }
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -20,7 +20,7 @@ use futures::{
    AsyncReadExt, FutureExt, SinkExt, Stream, StreamExt, TryFutureExt as _, TryStreamExt,
    channel::oneshot, future::BoxFuture,
 };
-use gpui::{App, AsyncApp, Entity, Global, Task, WeakEntity, actions};
+use gpui::{App, AppContext as _, AsyncApp, Entity, Global, Task, WeakEntity, actions};
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use parking_lot::RwLock;
 use postage::watch;
@@ -1086,7 +1086,7 @@ impl Client {
        let rpc_url = self.rpc_url(http, release_channel);
        let system_id = self.telemetry.system_id();
        let metrics_id = self.telemetry.metrics_id();
-        cx.spawn(async move |cx| {
+        cx.background_spawn(async move {
            use HttpOrHttps::*;

            #[derive(Debug)]
@@ -1105,12 +1105,7 @@ impl Client {
                .host_str()
                .zip(rpc_url.port_or_known_default())
                .ok_or_else(|| anyhow!("missing host in rpc url"))?;
-
-            let stream = {
-                let handle = cx.update(|cx| gpui_tokio::Tokio::handle(cx)).ok().unwrap();
-                let _guard = handle.enter();
-                connect_socks_proxy_stream(proxy.as_ref(), rpc_host).await?
-            };
+            let stream = connect_socks_proxy_stream(proxy.as_ref(), rpc_host).await?;

            log::info!("connected to rpc endpoint {}", rpc_url);

@@ -1149,19 +1144,30 @@ impl Client {
                request_headers.insert("x-zed-metrics-id", HeaderValue::from_str(&metrics_id)?);
            }

-            let (stream, _) = async_tungstenite::tokio::client_async_tls_with_connector_and_config(
-                request,
-                stream,
-                Some(Arc::new(http_client_tls::tls_config()).into()),
-                None,
-            )
-            .await?;
-
-            Ok(Connection::new(
-                stream
-                    .map_err(|error| anyhow!(error))
-                    .sink_map_err(|error| anyhow!(error)),
-            ))
+            match url_scheme {
+                Https => {
+                    let (stream, _) =
+                        async_tungstenite::async_tls::client_async_tls_with_connector(
+                            request,
+                            stream,
+                            Some(http_client_tls::tls_config().into()),
+                        )
+                        .await?;
+                    Ok(Connection::new(
+                        stream
+                            .map_err(|error| anyhow!(error))
+                            .sink_map_err(|error| anyhow!(error)),
+                    ))
+                }
+                Http => {
+                    let (stream, _) = async_tungstenite::client_async(request, stream).await?;
+                    Ok(Connection::new(
+                        stream
+                            .map_err(|error| anyhow!(error))
+                            .sink_map_err(|error| anyhow!(error)),
+                    ))
+                }
+            }
        })
    }

@@ -1633,7 +1639,7 @@ mod tests {
    use crate::test::FakeServer;

    use clock::FakeSystemClock;
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};
+    use gpui::{BackgroundExecutor, TestAppContext};
    use http_client::FakeHttpClient;
    use parking_lot::Mutex;
    use proto::TypedEnvelope;
--- a/crates/client/src/socks.rs
+++ b/crates/client/src/socks.rs
@@ -1,7 +1,11 @@
 //! socks proxy
 use anyhow::{Result, anyhow};
+use futures::io::{AsyncRead, AsyncWrite};
 use http_client::Uri;
-use tokio_socks::tcp::{Socks4Stream, Socks5Stream};
+use tokio_socks::{
+    io::Compat,
+    tcp::{Socks4Stream, Socks5Stream},
+};

 pub(crate) async fn connect_socks_proxy_stream(
    proxy: Option<&Uri>,
@@ -10,7 +14,7 @@ pub(crate) async fn connect_socks_proxy_stream(
    let stream = match parse_socks_proxy(proxy) {
        Some((socks_proxy, SocksVersion::V4)) => {
            let stream = Socks4Stream::connect_with_socket(
-                tokio::net::TcpStream::connect(socks_proxy).await?,
+                Compat::new(smol::net::TcpStream::connect(socks_proxy).await?),
                rpc_host,
            )
            .await
@@ -19,15 +23,13 @@ pub(crate) async fn connect_socks_proxy_stream(
        }
        Some((socks_proxy, SocksVersion::V5)) => Box::new(
            Socks5Stream::connect_with_socket(
-                tokio::net::TcpStream::connect(socks_proxy).await?,
+                Compat::new(smol::net::TcpStream::connect(socks_proxy).await?),
                rpc_host,
            )
            .await
            .map_err(|err| anyhow!("error connecting to socks {}", err))?,
        ) as Box<dyn AsyncReadWrite>,
-        None => {
-            Box::new(tokio::net::TcpStream::connect(rpc_host).await?) as Box<dyn AsyncReadWrite>
-        }
+        None => Box::new(smol::net::TcpStream::connect(rpc_host).await?) as Box<dyn AsyncReadWrite>,
    };
    Ok(stream)
 }
@@ -58,11 +60,5 @@ enum SocksVersion {
    V5,
 }

-pub(crate) trait AsyncReadWrite:
-    tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static
-{
-}
-impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static> AsyncReadWrite
-    for T
-{
-}
+pub(crate) trait AsyncReadWrite: AsyncRead + AsyncWrite + Unpin + Send + 'static {}
+impl<T: AsyncRead + AsyncWrite + Unpin + Send + 'static> AsyncReadWrite for T {}
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -17,7 +17,7 @@ use std::io::Write;
 use std::sync::LazyLock;
 use std::time::Instant;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
-use telemetry_events::{AssistantEventData, AssistantPhase, Event, EventRequestBody, EventWrapper};
+use telemetry_events::{AssistantEvent, AssistantPhase, Event, EventRequestBody, EventWrapper};
 use util::{ResultExt, TryFutureExt};
 use worktree::{UpdatedEntriesSet, WorktreeId};

@@ -329,7 +329,7 @@ impl Telemetry {
        drop(state);
    }

-    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEventData) {
+    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEvent) {
        let event_type = match event.phase {
            AssistantPhase::Response => "Assistant Responded",
            AssistantPhase::Invoked => "Assistant Invoked",
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -33,6 +33,7 @@ clock.workspace = true
 collections.workspace = true
 dashmap.workspace = true
 derive_more.workspace = true
+buffer_diff.workspace = true
 envy = "0.4.2"
 futures.workspace = true
 google_ai.workspace = true
@@ -84,7 +85,6 @@ assistant_slash_command.workspace = true
 assistant_tool.workspace = true
 async-trait.workspace = true
 audio.workspace = true
-buffer_diff.workspace = true
 call = { workspace = true, features = ["test-support"] }
 channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
--- a/crates/collab/migrations_llm/20250404141155_add_granular_token_limits_to_models.sql
+++ b/crates/collab/migrations_llm/20250404141155_add_granular_token_limits_to_models.sql
@@ -1,3 +0,0 @@
-alter table models
-    add column max_input_tokens_per_minute bigint not null default 0,
-    add column max_output_tokens_per_minute bigint not null default 0;
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -127,7 +127,7 @@ async fn update_billing_preferences(

    SnowflakeRow::new(
        "Spend Limit Updated",
-        Some(user.metrics_id),
+        user.metrics_id,
        user.admin,
        None,
        json!({
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -149,37 +149,6 @@ pub async fn post_crash(
        "crash report"
    );

-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let properties = json!({
-                "app_version": report.header.app_version,
-                "os_version": report.header.os_version,
-                "os_name": "macOS",
-                "bundle_id": report.header.bundle_id,
-                "incident_id": report.header.incident_id,
-                "installation_id": installation_id,
-                "description": description,
-                "backtrace": summary,
-            });
-            let row = SnowflakeRow::new(
-                "Crash Reported",
-                None,
-                false,
-                Some(installation_id),
-                properties,
-            );
-            let data = serde_json::to_vec(&row)?;
-            kinesis_client
-                .put_record()
-                .stream_name(stream)
-                .partition_key(row.insert_id.unwrap_or_default())
-                .data(data.into())
-                .send()
-                .await
-                .log_err();
-        }
-    }
-
    if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
        let payload = slack::WebhookBody::new(|w| {
            w.add_section(|s| s.text(slack::Text::markdown(description)))
@@ -345,8 +314,6 @@ pub async fn post_panic(
            .ok();
    }

-    let backtrace = panic.backtrace.join("\n");
-
    tracing::error!(
        service = "client",
        version = %panic.app_version,
@@ -355,40 +322,10 @@ pub async fn post_panic(
        incident_id = %incident_id,
        installation_id = %panic.installation_id.clone().unwrap_or_default(),
        description = %panic.payload,
-        backtrace = %backtrace,
+        backtrace = %panic.backtrace.join("\n"),
        "panic report"
    );

-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let properties = json!({
-                "app_version": panic.app_version,
-                "os_name": panic.os_name,
-                "os_version": panic.os_version,
-                "incident_id": incident_id,
-                "installation_id": panic.installation_id,
-                "description": panic.payload,
-                "backtrace": backtrace,
-            });
-            let row = SnowflakeRow::new(
-                "Panic Reported",
-                None,
-                false,
-                panic.installation_id.clone(),
-                properties,
-            );
-            let data = serde_json::to_vec(&row)?;
-            kinesis_client
-                .put_record()
-                .stream_name(stream)
-                .partition_key(row.insert_id.unwrap_or_default())
-                .data(data.into())
-                .send()
-                .await
-                .log_err();
-        }
-    }
-
    let backtrace = if panic.backtrace.len() > 25 {
        let total = panic.backtrace.len();
        format!(
@@ -774,7 +711,7 @@ pub struct SnowflakeRow {
 impl SnowflakeRow {
    pub fn new(
        event_type: impl Into<String>,
-        metrics_id: Option<Uuid>,
+        metrics_id: Uuid,
        is_staff: bool,
        system_id: Option<String>,
        event_properties: serde_json::Value,
@@ -783,7 +720,7 @@ impl SnowflakeRow {
            time: chrono::Utc::now(),
            event_type: event_type.into(),
            device_id: system_id,
-            user_id: metrics_id.map(|id| id.to_string()),
+            user_id: Some(metrics_id.to_string()),
            insert_id: Some(uuid::Uuid::new_v4().to_string()),
            event_properties,
            user_properties: Some(json!({"is_staff": is_staff})),
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -316,14 +316,10 @@ async fn perform_completion(
                    is_staff = claims.is_staff,
                    provider = params.provider.to_string(),
                    model = model,
-                    tokens_remaining = rate_limit_info.tokens.as_ref().map(|limits| limits.remaining),
-                    input_tokens_remaining = rate_limit_info.input_tokens.as_ref().map(|limits| limits.remaining),
-                    output_tokens_remaining = rate_limit_info.output_tokens.as_ref().map(|limits| limits.remaining),
-                    requests_remaining = rate_limit_info.requests.as_ref().map(|limits| limits.remaining),
-                    requests_reset = ?rate_limit_info.requests.as_ref().map(|limits| limits.reset),
-                    tokens_reset = ?rate_limit_info.tokens.as_ref().map(|limits| limits.reset),
-                    input_tokens_reset = ?rate_limit_info.input_tokens.as_ref().map(|limits| limits.reset),
-                    output_tokens_reset = ?rate_limit_info.output_tokens.as_ref().map(|limits| limits.reset),
+                    tokens_remaining = rate_limit_info.tokens_remaining,
+                    requests_remaining = rate_limit_info.requests_remaining,
+                    requests_reset = ?rate_limit_info.requests_reset,
+                    tokens_reset = ?rate_limit_info.tokens_reset,
                );
            }

@@ -503,10 +499,6 @@ async fn check_usage_limit(
        model.max_requests_per_minute as usize / users_in_recent_minutes;
    let per_user_max_tokens_per_minute =
        model.max_tokens_per_minute as usize / users_in_recent_minutes;
-    let per_user_max_input_tokens_per_minute =
-        model.max_input_tokens_per_minute as usize / users_in_recent_minutes;
-    let per_user_max_output_tokens_per_minute =
-        model.max_output_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
@@ -514,55 +506,29 @@ async fn check_usage_limit(
        .get_usage(user_id, provider, model_name, Utc::now())
        .await?;

-    let checks = match (provider, model_name) {
-        (LanguageModelProvider::Anthropic, "claude-3-7-sonnet") => vec![
-            (
-                usage.requests_this_minute,
-                per_user_max_requests_per_minute,
-                UsageMeasure::RequestsPerMinute,
-            ),
-            (
-                usage.input_tokens_this_minute,
-                per_user_max_tokens_per_minute,
-                UsageMeasure::InputTokensPerMinute,
-            ),
-            (
-                usage.output_tokens_this_minute,
-                per_user_max_tokens_per_minute,
-                UsageMeasure::OutputTokensPerMinute,
-            ),
-            (
-                usage.tokens_this_day,
-                per_user_max_tokens_per_day,
-                UsageMeasure::TokensPerDay,
-            ),
-        ],
-        _ => vec![
-            (
-                usage.requests_this_minute,
-                per_user_max_requests_per_minute,
-                UsageMeasure::RequestsPerMinute,
-            ),
-            (
-                usage.tokens_this_minute,
-                per_user_max_tokens_per_minute,
-                UsageMeasure::TokensPerMinute,
-            ),
-            (
-                usage.tokens_this_day,
-                per_user_max_tokens_per_day,
-                UsageMeasure::TokensPerDay,
-            ),
-        ],
-    };
+    let checks = [
+        (
+            usage.requests_this_minute,
+            per_user_max_requests_per_minute,
+            UsageMeasure::RequestsPerMinute,
+        ),
+        (
+            usage.tokens_this_minute,
+            per_user_max_tokens_per_minute,
+            UsageMeasure::TokensPerMinute,
+        ),
+        (
+            usage.tokens_this_day,
+            per_user_max_tokens_per_day,
+            UsageMeasure::TokensPerDay,
+        ),
+    ];

    for (used, limit, usage_measure) in checks {
        if used > limit {
            let resource = match usage_measure {
                UsageMeasure::RequestsPerMinute => "requests_per_minute",
                UsageMeasure::TokensPerMinute => "tokens_per_minute",
-                UsageMeasure::InputTokensPerMinute => "input_tokens_per_minute",
-                UsageMeasure::OutputTokensPerMinute => "output_tokens_per_minute",
                UsageMeasure::TokensPerDay => "tokens_per_day",
            };

@@ -574,24 +540,19 @@ async fn check_usage_limit(
                is_staff = claims.is_staff,
                provider = provider.to_string(),
                model = model.name,
-                usage_measure = resource,
                requests_this_minute = usage.requests_this_minute,
                tokens_this_minute = usage.tokens_this_minute,
-                input_tokens_this_minute = usage.input_tokens_this_minute,
-                output_tokens_this_minute = usage.output_tokens_this_minute,
                tokens_this_day = usage.tokens_this_day,
                users_in_recent_minutes = users_in_recent_minutes,
                users_in_recent_days = users_in_recent_days,
                max_requests_per_minute = per_user_max_requests_per_minute,
                max_tokens_per_minute = per_user_max_tokens_per_minute,
-                max_input_tokens_per_minute = per_user_max_input_tokens_per_minute,
-                max_output_tokens_per_minute = per_user_max_output_tokens_per_minute,
                max_tokens_per_day = per_user_max_tokens_per_day,
            );

            SnowflakeRow::new(
                "Language Model Rate Limited",
-                Some(claims.metrics_id),
+                claims.metrics_id,
                claims.is_staff,
                claims.system_id.clone(),
                json!({
@@ -600,8 +561,6 @@ async fn check_usage_limit(
                    "users_in_recent_days": users_in_recent_days,
                    "max_requests_per_minute": per_user_max_requests_per_minute,
                    "max_tokens_per_minute": per_user_max_tokens_per_minute,
-                    "max_input_tokens_per_minute": per_user_max_input_tokens_per_minute,
-                    "max_output_tokens_per_minute": per_user_max_output_tokens_per_minute,
                    "max_tokens_per_day": per_user_max_tokens_per_day,
                    "plan": match claims.plan {
                        Plan::Free => "free".to_string(),
@@ -697,12 +656,8 @@ impl<S> Drop for TokenCountingStream<S> {
                    login = claims.github_user_login,
                    authn.jti = claims.jti,
                    is_staff = claims.is_staff,
-                    provider = provider.to_string(),
-                    model = model,
                    requests_this_minute = usage.requests_this_minute,
                    tokens_this_minute = usage.tokens_this_minute,
-                    input_tokens_this_minute = usage.input_tokens_this_minute,
-                    output_tokens_this_minute = usage.output_tokens_this_minute,
                );

                let properties = json!({
@@ -719,7 +674,7 @@ impl<S> Drop for TokenCountingStream<S> {
                });
                SnowflakeRow::new(
                    "Language Model Used",
-                    Some(claims.metrics_id),
+                    claims.metrics_id,
                    claims.is_staff,
                    claims.system_id.clone(),
                    properties,
@@ -771,8 +726,6 @@ pub fn log_usage_periodically(state: Arc<LlmState>) {
                        model = usage.model,
                        requests_this_minute = usage.requests_this_minute,
                        tokens_this_minute = usage.tokens_this_minute,
-                        input_tokens_this_minute = usage.input_tokens_this_minute,
-                        output_tokens_this_minute = usage.output_tokens_this_minute,
                    );
                }
            }
--- a/crates/collab/src/llm/db/queries/usages.rs
+++ b/crates/collab/src/llm/db/queries/usages.rs
@@ -27,8 +27,6 @@ impl TokenUsage {
 pub struct Usage {
    pub requests_this_minute: usize,
    pub tokens_this_minute: usize,
-    pub input_tokens_this_minute: usize,
-    pub output_tokens_this_minute: usize,
    pub tokens_this_day: usize,
    pub tokens_this_month: TokenUsage,
    pub spending_this_month: Cents,
@@ -41,8 +39,6 @@ pub struct ApplicationWideUsage {
    pub model: String,
    pub requests_this_minute: usize,
    pub tokens_this_minute: usize,
-    pub input_tokens_this_minute: usize,
-    pub output_tokens_this_minute: usize,
 }

 #[derive(Clone, Copy, Debug, Default)]
@@ -98,10 +94,6 @@ impl LlmDatabase {
            let past_minute = now - Duration::minutes(1);
            let requests_per_minute = self.usage_measure_ids[&UsageMeasure::RequestsPerMinute];
            let tokens_per_minute = self.usage_measure_ids[&UsageMeasure::TokensPerMinute];
-            let input_tokens_per_minute =
-                self.usage_measure_ids[&UsageMeasure::InputTokensPerMinute];
-            let output_tokens_per_minute =
-                self.usage_measure_ids[&UsageMeasure::OutputTokensPerMinute];

            let mut results = Vec::new();
            for ((provider, model_name), model) in self.models.iter() {
@@ -122,8 +114,6 @@ impl LlmDatabase {

                let mut requests_this_minute = 0;
                let mut tokens_this_minute = 0;
-                let mut input_tokens_this_minute = 0;
-                let mut output_tokens_this_minute = 0;
                while let Some(usage) = usages.next().await {
                    let usage = usage?;
                    if usage.measure_id == requests_per_minute {
@@ -146,26 +136,6 @@ impl LlmDatabase {
                        .iter()
                        .copied()
                        .sum::<i64>() as usize;
-                    } else if usage.measure_id == input_tokens_per_minute {
-                        input_tokens_this_minute += Self::get_live_buckets(
-                            &usage,
-                            now.naive_utc(),
-                            UsageMeasure::InputTokensPerMinute,
-                        )
-                        .0
-                        .iter()
-                        .copied()
-                        .sum::<i64>() as usize;
-                    } else if usage.measure_id == output_tokens_per_minute {
-                        output_tokens_this_minute += Self::get_live_buckets(
-                            &usage,
-                            now.naive_utc(),
-                            UsageMeasure::OutputTokensPerMinute,
-                        )
-                        .0
-                        .iter()
-                        .copied()
-                        .sum::<i64>() as usize;
                    }
                }

@@ -174,8 +144,6 @@ impl LlmDatabase {
                    model: model_name.clone(),
                    requests_this_minute,
                    tokens_this_minute,
-                    input_tokens_this_minute,
-                    output_tokens_this_minute,
                })
            }

@@ -271,10 +239,6 @@ impl LlmDatabase {
                self.get_usage_for_measure(&usages, now, UsageMeasure::RequestsPerMinute)?;
            let tokens_this_minute =
                self.get_usage_for_measure(&usages, now, UsageMeasure::TokensPerMinute)?;
-            let input_tokens_this_minute =
-                self.get_usage_for_measure(&usages, now, UsageMeasure::InputTokensPerMinute)?;
-            let output_tokens_this_minute =
-                self.get_usage_for_measure(&usages, now, UsageMeasure::OutputTokensPerMinute)?;
            let tokens_this_day =
                self.get_usage_for_measure(&usages, now, UsageMeasure::TokensPerDay)?;
            let spending_this_month = if let Some(monthly_usage) = &monthly_usage {
@@ -303,8 +267,6 @@ impl LlmDatabase {
            Ok(Usage {
                requests_this_minute,
                tokens_this_minute,
-                input_tokens_this_minute,
-                output_tokens_this_minute,
                tokens_this_day,
                tokens_this_month: TokenUsage {
                    input: monthly_usage
@@ -375,31 +337,6 @@ impl LlmDatabase {
                    &tx,
                )
                .await?;
-            let input_tokens_this_minute = self
-                .update_usage_for_measure(
-                    user_id,
-                    is_staff,
-                    model.id,
-                    &usages,
-                    UsageMeasure::InputTokensPerMinute,
-                    now,
-                    // Cache read input tokens are not counted for the purposes of rate limits (but they are still billed).
-                    tokens.input + tokens.input_cache_creation,
-                    &tx,
-                )
-                .await?;
-            let output_tokens_this_minute = self
-                .update_usage_for_measure(
-                    user_id,
-                    is_staff,
-                    model.id,
-                    &usages,
-                    UsageMeasure::OutputTokensPerMinute,
-                    now,
-                    tokens.output,
-                    &tx,
-                )
-                .await?;
            let tokens_this_day = self
                .update_usage_for_measure(
                    user_id,
@@ -548,8 +485,6 @@ impl LlmDatabase {
            Ok(Usage {
                requests_this_minute,
                tokens_this_minute,
-                input_tokens_this_minute,
-                output_tokens_this_minute,
                tokens_this_day,
                tokens_this_month: TokenUsage {
                    input: monthly_usage.input_tokens as usize,
@@ -749,9 +684,7 @@ impl UsageMeasure {
    fn bucket_count(&self) -> usize {
        match self {
            UsageMeasure::RequestsPerMinute => MINUTE_BUCKET_COUNT,
-            UsageMeasure::TokensPerMinute
-            | UsageMeasure::InputTokensPerMinute
-            | UsageMeasure::OutputTokensPerMinute => MINUTE_BUCKET_COUNT,
+            UsageMeasure::TokensPerMinute => MINUTE_BUCKET_COUNT,
            UsageMeasure::TokensPerDay => DAY_BUCKET_COUNT,
        }
    }
@@ -759,9 +692,7 @@ impl UsageMeasure {
    fn total_duration(&self) -> Duration {
        match self {
            UsageMeasure::RequestsPerMinute => Duration::minutes(1),
-            UsageMeasure::TokensPerMinute
-            | UsageMeasure::InputTokensPerMinute
-            | UsageMeasure::OutputTokensPerMinute => Duration::minutes(1),
+            UsageMeasure::TokensPerMinute => Duration::minutes(1),
            UsageMeasure::TokensPerDay => Duration::hours(24),
        }
    }
--- a/crates/collab/src/llm/db/tables/model.rs
+++ b/crates/collab/src/llm/db/tables/model.rs
@@ -12,8 +12,6 @@ pub struct Model {
    pub name: String,
    pub max_requests_per_minute: i64,
    pub max_tokens_per_minute: i64,
-    pub max_input_tokens_per_minute: i64,
-    pub max_output_tokens_per_minute: i64,
    pub max_tokens_per_day: i64,
    pub price_per_million_input_tokens: i32,
    pub price_per_million_cache_creation_input_tokens: i32,
--- a/crates/collab/src/llm/db/tables/usage_measure.rs
+++ b/crates/collab/src/llm/db/tables/usage_measure.rs
@@ -8,8 +8,6 @@ use sea_orm::entity::prelude::*;
 pub enum UsageMeasure {
    RequestsPerMinute,
    TokensPerMinute,
-    InputTokensPerMinute,
-    OutputTokensPerMinute,
    TokensPerDay,
 }

--- a/crates/collab/src/llm/db/tests/usage_tests.rs
+++ b/crates/collab/src/llm/db/tests/usage_tests.rs
@@ -83,8 +83,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 2,
            tokens_this_minute: 3000,
-            input_tokens_this_minute: 3000,
-            output_tokens_this_minute: 0,
            tokens_this_day: 3000,
            tokens_this_month: TokenUsage {
                input: 3000,
@@ -104,8 +102,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 1,
            tokens_this_minute: 2000,
-            input_tokens_this_minute: 2000,
-            output_tokens_this_minute: 0,
            tokens_this_day: 3000,
            tokens_this_month: TokenUsage {
                input: 3000,
@@ -144,8 +140,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 2,
            tokens_this_minute: 5000,
-            input_tokens_this_minute: 5000,
-            output_tokens_this_minute: 0,
            tokens_this_day: 6000,
            tokens_this_month: TokenUsage {
                input: 6000,
@@ -166,8 +160,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 0,
            tokens_this_minute: 0,
-            input_tokens_this_minute: 0,
-            output_tokens_this_minute: 0,
            tokens_this_day: 5000,
            tokens_this_month: TokenUsage {
                input: 6000,
@@ -205,8 +197,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 1,
            tokens_this_minute: 4000,
-            input_tokens_this_minute: 4000,
-            output_tokens_this_minute: 0,
            tokens_this_day: 9000,
            tokens_this_month: TokenUsage {
                input: 10000,
@@ -250,8 +240,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 1,
            tokens_this_minute: 1500,
-            input_tokens_this_minute: 1500,
-            output_tokens_this_minute: 0,
            tokens_this_day: 1500,
            tokens_this_month: TokenUsage {
                input: 1000,
@@ -290,8 +278,6 @@ async fn test_tracking_usage(db: &mut LlmDatabase) {
        Usage {
            requests_this_minute: 2,
            tokens_this_minute: 2800,
-            input_tokens_this_minute: 2500,
-            output_tokens_this_minute: 0,
            tokens_this_day: 2800,
            tokens_this_month: TokenUsage {
                input: 2000,
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -356,7 +356,6 @@ impl Server {
            .add_request_handler(forward_mutating_project_request::<proto::BlameBuffer>)
            .add_request_handler(forward_mutating_project_request::<proto::MultiLspQuery>)
            .add_request_handler(forward_mutating_project_request::<proto::RestartLanguageServers>)
-            .add_request_handler(forward_mutating_project_request::<proto::StopLanguageServers>)
            .add_request_handler(forward_mutating_project_request::<proto::LinkedEditingRange>)
            .add_message_handler(create_buffer_for_peer)
            .add_request_handler(update_buffer)
@@ -984,7 +983,7 @@ impl Server {
        }
    }

-    pub async fn snapshot(self: &Arc<Self>) -> ServerSnapshot {
+    pub async fn snapshot<'a>(self: &'a Arc<Self>) -> ServerSnapshot<'a> {
        ServerSnapshot {
            connection_pool: ConnectionPoolGuard {
                guard: self.connection_pool.lock(),
@@ -4153,13 +4152,13 @@ async fn get_llm_api_token(

 fn to_axum_message(message: TungsteniteMessage) -> anyhow::Result<AxumMessage> {
    let message = match message {
-        TungsteniteMessage::Text(payload) => AxumMessage::Text(payload.as_str().to_string()),
-        TungsteniteMessage::Binary(payload) => AxumMessage::Binary(payload.into()),
-        TungsteniteMessage::Ping(payload) => AxumMessage::Ping(payload.into()),
-        TungsteniteMessage::Pong(payload) => AxumMessage::Pong(payload.into()),
+        TungsteniteMessage::Text(payload) => AxumMessage::Text(payload),
+        TungsteniteMessage::Binary(payload) => AxumMessage::Binary(payload),
+        TungsteniteMessage::Ping(payload) => AxumMessage::Ping(payload),
+        TungsteniteMessage::Pong(payload) => AxumMessage::Pong(payload),
        TungsteniteMessage::Close(frame) => AxumMessage::Close(frame.map(|frame| AxumCloseFrame {
            code: frame.code.into(),
-            reason: frame.reason.as_str().to_owned().into(),
+            reason: frame.reason,
        })),
        // We should never receive a frame while reading the message, according
        // to the `tungstenite` maintainers:
@@ -4179,14 +4178,14 @@ fn to_axum_message(message: TungsteniteMessage) -> anyhow::Result<AxumMessage> {

 fn to_tungstenite_message(message: AxumMessage) -> TungsteniteMessage {
    match message {
-        AxumMessage::Text(payload) => TungsteniteMessage::Text(payload.into()),
-        AxumMessage::Binary(payload) => TungsteniteMessage::Binary(payload.into()),
-        AxumMessage::Ping(payload) => TungsteniteMessage::Ping(payload.into()),
-        AxumMessage::Pong(payload) => TungsteniteMessage::Pong(payload.into()),
+        AxumMessage::Text(payload) => TungsteniteMessage::Text(payload),
+        AxumMessage::Binary(payload) => TungsteniteMessage::Binary(payload),
+        AxumMessage::Ping(payload) => TungsteniteMessage::Ping(payload),
+        AxumMessage::Pong(payload) => TungsteniteMessage::Pong(payload),
        AxumMessage::Close(frame) => {
            TungsteniteMessage::Close(frame.map(|frame| TungsteniteCloseFrame {
                code: frame.code.into(),
-                reason: frame.reason.as_ref().into(),
+                reason: frame.reason,
            }))
        }
    }
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -674,7 +674,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    client_a
        .fs()
        .insert_tree(
-            path!("/a"),
+            "/a",
            json!({
                "1.txt": "one",
                "2.txt": "two",
@@ -683,7 +683,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
            }),
        )
        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
+    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
    active_call_a
        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
        .await
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6866,14 +6866,10 @@ async fn test_remote_git_branches(

    assert_eq!(branches_b, branches_set);

-    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.change_branch(new_branch.to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

@@ -6896,18 +6892,18 @@ async fn test_remote_git_branches(

    // Also try creating a new branch
    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.create_branch("totally-new-branch".to_string())
-        })
+        repo_b
+            .read(cx)
+            .create_branch("totally-new-branch".to_string())
    })
    .await
    .unwrap()
    .unwrap();

    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.change_branch("totally-new-branch".to_string())
-        })
+        repo_b
+            .read(cx)
+            .change_branch("totally-new-branch".to_string())
    })
    .await
    .unwrap()
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -283,7 +283,7 @@ async fn test_ssh_collaboration_git_branches(
    let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());

    let branches_b = cx_b
-        .update(|cx| repo_b.update(cx, |repo_b, _cx| repo_b.branches()))
+        .update(|cx| repo_b.read(cx).branches())
        .await
        .unwrap()
        .unwrap();
@@ -297,14 +297,10 @@ async fn test_ssh_collaboration_git_branches(

    assert_eq!(&branches_b, &branches_set);

-    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.change_branch(new_branch.to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

@@ -329,18 +325,18 @@ async fn test_ssh_collaboration_git_branches(

    // Also try creating a new branch
    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.create_branch("totally-new-branch".to_string())
-        })
+        repo_b
+            .read(cx)
+            .create_branch("totally-new-branch".to_string())
    })
    .await
    .unwrap()
    .unwrap();

    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.change_branch("totally-new-branch".to_string())
-        })
+        repo_b
+            .read(cx)
+            .change_branch("totally-new-branch".to_string())
    })
    .await
    .unwrap()
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -315,7 +315,6 @@ impl MessageEditor {
                    icon_path: None,
                    confirm: None,
                    documentation: None,
-                    insert_text_mode: None,
                    source: CompletionSource::Custom,
                }
            })
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -35,7 +35,7 @@ use ui::{
 };
 use util::{ResultExt, TryFutureExt, maybe};
 use workspace::{
-    Deafen, LeaveCall, Mute, OpenChannelNotes, ScreenShare, ShareProject, Workspace,
+    OpenChannelNotes, Workspace,
    dock::{DockPosition, Panel, PanelEvent},
    notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
 };
@@ -80,57 +80,6 @@ pub fn init(cx: &mut App) {
                });
            }
        });
-        // TODO: make it possible to bind this one to a held key for push to talk?
-        // how to make "toggle_on_modifiers_press" contextual?
-        workspace.register_action(|_, _: &Mute, window, cx| {
-            let room = ActiveCall::global(cx).read(cx).room().cloned();
-            if let Some(room) = room {
-                window.defer(cx, move |_window, cx| {
-                    room.update(cx, |room, cx| room.toggle_mute(cx))
-                });
-            }
-        });
-        workspace.register_action(|_, _: &Deafen, window, cx| {
-            let room = ActiveCall::global(cx).read(cx).room().cloned();
-            if let Some(room) = room {
-                window.defer(cx, move |_window, cx| {
-                    room.update(cx, |room, cx| room.toggle_deafen(cx))
-                });
-            }
-        });
-        workspace.register_action(|_, _: &LeaveCall, window, cx| {
-            CollabPanel::leave_call(window, cx);
-        });
-        workspace.register_action(|workspace, _: &ShareProject, window, cx| {
-            let project = workspace.project().clone();
-            println!("{project:?}");
-            window.defer(cx, move |_window, cx| {
-                ActiveCall::global(cx).update(cx, move |call, cx| {
-                    if let Some(room) = call.room() {
-                        println!("{room:?}");
-                        if room.read(cx).is_sharing_project() {
-                            call.unshare_project(project, cx).ok();
-                        } else {
-                            call.share_project(project, cx).detach_and_log_err(cx);
-                        }
-                    }
-                });
-            });
-        });
-        workspace.register_action(|_, _: &ScreenShare, window, cx| {
-            let room = ActiveCall::global(cx).read(cx).room().cloned();
-            if let Some(room) = room {
-                window.defer(cx, move |_window, cx| {
-                    room.update(cx, |room, cx| {
-                        if room.is_screen_sharing() {
-                            room.unshare_screen(cx).ok();
-                        } else {
-                            room.share_screen(cx).detach_and_log_err(cx);
-                        };
-                    });
-                });
-            }
-        });
    })
    .detach();
 }
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -273,7 +273,7 @@ mod tests {
    use language::{
        Point,
        language_settings::{
-            AllLanguageSettings, AllLanguageSettingsContent, CompletionSettings, LspInsertMode,
+            AllLanguageSettings, AllLanguageSettingsContent, CompletionSettings,
            WordsCompletionMode,
        },
    };
@@ -294,7 +294,6 @@ mod tests {
                words: WordsCompletionMode::Disabled,
                lsp: true,
                lsp_fetch_timeout_ms: 0,
-                lsp_insert_mode: LspInsertMode::Insert,
            });
        });

@@ -526,7 +525,6 @@ mod tests {
                words: WordsCompletionMode::Disabled,
                lsp: true,
                lsp_fetch_timeout_ms: 0,
-                lsp_insert_mode: LspInsertMode::Insert,
            });
        });

--- a/crates/dap_adapters/src/gdb.rs
+++ b/crates/dap_adapters/src/gdb.rs
@@ -3,7 +3,7 @@ use std::ffi::OsStr;
 use anyhow::{Result, bail};
 use async_trait::async_trait;
 use gpui::AsyncApp;
-use task::{DebugAdapterConfig, DebugRequestType, DebugTaskDefinition};
+use task::{DebugAdapterConfig, DebugTaskDefinition};

 use crate::*;

@@ -74,37 +74,13 @@ impl DebugAdapter for GdbDebugAdapter {
    }

    fn request_args(&self, config: &DebugTaskDefinition) -> Value {
-        let mut args = json!({
-            "request": match config.request {
-                DebugRequestType::Launch(_) => "launch",
-                DebugRequestType::Attach(_) => "attach",
-            },
-        });
-
-        let map = args.as_object_mut().unwrap();
        match &config.request {
-            DebugRequestType::Attach(attach) => {
-                map.insert("pid".into(), attach.process_id.into());
+            dap::DebugRequestType::Attach(attach_config) => {
+                json!({"pid": attach_config.process_id})
            }
-
-            DebugRequestType::Launch(launch) => {
-                map.insert("program".into(), launch.program.clone().into());
-
-                if !launch.args.is_empty() {
-                    map.insert("args".into(), launch.args.clone().into());
-                }
-
-                if let Some(stop_on_entry) = config.stop_on_entry {
-                    map.insert(
-                        "stopAtBeginningOfMainSubprogram".into(),
-                        stop_on_entry.into(),
-                    );
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
+            dap::DebugRequestType::Launch(launch_config) => {
+                json!({"program": launch_config.program, "cwd": launch_config.cwd})
            }
        }
-        args
    }
 }
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -83,25 +83,16 @@ impl DebugAdapter for GoDebugAdapter {
    }

    fn request_args(&self, config: &DebugTaskDefinition) -> Value {
-        let mut args = match &config.request {
+        match &config.request {
            dap::DebugRequestType::Attach(attach_config) => {
                json!({
-                    "processId": attach_config.process_id,
+                    "processId": attach_config.process_id
                })
            }
            dap::DebugRequestType::Launch(launch_config) => json!({
                "program": launch_config.program,
                "cwd": launch_config.cwd,
-                "args": launch_config.args
            }),
-        };
-
-        let map = args.as_object_mut().unwrap();
-
-        if let Some(stop_on_entry) = config.stop_on_entry {
-            map.insert("stopOnEntry".into(), stop_on_entry.into());
        }
-
-        args
    }
 }
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -134,17 +134,14 @@ impl DebugAdapter for JsDebugAdapter {
            }
            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());
-
-                if !launch.args.is_empty() {
-                    map.insert("args".into(), launch.args.clone().into());
-                }
-
-                if let Some(stop_on_entry) = config.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
+                map.insert(
+                    "cwd".into(),
+                    launch
+                        .cwd
+                        .as_ref()
+                        .map(|s| s.to_string_lossy().into_owned())
+                        .into(),
+                );
            }
        }
        args
--- a/crates/dap_adapters/src/lldb.rs
+++ b/crates/dap_adapters/src/lldb.rs
@@ -81,17 +81,14 @@ impl DebugAdapter for LldbDebugAdapter {
            }
            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());
-
-                if !launch.args.is_empty() {
-                    map.insert("args".into(), launch.args.clone().into());
-                }
-
-                if let Some(stop_on_entry) = config.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
+                map.insert(
+                    "cwd".into(),
+                    launch
+                        .cwd
+                        .as_ref()
+                        .map(|s| s.to_string_lossy().into_owned())
+                        .into(),
+                );
            }
        }
        args
--- a/crates/dap_adapters/src/php.rs
+++ b/crates/dap_adapters/src/php.rs
@@ -118,8 +118,6 @@ impl DebugAdapter for PhpDebugAdapter {
                json!({
                    "program": launch_config.program,
                    "cwd": launch_config.cwd,
-                    "args": launch_config.args,
-                    "stopOnEntry": config.stop_on_entry.unwrap_or_default(),
                })
            }
        }
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -126,31 +126,22 @@ impl DebugAdapter for PythonDebugAdapter {
    }

    fn request_args(&self, config: &DebugTaskDefinition) -> Value {
-        let mut args = json!({
-            "request": match config.request {
-                DebugRequestType::Launch(_) => "launch",
-                DebugRequestType::Attach(_) => "attach",
-            },
-            "subProcess": true,
-            "redirectOutput": true,
-        });
-        let map = args.as_object_mut().unwrap();
        match &config.request {
-            DebugRequestType::Attach(attach) => {
-                map.insert("processId".into(), attach.process_id.into());
+            DebugRequestType::Launch(launch_config) => {
+                json!({
+                    "program": launch_config.program,
+                    "subProcess": true,
+                    "cwd": launch_config.cwd,
+                    "redirectOutput": true,
+                })
            }
-            DebugRequestType::Launch(launch) => {
-                map.insert("program".into(), launch.program.clone().into());
-                map.insert("args".into(), launch.args.clone().into());
-
-                if let Some(stop_on_entry) = config.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
+            dap::DebugRequestType::Attach(attach_config) => {
+                json!({
+                    "subProcess": true,
+                    "redirectOutput": true,
+                    "processId": attach_config.process_id
+                })
            }
        }
-        args
    }
 }
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -54,7 +54,6 @@ impl AttachModal {
    pub fn new(
        project: Entity<project::Project>,
        debug_config: task::DebugTaskDefinition,
-        modal: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -75,14 +74,13 @@ impl AttachModal {
            })
            .collect();
        processes.sort_by_key(|k| k.name.clone());
-        Self::with_processes(project, debug_config, processes, modal, window, cx)
+        Self::with_processes(project, debug_config, processes, window, cx)
    }

    pub(super) fn with_processes(
        project: Entity<project::Project>,
        debug_config: task::DebugTaskDefinition,
        processes: Vec<Candidate>,
-        modal: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -105,7 +103,6 @@ impl AttachModal {
                window,
                cx,
            )
-            .modal(modal)
        });
        Self {
            _subscription: cx.subscribe(&picker, |_, _, _, cx| {
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -1,8 +1,4 @@
-use crate::{
-    ClearAllBreakpoints, Continue, CreateDebuggingSession, Disconnect, Pause, Restart, StepBack,
-    StepInto, StepOut, StepOver, Stop, ToggleIgnoreBreakpoints,
-};
-use crate::{new_session_modal::NewSessionModal, session::DebugSession};
+use crate::session::DebugSession;
 use anyhow::{Result, anyhow};
 use collections::HashMap;
 use command_palette_hooks::CommandPaletteFilter;
@@ -12,15 +8,12 @@ use dap::{
 };
 use futures::{SinkExt as _, channel::mpsc};
 use gpui::{
-    Action, App, AsyncWindowContext, Context, Entity, EntityId, EventEmitter, FocusHandle,
-    Focusable, Subscription, Task, WeakEntity, actions,
+    Action, App, AsyncWindowContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
+    Subscription, Task, WeakEntity, actions,
 };
 use project::{
    Project,
-    debugger::{
-        dap_store::{self, DapStore},
-        session::ThreadStatus,
-    },
+    debugger::dap_store::{self, DapStore},
    terminals::TerminalKind,
 };
 use rpc::proto::{self};
@@ -28,10 +21,13 @@ use settings::Settings;
 use std::{any::TypeId, path::PathBuf};
 use task::DebugTaskDefinition;
 use terminal_view::terminal_panel::TerminalPanel;
-use ui::{ContextMenu, Divider, DropdownMenu, Tooltip, prelude::*};
+use ui::prelude::*;
+use util::ResultExt;
 use workspace::{
-    Workspace,
+    ClearAllBreakpoints, Continue, Disconnect, Pane, Pause, Restart, StepBack, StepInto, StepOut,
+    StepOver, Stop, ToggleIgnoreBreakpoints, Workspace,
    dock::{DockPosition, Panel, PanelEvent},
+    pane,
 };

 pub enum DebugPanelEvent {
@@ -54,14 +50,11 @@ pub enum DebugPanelEvent {
 actions!(debug_panel, [ToggleFocus]);
 pub struct DebugPanel {
    size: Pixels,
-    sessions: Vec<Entity<DebugSession>>,
-    active_session: Option<Entity<DebugSession>>,
-    /// This represents the last debug definition that was created in the new session modal
-    pub(crate) past_debug_definition: Option<DebugTaskDefinition>,
+    pane: Entity<Pane>,
    project: WeakEntity<Project>,
    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
+    pub(crate) last_inert_config: Option<DebugTaskDefinition>,
 }

 impl DebugPanel {
@@ -73,17 +66,100 @@ impl DebugPanel {
        cx.new(|cx| {
            let project = workspace.project().clone();
            let dap_store = project.read(cx).dap_store();
+            let weak_workspace = workspace.weak_handle();
+            let debug_panel = cx.weak_entity();
+            let pane = cx.new(|cx| {
+                let mut pane = Pane::new(
+                    workspace.weak_handle(),
+                    project.clone(),
+                    Default::default(),
+                    None,
+                    gpui::NoAction.boxed_clone(),
+                    window,
+                    cx,
+                );
+                pane.set_can_split(None);
+                pane.set_can_navigate(true, cx);
+                pane.display_nav_history_buttons(None);
+                pane.set_should_display_tab_bar(|_window, _cx| true);
+                pane.set_close_pane_if_empty(true, cx);
+                pane.set_render_tab_bar_buttons(cx, {
+                    let project = project.clone();
+                    let weak_workspace = weak_workspace.clone();
+                    let debug_panel = debug_panel.clone();
+                    move |_, _, cx| {
+                        let project = project.clone();
+                        let weak_workspace = weak_workspace.clone();
+                        (
+                            None,
+                            Some(
+                                h_flex()
+                                    .child(
+                                        IconButton::new("new-debug-session", IconName::Plus)
+                                            .icon_size(IconSize::Small)
+                                            .on_click({
+                                                let debug_panel = debug_panel.clone();

-            let _subscriptions =
-                vec![cx.subscribe_in(&dap_store, window, Self::handle_dap_store_event)];
+                                                cx.listener(move |pane, _, window, cx| {
+                                                    let config = debug_panel
+                                                        .read_with(cx, |this: &DebugPanel, _| {
+                                                            this.last_inert_config.clone()
+                                                        })
+                                                        .log_err()
+                                                        .flatten();
+
+                                                    pane.add_item(
+                                                        Box::new(DebugSession::inert(
+                                                            project.clone(),
+                                                            weak_workspace.clone(),
+                                                            debug_panel.clone(),
+                                                            config,
+                                                            window,
+                                                            cx,
+                                                        )),
+                                                        false,
+                                                        false,
+                                                        None,
+                                                        window,
+                                                        cx,
+                                                    );
+                                                })
+                                            }),
+                                    )
+                                    .into_any_element(),
+                            ),
+                        )
+                    }
+                });
+                pane.add_item(
+                    Box::new(DebugSession::inert(
+                        project.clone(),
+                        weak_workspace.clone(),
+                        debug_panel.clone(),
+                        None,
+                        window,
+                        cx,
+                    )),
+                    false,
+                    false,
+                    None,
+                    window,
+                    cx,
+                );
+                pane
+            });
+
+            let _subscriptions = vec![
+                cx.observe(&pane, |_, _, cx| cx.notify()),
+                cx.subscribe_in(&pane, window, Self::handle_pane_event),
+                cx.subscribe_in(&dap_store, window, Self::handle_dap_store_event),
+            ];

            let debug_panel = Self {
+                pane,
                size: px(300.),
-                sessions: vec![],
-                active_session: None,
                _subscriptions,
-                past_debug_definition: None,
-                focus_handle: cx.focus_handle(),
+                last_inert_config: None,
                project: project.downgrade(),
                workspace: workspace.weak_handle(),
            };
@@ -112,7 +188,7 @@ impl DebugPanel {
                cx.observe(&debug_panel, |_, debug_panel, cx| {
                    let (has_active_session, supports_restart, support_step_back) = debug_panel
                        .update(cx, |this, cx| {
-                            this.active_session()
+                            this.active_session(cx)
                                .map(|item| {
                                    let running = item.read(cx).mode().as_running().cloned();

@@ -174,8 +250,11 @@ impl DebugPanel {
        })
    }

-    pub fn active_session(&self) -> Option<Entity<DebugSession>> {
-        self.active_session.clone()
+    pub fn active_session(&self, cx: &App) -> Option<Entity<DebugSession>> {
+        self.pane
+            .read(cx)
+            .active_item()
+            .and_then(|panel| panel.downcast::<DebugSession>())
    }

    pub fn debug_panel_items_by_client(
@@ -183,9 +262,11 @@ impl DebugPanel {
        client_id: &SessionId,
        cx: &Context<Self>,
    ) -> Vec<Entity<DebugSession>> {
-        self.sessions
-            .iter()
-            .filter(|item| item.read(cx).session_id(cx) == *client_id)
+        self.pane
+            .read(cx)
+            .items()
+            .filter_map(|item| item.downcast::<DebugSession>())
+            .filter(|item| item.read(cx).session_id(cx) == Some(*client_id))
            .map(|item| item.clone())
            .collect()
    }
@@ -195,14 +276,15 @@ impl DebugPanel {
        client_id: SessionId,
        cx: &mut Context<Self>,
    ) -> Option<Entity<DebugSession>> {
-        self.sessions
-            .iter()
+        self.pane
+            .read(cx)
+            .items()
+            .filter_map(|item| item.downcast::<DebugSession>())
            .find(|item| {
                let item = item.read(cx);

-                item.session_id(cx) == client_id
+                item.session_id(cx) == Some(client_id)
            })
-            .cloned()
    }

    fn handle_dap_store_event(
@@ -213,7 +295,7 @@ impl DebugPanel {
        cx: &mut Context<Self>,
    ) {
        match event {
-            dap_store::DapStoreEvent::DebugSessionInitialized(session_id) => {
+            dap_store::DapStoreEvent::DebugClientStarted(session_id) => {
                let Some(session) = dap_store.read(cx).session_by_id(session_id) else {
                    return log::error!(
                        "Couldn't get session with id: {session_id:?} from DebugClientStarted event"
@@ -224,11 +306,10 @@ impl DebugPanel {
                    return log::error!("Debug Panel out lived it's weak reference to Project");
                };

-                if self
-                    .sessions
-                    .iter()
-                    .any(|item| item.read(cx).session_id(cx) == *session_id)
-                {
+                if self.pane.read_with(cx, |pane, cx| {
+                    pane.items_of_type::<DebugSession>()
+                        .any(|item| item.read(cx).session_id(cx) == Some(*session_id))
+                }) {
                    // We already have an item for this session.
                    return;
                }
@@ -241,8 +322,11 @@ impl DebugPanel {
                    cx,
                );

-                self.sessions.push(session_item.clone());
-                self.activate_session(session_item, window, cx);
+                self.pane.update(cx, |pane, cx| {
+                    pane.add_item(Box::new(session_item), true, true, None, window, cx);
+                    window.focus(&pane.focus_handle(cx));
+                    cx.notify();
+                });
            }
            dap_store::DapStoreEvent::RunInTerminal {
                title,
@@ -336,346 +420,55 @@ impl DebugPanel {
        })
    }

-    fn close_session(&mut self, entity_id: EntityId, cx: &mut Context<Self>) {
-        let Some(session) = self
-            .sessions
-            .iter()
-            .find(|other| entity_id == other.entity_id())
-        else {
-            return;
-        };
-
-        session.update(cx, |session, cx| session.shutdown(cx));
-
-        self.sessions.retain(|other| entity_id != other.entity_id());
-
-        if let Some(active_session_id) = self
-            .active_session
-            .as_ref()
-            .map(|session| session.entity_id())
-        {
-            if active_session_id == entity_id {
-                self.active_session = self.sessions.first().cloned();
-            }
-        }
-    }
-
-    fn sessions_drop_down_menu(
-        &self,
-        active_session: &Entity<DebugSession>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> DropdownMenu {
-        let sessions = self.sessions.clone();
-        let weak = cx.weak_entity();
-        let label = active_session.read(cx).label_element(cx);
-
-        DropdownMenu::new_with_element(
-            "debugger-session-list",
-            label,
-            ContextMenu::build(window, cx, move |mut this, _, _| {
-                for session in sessions.into_iter() {
-                    let weak_session = session.downgrade();
-                    let weak_id = weak_session.entity_id();
-
-                    this = this.custom_entry(
-                        {
-                            let weak = weak.clone();
-                            move |_, cx| {
-                                weak_session
-                                    .read_with(cx, |session, cx| {
-                                        h_flex()
-                                            .w_full()
-                                            .justify_between()
-                                            .child(session.label_element(cx))
-                                            .child(
-                                                IconButton::new(
-                                                    "close-debug-session",
-                                                    IconName::Close,
-                                                )
-                                                .icon_size(IconSize::Small)
-                                                .on_click({
-                                                    let weak = weak.clone();
-                                                    move |_, _, cx| {
-                                                        weak.update(cx, |panel, cx| {
-                                                            panel.close_session(weak_id, cx);
-                                                        })
-                                                        .ok();
-                                                    }
-                                                }),
-                                            )
-                                            .into_any_element()
-                                    })
-                                    .unwrap_or_else(|_| div().into_any_element())
-                            }
-                        },
-                        {
-                            let weak = weak.clone();
-                            move |window, cx| {
-                                weak.update(cx, |panel, cx| {
-                                    panel.activate_session(session.clone(), window, cx);
-                                })
-                                .ok();
-                            }
-                        },
-                    );
-                }
-                this
-            }),
-        )
-    }
-
-    fn top_controls_strip(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
-        let active_session = self.active_session.clone();
-
-        Some(
-            h_flex()
-                .border_b_1()
-                .border_color(cx.theme().colors().border)
-                .p_1()
-                .justify_between()
-                .w_full()
-                .child(
-                    h_flex().gap_2().w_full().when_some(
-                        active_session
-                            .as_ref()
-                            .and_then(|session| session.read(cx).mode().as_running()),
-                        |this, running_session| {
-                            let thread_status = running_session
-                                .read(cx)
-                                .thread_status(cx)
-                                .unwrap_or(project::debugger::session::ThreadStatus::Exited);
-                            let capabilities = running_session.read(cx).capabilities(cx);
-                            this.map(|this| {
-                                if thread_status == ThreadStatus::Running {
-                                    this.child(
-                                        IconButton::new("debug-pause", IconName::DebugPause)
-                                            .icon_size(IconSize::XSmall)
-                                            .shape(ui::IconButtonShape::Square)
-                                            .on_click(window.listener_for(
-                                                &running_session,
-                                                |this, _, _window, cx| {
-                                                    this.pause_thread(cx);
-                                                },
-                                            ))
-                                            .tooltip(move |window, cx| {
-                                                Tooltip::text("Pause program")(window, cx)
-                                            }),
-                                    )
-                                } else {
-                                    this.child(
-                                        IconButton::new("debug-continue", IconName::DebugContinue)
-                                            .icon_size(IconSize::XSmall)
-                                            .shape(ui::IconButtonShape::Square)
-                                            .on_click(window.listener_for(
-                                                &running_session,
-                                                |this, _, _window, cx| this.continue_thread(cx),
-                                            ))
-                                            .disabled(thread_status != ThreadStatus::Stopped)
-                                            .tooltip(move |window, cx| {
-                                                Tooltip::text("Continue program")(window, cx)
-                                            }),
-                                    )
-                                }
-                            })
-                            .child(
-                                IconButton::new("debug-step-over", IconName::ArrowRight)
-                                    .icon_size(IconSize::XSmall)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.step_over(cx);
-                                        },
-                                    ))
-                                    .disabled(thread_status != ThreadStatus::Stopped)
-                                    .tooltip(move |window, cx| {
-                                        Tooltip::text("Step over")(window, cx)
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("debug-step-out", IconName::ArrowUpRight)
-                                    .icon_size(IconSize::XSmall)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.step_out(cx);
-                                        },
-                                    ))
-                                    .disabled(thread_status != ThreadStatus::Stopped)
-                                    .tooltip(move |window, cx| {
-                                        Tooltip::text("Step out")(window, cx)
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("debug-step-into", IconName::ArrowDownRight)
-                                    .icon_size(IconSize::XSmall)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.step_in(cx);
-                                        },
-                                    ))
-                                    .disabled(thread_status != ThreadStatus::Stopped)
-                                    .tooltip(move |window, cx| {
-                                        Tooltip::text("Step in")(window, cx)
-                                    }),
-                            )
-                            .child(Divider::vertical())
-                            .child(
-                                IconButton::new(
-                                    "debug-enable-breakpoint",
-                                    IconName::DebugDisabledBreakpoint,
-                                )
-                                .icon_size(IconSize::XSmall)
-                                .shape(ui::IconButtonShape::Square)
-                                .disabled(thread_status != ThreadStatus::Stopped),
-                            )
-                            .child(
-                                IconButton::new("debug-disable-breakpoint", IconName::CircleOff)
-                                    .icon_size(IconSize::XSmall)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .disabled(thread_status != ThreadStatus::Stopped),
-                            )
-                            .child(
-                                IconButton::new("debug-disable-all-breakpoints", IconName::BugOff)
-                                    .icon_size(IconSize::XSmall)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .disabled(
-                                        thread_status == ThreadStatus::Exited
-                                            || thread_status == ThreadStatus::Ended,
-                                    )
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.toggle_ignore_breakpoints(cx);
-                                        },
-                                    ))
-                                    .tooltip(move |window, cx| {
-                                        Tooltip::text("Disable all breakpoints")(window, cx)
-                                    }),
-                            )
-                            .child(Divider::vertical())
-                            .child(
-                                IconButton::new("debug-restart", IconName::DebugRestart)
-                                    .icon_size(IconSize::XSmall)
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.restart_session(cx);
-                                        },
-                                    ))
-                                    .disabled(
-                                        !capabilities.supports_restart_request.unwrap_or_default(),
-                                    )
-                                    .tooltip(move |window, cx| {
-                                        Tooltip::text("Restart")(window, cx)
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("debug-stop", IconName::Power)
-                                    .icon_size(IconSize::XSmall)
-                                    .on_click(window.listener_for(
-                                        &running_session,
-                                        |this, _, _window, cx| {
-                                            this.stop_thread(cx);
-                                        },
-                                    ))
-                                    .disabled(
-                                        thread_status != ThreadStatus::Stopped
-                                            && thread_status != ThreadStatus::Running,
-                                    )
-                                    .tooltip({
-                                        let label = if capabilities
-                                            .supports_terminate_threads_request
-                                            .unwrap_or_default()
-                                        {
-                                            "Terminate Thread"
-                                        } else {
-                                            "Terminate all Threads"
-                                        };
-                                        move |window, cx| Tooltip::text(label)(window, cx)
-                                    }),
-                            )
-                        },
-                    ),
-                )
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .when_some(
-                            active_session
-                                .as_ref()
-                                .and_then(|session| session.read(cx).mode().as_running())
-                                .cloned(),
-                            |this, session| {
-                                this.child(
-                                    session.update(cx, |this, cx| this.thread_dropdown(window, cx)),
-                                )
-                                .child(Divider::vertical())
-                            },
-                        )
-                        .when_some(active_session.as_ref(), |this, session| {
-                            let context_menu = self.sessions_drop_down_menu(session, window, cx);
-                            this.child(context_menu).child(Divider::vertical())
-                        })
-                        .child(
-                            IconButton::new("debug-new-session", IconName::Plus)
-                                .icon_size(IconSize::Small)
-                                .on_click({
-                                    let workspace = self.workspace.clone();
-                                    let weak_panel = cx.weak_entity();
-                                    let past_debug_definition = self.past_debug_definition.clone();
-                                    move |_, window, cx| {
-                                        let weak_panel = weak_panel.clone();
-                                        let past_debug_definition = past_debug_definition.clone();
-
-                                        let _ = workspace.update(cx, |this, cx| {
-                                            let workspace = cx.weak_entity();
-                                            this.toggle_modal(window, cx, |window, cx| {
-                                                NewSessionModal::new(
-                                                    past_debug_definition,
-                                                    weak_panel,
-                                                    workspace,
-                                                    window,
-                                                    cx,
-                                                )
-                                            });
-                                        });
-                                    }
-                                })
-                                .tooltip(|window, cx| {
-                                    Tooltip::for_action(
-                                        "New Debug Session",
-                                        &CreateDebuggingSession,
-                                        window,
-                                        cx,
-                                    )
-                                }),
-                        ),
-                ),
-        )
-    }
-
-    fn activate_session(
+    fn handle_pane_event(
        &mut self,
-        session_item: Entity<DebugSession>,
+        _: &Entity<Pane>,
+        event: &pane::Event,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        debug_assert!(self.sessions.contains(&session_item));
-        session_item.focus_handle(cx).focus(window);
-        session_item.update(cx, |this, cx| {
-            if let Some(running) = this.mode().as_running() {
-                running.update(cx, |this, cx| {
-                    this.go_to_selected_stack_frame(window, cx);
-                });
+        match event {
+            pane::Event::Remove { .. } => cx.emit(PanelEvent::Close),
+            pane::Event::ZoomIn => cx.emit(PanelEvent::ZoomIn),
+            pane::Event::ZoomOut => cx.emit(PanelEvent::ZoomOut),
+            pane::Event::AddItem { item } => {
+                self.workspace
+                    .update(cx, |workspace, cx| {
+                        item.added_to_pane(workspace, self.pane.clone(), window, cx)
+                    })
+                    .ok();
            }
-        });
-        self.active_session = Some(session_item);
-        cx.notify();
+            pane::Event::RemovedItem { item } => {
+                if let Some(debug_session) = item.downcast::<DebugSession>() {
+                    debug_session.update(cx, |session, cx| {
+                        session.shutdown(cx);
+                    })
+                }
+            }
+            pane::Event::ActivateItem {
+                local: _,
+                focus_changed,
+            } => {
+                if *focus_changed {
+                    if let Some(debug_session) = self
+                        .pane
+                        .read(cx)
+                        .active_item()
+                        .and_then(|item| item.downcast::<DebugSession>())
+                    {
+                        if let Some(running) = debug_session
+                            .read_with(cx, |session, _| session.mode().as_running().cloned())
+                        {
+                            running.update(cx, |running, cx| {
+                                running.go_to_selected_stack_frame(window, cx);
+                            });
+                        }
+                    }
+                }
+            }
+
+            _ => {}
+        }
    }
 }

@@ -684,12 +477,16 @@ impl EventEmitter<DebugPanelEvent> for DebugPanel {}
 impl EventEmitter<project::Event> for DebugPanel {}

 impl Focusable for DebugPanel {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.pane.focus_handle(cx)
    }
 }

 impl Panel for DebugPanel {
+    fn pane(&self) -> Option<Entity<Pane>> {
+        Some(self.pane.clone())
+    }
+
    fn persistent_name() -> &'static str {
        "DebugPanel"
    }
@@ -710,7 +507,7 @@ impl Panel for DebugPanel {
    ) {
    }

-    fn size(&self, _window: &Window, _: &App) -> Pixels {
+    fn size(&self, _window: &Window, _cx: &App) -> Pixels {
        self.size
    }

@@ -741,51 +538,42 @@ impl Panel for DebugPanel {
    fn activation_priority(&self) -> u32 {
        9
    }
-    fn set_active(&mut self, _: bool, _: &mut Window, _: &mut Context<Self>) {}
+    fn set_active(&mut self, active: bool, window: &mut Window, cx: &mut Context<Self>) {
+        if active && self.pane.read(cx).items_len() == 0 {
+            let Some(project) = self.project.clone().upgrade() else {
+                return;
+            };
+            let config = self.last_inert_config.clone();
+            let panel = cx.weak_entity();
+            // todo: We need to revisit it when we start adding stopped items to pane (as that'll cause us to add two items).
+            self.pane.update(cx, |this, cx| {
+                this.add_item(
+                    Box::new(DebugSession::inert(
+                        project,
+                        self.workspace.clone(),
+                        panel,
+                        config,
+                        window,
+                        cx,
+                    )),
+                    false,
+                    false,
+                    None,
+                    window,
+                    cx,
+                );
+            });
+        }
+    }
 }

 impl Render for DebugPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_sessions = self.sessions.len() > 0;
-        debug_assert_eq!(has_sessions, self.active_session.is_some());
-
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
-            .size_full()
            .key_context("DebugPanel")
-            .child(h_flex().children(self.top_controls_strip(window, cx)))
            .track_focus(&self.focus_handle(cx))
-            .map(|this| {
-                if has_sessions {
-                    this.children(self.active_session.clone())
-                } else {
-                    this.child(
-                        v_flex()
-                            .h_full()
-                            .gap_1()
-                            .items_center()
-                            .justify_center()
-                            .child(
-                                h_flex().child(
-                                    Label::new("No Debugging Sessions")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                            )
-                            .child(
-                                h_flex().flex_shrink().child(
-                                    Button::new("spawn-new-session-empty-state", "New Session")
-                                        .size(ButtonSize::Large)
-                                        .on_click(|_, window, cx| {
-                                            window.dispatch_action(
-                                                CreateDebuggingSession.boxed_clone(),
-                                                cx,
-                                            );
-                                        }),
-                                ),
-                            ),
-                    )
-                }
-            })
+            .size_full()
+            .child(self.pane.clone())
            .into_any()
    }
 }
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -1,38 +1,20 @@
 use dap::debugger_settings::DebuggerSettings;
 use debugger_panel::{DebugPanel, ToggleFocus};
 use feature_flags::{Debugger, FeatureFlagViewExt};
-use gpui::{App, actions};
-use new_session_modal::NewSessionModal;
+use gpui::App;
 use session::DebugSession;
 use settings::Settings;
-use workspace::{ShutdownDebugAdapters, Workspace};
+use workspace::{
+    Pause, Restart, ShutdownDebugAdapters, StepBack, StepInto, StepOver, Stop,
+    ToggleIgnoreBreakpoints, Workspace,
+};

 pub mod attach_modal;
 pub mod debugger_panel;
-mod new_session_modal;
-pub(crate) mod session;
+pub mod session;

 #[cfg(test)]
-pub mod tests;
-
-actions!(
-    debugger,
-    [
-        Start,
-        Continue,
-        Disconnect,
-        Pause,
-        Restart,
-        StepInto,
-        StepOver,
-        StepOut,
-        StepBack,
-        Stop,
-        ToggleIgnoreBreakpoints,
-        ClearAllBreakpoints,
-        CreateDebuggingSession,
-    ]
-);
+mod tests;

 pub fn init(cx: &mut App) {
    DebuggerSettings::register(cx);
@@ -49,80 +31,80 @@ pub fn init(cx: &mut App) {
                    workspace.toggle_panel_focus::<DebugPanel>(window, cx);
                })
                .register_action(|workspace, _: &Pause, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.pause_thread(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.pause_thread(cx))
                    }
                })
                .register_action(|workspace, _: &Restart, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.restart_session(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.restart_session(cx))
                    }
                })
                .register_action(|workspace, _: &StepInto, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.step_in(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.step_in(cx))
                    }
                })
                .register_action(|workspace, _: &StepOver, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.step_over(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.step_over(cx))
                    }
                })
                .register_action(|workspace, _: &StepBack, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.step_back(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.step_back(cx))
                    }
                })
                .register_action(|workspace, _: &Stop, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.stop_thread(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.stop_thread(cx))
                    }
                })
                .register_action(|workspace, _: &ToggleIgnoreBreakpoints, _, cx| {
-                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                        if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
-                            panel
-                                .active_session()
-                                .and_then(|session| session.read(cx).mode().as_running().cloned())
-                        }) {
-                            active_item.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
-                        }
+                    let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
+
+                    if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
+                        panel
+                            .active_session(cx)
+                            .and_then(|session| session.read(cx).mode().as_running().cloned())
+                    }) {
+                        active_item.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
                    }
                })
                .register_action(
@@ -133,24 +115,6 @@ pub fn init(cx: &mut App) {
                            })
                        })
                    },
-                )
-                .register_action(
-                    |workspace: &mut Workspace, _: &CreateDebuggingSession, window, cx| {
-                        if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
-                            let weak_panel = debug_panel.downgrade();
-                            let weak_workspace = cx.weak_entity();
-
-                            workspace.toggle_modal(window, cx, |window, cx| {
-                                NewSessionModal::new(
-                                    debug_panel.read(cx).past_debug_definition.clone(),
-                                    weak_panel,
-                                    weak_workspace,
-                                    window,
-                                    cx,
-                                )
-                            });
-                        }
-                    },
                );
        })
    })
--- a/crates/debugger_ui/src/new_session_modal.rs
+++ b/crates/debugger_ui/src/new_session_modal.rs
@@ -1,633 +0,0 @@
-use std::{
-    borrow::Cow,
-    ops::Not,
-    path::{Path, PathBuf},
-};
-
-use anyhow::{Result, anyhow};
-use dap::DebugRequestType;
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{
-    App, AppContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, TextStyle,
-    WeakEntity,
-};
-use settings::Settings;
-use task::{DebugTaskDefinition, LaunchConfig};
-use theme::ThemeSettings;
-use ui::{
-    ActiveTheme, Button, ButtonCommon, ButtonSize, CheckboxWithLabel, Clickable, Color, Context,
-    ContextMenu, Disableable, DropdownMenu, FluentBuilder, InteractiveElement, IntoElement, Label,
-    LabelCommon as _, ParentElement, RenderOnce, SharedString, Styled, StyledExt, ToggleButton,
-    ToggleState, Toggleable, Window, div, h_flex, relative, rems, v_flex,
-};
-use util::ResultExt;
-use workspace::{ModalView, Workspace};
-
-use crate::{attach_modal::AttachModal, debugger_panel::DebugPanel};
-
-#[derive(Clone)]
-pub(super) struct NewSessionModal {
-    workspace: WeakEntity<Workspace>,
-    debug_panel: WeakEntity<DebugPanel>,
-    mode: NewSessionMode,
-    stop_on_entry: ToggleState,
-    debugger: Option<SharedString>,
-    last_selected_profile_name: Option<SharedString>,
-}
-
-fn suggested_label(request: &DebugRequestType, debugger: &str) -> String {
-    match request {
-        DebugRequestType::Launch(config) => {
-            let last_path_component = Path::new(&config.program)
-                .file_name()
-                .map(|name| name.to_string_lossy())
-                .unwrap_or_else(|| Cow::Borrowed(&config.program));
-
-            format!("{} ({debugger})", last_path_component)
-        }
-        DebugRequestType::Attach(config) => format!(
-            "pid: {} ({debugger})",
-            config.process_id.unwrap_or(u32::MAX)
-        ),
-    }
-}
-
-impl NewSessionModal {
-    pub(super) fn new(
-        past_debug_definition: Option<DebugTaskDefinition>,
-        debug_panel: WeakEntity<DebugPanel>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let debugger = past_debug_definition
-            .as_ref()
-            .map(|def| def.adapter.clone().into());
-
-        let stop_on_entry = past_debug_definition
-            .as_ref()
-            .and_then(|def| def.stop_on_entry);
-
-        let launch_config = match past_debug_definition.map(|def| def.request) {
-            Some(DebugRequestType::Launch(launch_config)) => Some(launch_config),
-            _ => None,
-        };
-
-        Self {
-            workspace: workspace.clone(),
-            debugger,
-            debug_panel,
-            mode: NewSessionMode::launch(launch_config, window, cx),
-            stop_on_entry: stop_on_entry
-                .map(Into::into)
-                .unwrap_or(ToggleState::Unselected),
-            last_selected_profile_name: None,
-        }
-    }
-
-    fn debug_config(&self, cx: &App) -> Option<DebugTaskDefinition> {
-        let request = self.mode.debug_task(cx);
-
-        Some(DebugTaskDefinition {
-            adapter: self.debugger.clone()?.to_string(),
-            label: suggested_label(&request, self.debugger.as_deref()?),
-            request,
-            initialize_args: None,
-            tcp_connection: None,
-            locator: None,
-            stop_on_entry: match self.stop_on_entry {
-                ToggleState::Selected => Some(true),
-                _ => None,
-            },
-        })
-    }
-    fn start_new_session(&self, cx: &mut Context<Self>) -> Result<()> {
-        let workspace = self.workspace.clone();
-        let config = self
-            .debug_config(cx)
-            .ok_or_else(|| anyhow!("Failed to create a debug config"))?;
-
-        let _ = self.debug_panel.update(cx, |panel, _| {
-            panel.past_debug_definition = Some(config.clone());
-        });
-
-        cx.spawn(async move |this, cx| {
-            let project = workspace.update(cx, |workspace, _| workspace.project().clone())?;
-            let task =
-                project.update(cx, |this, cx| this.start_debug_session(config.into(), cx))?;
-            let spawn_result = task.await;
-            if spawn_result.is_ok() {
-                this.update(cx, |_, cx| {
-                    cx.emit(DismissEvent);
-                })
-                .ok();
-            }
-            spawn_result?;
-            anyhow::Result::<_, anyhow::Error>::Ok(())
-        })
-        .detach_and_log_err(cx);
-        Ok(())
-    }
-
-    fn update_attach_picker(
-        attach: &Entity<AttachMode>,
-        selected_debugger: &str,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        attach.update(cx, |this, cx| {
-            if selected_debugger != this.debug_definition.adapter {
-                this.debug_definition.adapter = selected_debugger.into();
-                if let Some(project) = this
-                    .workspace
-                    .read_with(cx, |workspace, _| workspace.project().clone())
-                    .ok()
-                {
-                    this.attach_picker = Some(cx.new(|cx| {
-                        let modal = AttachModal::new(
-                            project,
-                            this.debug_definition.clone(),
-                            false,
-                            window,
-                            cx,
-                        );
-
-                        window.focus(&modal.focus_handle(cx));
-
-                        modal
-                    }));
-                }
-            }
-
-            cx.notify();
-        })
-    }
-    fn adapter_drop_down_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ui::DropdownMenu {
-        let workspace = self.workspace.clone();
-        let weak = cx.weak_entity();
-        let debugger = self.debugger.clone();
-        DropdownMenu::new(
-            "dap-adapter-picker",
-            debugger
-                .as_ref()
-                .unwrap_or_else(|| &SELECT_DEBUGGER_LABEL)
-                .clone(),
-            ContextMenu::build(window, cx, move |mut menu, _, cx| {
-                let setter_for_name = |name: SharedString| {
-                    let weak = weak.clone();
-                    move |window: &mut Window, cx: &mut App| {
-                        weak.update(cx, |this, cx| {
-                            this.debugger = Some(name.clone());
-                            cx.notify();
-                            if let NewSessionMode::Attach(attach) = &this.mode {
-                                Self::update_attach_picker(&attach, &name, window, cx);
-                            }
-                        })
-                        .ok();
-                    }
-                };
-
-                let available_adapters = workspace
-                    .update(cx, |this, cx| {
-                        this.project()
-                            .read(cx)
-                            .debug_adapters()
-                            .enumerate_adapters()
-                    })
-                    .ok()
-                    .unwrap_or_default();
-
-                for adapter in available_adapters {
-                    menu = menu.entry(adapter.0.clone(), None, setter_for_name(adapter.0.clone()));
-                }
-                menu
-            }),
-        )
-    }
-
-    fn debug_config_drop_down_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ui::DropdownMenu {
-        let workspace = self.workspace.clone();
-        let weak = cx.weak_entity();
-        let last_profile = self.last_selected_profile_name.clone();
-        DropdownMenu::new(
-            "debug-config-menu",
-            last_profile.unwrap_or_else(|| SELECT_SCENARIO_LABEL.clone()),
-            ContextMenu::build(window, cx, move |mut menu, _, cx| {
-                let setter_for_name = |task: DebugTaskDefinition| {
-                    let weak = weak.clone();
-                    let workspace = workspace.clone();
-                    move |window: &mut Window, cx: &mut App| {
-                        weak.update(cx, |this, cx| {
-                            this.last_selected_profile_name = Some(SharedString::from(&task.label));
-                            this.debugger = Some(task.adapter.clone().into());
-
-                            match &task.request {
-                                DebugRequestType::Launch(launch_config) => {
-                                    this.mode = NewSessionMode::launch(
-                                        Some(launch_config.clone()),
-                                        window,
-                                        cx,
-                                    );
-                                }
-                                DebugRequestType::Attach(_) => {
-                                    this.mode = NewSessionMode::attach(
-                                        this.debugger.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    );
-                                    if let Some((debugger, attach)) =
-                                        this.debugger.as_ref().zip(this.mode.as_attach())
-                                    {
-                                        Self::update_attach_picker(&attach, &debugger, window, cx);
-                                    }
-                                }
-                            }
-                            cx.notify();
-                        })
-                        .ok();
-                    }
-                };
-
-                let available_adapters: Vec<DebugTaskDefinition> = workspace
-                    .update(cx, |this, cx| {
-                        this.project()
-                            .read(cx)
-                            .task_store()
-                            .read(cx)
-                            .task_inventory()
-                            .iter()
-                            .flat_map(|task_inventory| task_inventory.read(cx).list_debug_tasks())
-                            .cloned()
-                            .filter_map(|task| task.try_into().ok())
-                            .collect()
-                    })
-                    .ok()
-                    .unwrap_or_default();
-
-                for debug_definition in available_adapters {
-                    menu = menu.entry(
-                        debug_definition.label.clone(),
-                        None,
-                        setter_for_name(debug_definition),
-                    );
-                }
-                menu
-            }),
-        )
-    }
-}
-
-#[derive(Clone)]
-struct LaunchMode {
-    program: Entity<Editor>,
-    cwd: Entity<Editor>,
-}
-
-impl LaunchMode {
-    fn new(
-        past_launch_config: Option<LaunchConfig>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let (past_program, past_cwd) = past_launch_config
-            .map(|config| (Some(config.program), config.cwd))
-            .unwrap_or_else(|| (None, None));
-
-        let program = cx.new(|cx| Editor::single_line(window, cx));
-        program.update(cx, |this, cx| {
-            this.set_placeholder_text("Program path", cx);
-
-            if let Some(past_program) = past_program {
-                this.set_text(past_program, window, cx);
-            };
-        });
-        let cwd = cx.new(|cx| Editor::single_line(window, cx));
-        cwd.update(cx, |this, cx| {
-            this.set_placeholder_text("Working Directory", cx);
-            if let Some(past_cwd) = past_cwd {
-                this.set_text(past_cwd.to_string_lossy(), window, cx);
-            };
-        });
-        cx.new(|_| Self { program, cwd })
-    }
-
-    fn debug_task(&self, cx: &App) -> task::LaunchConfig {
-        let path = self.cwd.read(cx).text(cx);
-        task::LaunchConfig {
-            program: self.program.read(cx).text(cx),
-            cwd: path.is_empty().not().then(|| PathBuf::from(path)),
-            args: Default::default(),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct AttachMode {
-    workspace: WeakEntity<Workspace>,
-    debug_definition: DebugTaskDefinition,
-    attach_picker: Option<Entity<AttachModal>>,
-    focus_handle: FocusHandle,
-}
-
-impl AttachMode {
-    fn new(
-        debugger: Option<SharedString>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let debug_definition = DebugTaskDefinition {
-            label: "Attach New Session Setup".into(),
-            request: dap::DebugRequestType::Attach(task::AttachConfig { process_id: None }),
-            tcp_connection: None,
-            adapter: debugger.clone().unwrap_or_default().into(),
-            locator: None,
-            initialize_args: None,
-            stop_on_entry: Some(false),
-        };
-
-        let attach_picker = if let Some(project) = debugger.and(
-            workspace
-                .read_with(cx, |workspace, _| workspace.project().clone())
-                .ok(),
-        ) {
-            Some(cx.new(|cx| {
-                let modal = AttachModal::new(project, debug_definition.clone(), false, window, cx);
-                window.focus(&modal.focus_handle(cx));
-
-                modal
-            }))
-        } else {
-            None
-        };
-
-        cx.new(|cx| Self {
-            workspace,
-            debug_definition,
-            attach_picker,
-            focus_handle: cx.focus_handle(),
-        })
-    }
-    fn debug_task(&self) -> task::AttachConfig {
-        task::AttachConfig { process_id: None }
-    }
-}
-
-static SELECT_DEBUGGER_LABEL: SharedString = SharedString::new_static("Select Debugger");
-static SELECT_SCENARIO_LABEL: SharedString = SharedString::new_static("Select Profile");
-
-#[derive(Clone)]
-enum NewSessionMode {
-    Launch(Entity<LaunchMode>),
-    Attach(Entity<AttachMode>),
-}
-
-impl NewSessionMode {
-    fn debug_task(&self, cx: &App) -> DebugRequestType {
-        match self {
-            NewSessionMode::Launch(entity) => entity.read(cx).debug_task(cx).into(),
-            NewSessionMode::Attach(entity) => entity.read(cx).debug_task().into(),
-        }
-    }
-    fn as_attach(&self) -> Option<&Entity<AttachMode>> {
-        if let NewSessionMode::Attach(entity) = self {
-            Some(entity)
-        } else {
-            None
-        }
-    }
-}
-
-impl Focusable for NewSessionMode {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self {
-            NewSessionMode::Launch(entity) => entity.read(cx).program.focus_handle(cx),
-            NewSessionMode::Attach(entity) => entity.read(cx).focus_handle.clone(),
-        }
-    }
-}
-
-impl RenderOnce for LaunchMode {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .p_2()
-            .w_full()
-            .gap_3()
-            .track_focus(&self.program.focus_handle(cx))
-            .child(
-                div().child(
-                    Label::new("Program")
-                        .size(ui::LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-            )
-            .child(render_editor(&self.program, window, cx))
-            .child(
-                div().child(
-                    Label::new("Working Directory")
-                        .size(ui::LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-            )
-            .child(render_editor(&self.cwd, window, cx))
-    }
-}
-
-impl RenderOnce for AttachMode {
-    fn render(self, _: &mut Window, _: &mut App) -> impl IntoElement {
-        v_flex().w_full().children(self.attach_picker.clone())
-    }
-}
-
-impl RenderOnce for NewSessionMode {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl ui::IntoElement {
-        match self {
-            NewSessionMode::Launch(entity) => entity.update(cx, |this, cx| {
-                this.clone().render(window, cx).into_any_element()
-            }),
-            NewSessionMode::Attach(entity) => entity.update(cx, |this, cx| {
-                this.clone().render(window, cx).into_any_element()
-            }),
-        }
-    }
-}
-
-impl NewSessionMode {
-    fn attach(
-        debugger: Option<SharedString>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        Self::Attach(AttachMode::new(debugger, workspace, window, cx))
-    }
-    fn launch(past_launch_config: Option<LaunchConfig>, window: &mut Window, cx: &mut App) -> Self {
-        Self::Launch(LaunchMode::new(past_launch_config, window, cx))
-    }
-}
-fn render_editor(editor: &Entity<Editor>, window: &mut Window, cx: &App) -> impl IntoElement {
-    let settings = ThemeSettings::get_global(cx);
-    let theme = cx.theme();
-
-    let text_style = TextStyle {
-        color: cx.theme().colors().text,
-        font_family: settings.buffer_font.family.clone(),
-        font_features: settings.buffer_font.features.clone(),
-        font_size: settings.buffer_font_size(cx).into(),
-        font_weight: settings.buffer_font.weight,
-        line_height: relative(settings.buffer_line_height.value()),
-        background_color: Some(theme.colors().editor_background),
-        ..Default::default()
-    };
-
-    let element = EditorElement::new(
-        editor,
-        EditorStyle {
-            background: theme.colors().editor_background,
-            local_player: theme.players().local(),
-            text: text_style,
-            ..Default::default()
-        },
-    );
-
-    div()
-        .rounded_md()
-        .p_1()
-        .border_1()
-        .border_color(theme.colors().border_variant)
-        .when(
-            editor.focus_handle(cx).contains_focused(window, cx),
-            |this| this.border_color(theme.colors().border_focused),
-        )
-        .child(element)
-        .bg(theme.colors().editor_background)
-}
-
-impl Render for NewSessionModal {
-    fn render(
-        &mut self,
-        window: &mut ui::Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl ui::IntoElement {
-        v_flex()
-            .size_full()
-            .w(rems(34.))
-            .elevation_3(cx)
-            .bg(cx.theme().colors().elevated_surface_background)
-            .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
-                cx.emit(DismissEvent);
-            }))
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_around()
-                    .p_2()
-                    .child(
-                        h_flex()
-                            .justify_start()
-                            .w_full()
-                            .child(
-                                ToggleButton::new(
-                                    "debugger-session-ui-launch-button",
-                                    "New Session",
-                                )
-                                .size(ButtonSize::Default)
-                                .style(ui::ButtonStyle::Subtle)
-                                .toggle_state(matches!(self.mode, NewSessionMode::Launch(_)))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.mode = NewSessionMode::launch(None, window, cx);
-                                    this.mode.focus_handle(cx).focus(window);
-                                    cx.notify();
-                                }))
-                                .first(),
-                            )
-                            .child(
-                                ToggleButton::new(
-                                    "debugger-session-ui-attach-button",
-                                    "Attach to Process",
-                                )
-                                .size(ButtonSize::Default)
-                                .toggle_state(matches!(self.mode, NewSessionMode::Attach(_)))
-                                .style(ui::ButtonStyle::Subtle)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.mode = NewSessionMode::attach(
-                                        this.debugger.clone(),
-                                        this.workspace.clone(),
-                                        window,
-                                        cx,
-                                    );
-                                    if let Some((debugger, attach)) =
-                                        this.debugger.as_ref().zip(this.mode.as_attach())
-                                    {
-                                        Self::update_attach_picker(&attach, &debugger, window, cx);
-                                    }
-                                    this.mode.focus_handle(cx).focus(window);
-                                    cx.notify();
-                                }))
-                                .last(),
-                            ),
-                    )
-                    .justify_between()
-                    .child(self.adapter_drop_down_menu(window, cx))
-                    .border_color(cx.theme().colors().border_variant)
-                    .border_b_1(),
-            )
-            .child(v_flex().child(self.mode.clone().render(window, cx)))
-            .child(
-                h_flex()
-                    .justify_between()
-                    .gap_2()
-                    .p_2()
-                    .border_color(cx.theme().colors().border_variant)
-                    .border_t_1()
-                    .w_full()
-                    .child(self.debug_config_drop_down_menu(window, cx))
-                    .child(
-                        h_flex()
-                            .justify_end()
-                            .when(matches!(self.mode, NewSessionMode::Launch(_)), |this| {
-                                let weak = cx.weak_entity();
-                                this.child(
-                                    CheckboxWithLabel::new(
-                                        "debugger-stop-on-entry",
-                                        Label::new("Stop on Entry").size(ui::LabelSize::Small),
-                                        self.stop_on_entry,
-                                        move |state, _, cx| {
-                                            weak.update(cx, |this, _| {
-                                                this.stop_on_entry = *state;
-                                            })
-                                            .ok();
-                                        },
-                                    )
-                                    .checkbox_position(ui::IconPosition::End),
-                                )
-                            })
-                            .child(
-                                Button::new("debugger-spawn", "Start")
-                                    .on_click(cx.listener(|this, _, _, cx| {
-                                        this.start_new_session(cx).log_err();
-                                    }))
-                                    .disabled(self.debugger.is_none()),
-                            ),
-                    ),
-            )
-    }
-}
-
-impl EventEmitter<DismissEvent> for NewSessionModal {}
-impl Focusable for NewSessionModal {
-    fn focus_handle(&self, cx: &ui::App) -> gpui::FocusHandle {
-        self.mode.focus_handle(cx)
-    }
-}
-
-impl ModalView for NewSessionModal {}
--- a/crates/debugger_ui/src/session.rs
+++ b/crates/debugger_ui/src/session.rs
@@ -1,13 +1,26 @@
+mod failed;
+mod inert;
 pub mod running;
+mod starting;
+
+use std::time::Duration;

 use dap::client::SessionId;
-use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, WeakEntity};
+use failed::FailedState;
+use gpui::{
+    Animation, AnimationExt, AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable,
+    Subscription, Task, Transformation, WeakEntity, percentage,
+};
+use inert::{InertEvent, InertState};
 use project::Project;
 use project::debugger::{dap_store::DapStore, session::Session};
 use project::worktree_store::WorktreeStore;
 use rpc::proto::{self, PeerId};
 use running::RunningState;
+use starting::{StartingEvent, StartingState};
+use task::DebugTaskDefinition;
 use ui::{Indicator, prelude::*};
+use util::ResultExt;
 use workspace::{
    FollowableItem, ViewId, Workspace,
    item::{self, Item},
@@ -16,6 +29,9 @@ use workspace::{
 use crate::debugger_panel::DebugPanel;

 pub(crate) enum DebugSessionState {
+    Inert(Entity<InertState>),
+    Starting(Entity<StartingState>),
+    Failed(Entity<FailedState>),
    Running(Entity<running::RunningState>),
 }

@@ -23,6 +39,7 @@ impl DebugSessionState {
    pub(crate) fn as_running(&self) -> Option<&Entity<running::RunningState>> {
        match &self {
            DebugSessionState::Running(entity) => Some(entity),
+            _ => None,
        }
    }
 }
@@ -31,9 +48,9 @@ pub struct DebugSession {
    remote_id: Option<workspace::ViewId>,
    mode: DebugSessionState,
    dap_store: WeakEntity<DapStore>,
-    _debug_panel: WeakEntity<DebugPanel>,
-    _worktree_store: WeakEntity<WorktreeStore>,
-    _workspace: WeakEntity<Workspace>,
+    debug_panel: WeakEntity<DebugPanel>,
+    worktree_store: WeakEntity<WorktreeStore>,
+    workspace: WeakEntity<Workspace>,
    _subscriptions: [Subscription; 1],
 }

@@ -43,24 +60,59 @@ pub enum DebugPanelItemEvent {
    Stopped { go_to_stack_frame: bool },
 }

+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum ThreadItem {
+    Console,
+    LoadedSource,
+    Modules,
+    Variables,
+}
+
 impl DebugSession {
+    pub(super) fn inert(
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        debug_panel: WeakEntity<DebugPanel>,
+        config: Option<DebugTaskDefinition>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Entity<Self> {
+        let default_cwd = project
+            .read(cx)
+            .worktrees(cx)
+            .next()
+            .and_then(|tree| tree.read(cx).abs_path().to_str().map(|str| str.to_string()))
+            .unwrap_or_default();
+
+        let inert =
+            cx.new(|cx| InertState::new(workspace.clone(), &default_cwd, config, window, cx));
+
+        let project = project.read(cx);
+        let dap_store = project.dap_store().downgrade();
+        let worktree_store = project.worktree_store().downgrade();
+        cx.new(|cx| {
+            let _subscriptions = [cx.subscribe_in(&inert, window, Self::on_inert_event)];
+            Self {
+                remote_id: None,
+                mode: DebugSessionState::Inert(inert),
+                dap_store,
+                worktree_store,
+                debug_panel,
+                workspace,
+                _subscriptions,
+            }
+        })
+    }
+
    pub(crate) fn running(
        project: Entity<Project>,
        workspace: WeakEntity<Workspace>,
        session: Entity<Session>,
-        _debug_panel: WeakEntity<DebugPanel>,
+        debug_panel: WeakEntity<DebugPanel>,
        window: &mut Window,
        cx: &mut App,
    ) -> Entity<Self> {
-        let mode = cx.new(|cx| {
-            RunningState::new(
-                session.clone(),
-                project.clone(),
-                workspace.clone(),
-                window,
-                cx,
-            )
-        });
+        let mode = cx.new(|cx| RunningState::new(session.clone(), workspace.clone(), window, cx));

        cx.new(|cx| Self {
            _subscriptions: [cx.subscribe(&mode, |_, _, _, cx| {
@@ -69,20 +121,26 @@ impl DebugSession {
            remote_id: None,
            mode: DebugSessionState::Running(mode),
            dap_store: project.read(cx).dap_store().downgrade(),
-            _debug_panel,
-            _worktree_store: project.read(cx).worktree_store().downgrade(),
-            _workspace: workspace,
+            debug_panel,
+            worktree_store: project.read(cx).worktree_store().downgrade(),
+            workspace,
        })
    }

-    pub(crate) fn session_id(&self, cx: &App) -> SessionId {
+    pub(crate) fn session_id(&self, cx: &App) -> Option<SessionId> {
        match &self.mode {
-            DebugSessionState::Running(entity) => entity.read(cx).session_id(),
+            DebugSessionState::Inert(_) => None,
+            DebugSessionState::Starting(entity) => Some(entity.read(cx).session_id),
+            DebugSessionState::Failed(_) => None,
+            DebugSessionState::Running(entity) => Some(entity.read(cx).session_id()),
        }
    }

    pub(crate) fn shutdown(&mut self, cx: &mut Context<Self>) {
        match &self.mode {
+            DebugSessionState::Inert(_) => {}
+            DebugSessionState::Starting(_entity) => {} // todo(debugger): we need to shutdown the starting process in this case (or recreate it on a breakpoint being hit)
+            DebugSessionState::Failed(_) => {}
            DebugSessionState::Running(state) => state.update(cx, |state, cx| state.shutdown(cx)),
        }
    }
@@ -91,56 +149,63 @@ impl DebugSession {
        &self.mode
    }

-    pub(crate) fn label(&self, cx: &App) -> String {
-        let session_id = match &self.mode {
-            DebugSessionState::Running(running_state) => running_state.read(cx).session_id(),
+    fn on_inert_event(
+        &mut self,
+        _: &Entity<InertState>,
+        event: &InertEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let dap_store = self.dap_store.clone();
+        let InertEvent::Spawned { config } = event;
+        let config = config.clone();
+
+        self.debug_panel
+            .update(cx, |this, _| this.last_inert_config = Some(config.clone()))
+            .log_err();
+
+        let worktree = self
+            .worktree_store
+            .update(cx, |this, _| this.worktrees().next())
+            .ok()
+            .flatten()
+            .expect("worktree-less project");
+        let Ok((new_session_id, task)) = dap_store.update(cx, |store, cx| {
+            store.new_session(config.into(), &worktree, None, cx)
+        }) else {
+            return;
        };
-        let Ok(Some(session)) = self
-            .dap_store
-            .read_with(cx, |store, _| store.session_by_id(session_id))
-        else {
-            return "".to_owned();
-        };
-        session
-            .read(cx)
-            .as_local()
-            .expect("Remote Debug Sessions are not implemented yet")
-            .label()
+        let starting = cx.new(|cx| StartingState::new(new_session_id, task, cx));
+
+        self._subscriptions = [cx.subscribe_in(&starting, window, Self::on_starting_event)];
+        self.mode = DebugSessionState::Starting(starting);
    }

-    pub(crate) fn label_element(&self, cx: &App) -> AnyElement {
-        let label = self.label(cx);
-
-        let (icon, color) = match &self.mode {
-            DebugSessionState::Running(state) => {
-                if state.read(cx).session().read(cx).is_terminated() {
-                    (Some(Indicator::dot().color(Color::Error)), Color::Error)
-                } else {
-                    match state.read(cx).thread_status(cx).unwrap_or_default() {
-                        project::debugger::session::ThreadStatus::Stopped => (
-                            Some(Indicator::dot().color(Color::Conflict)),
-                            Color::Conflict,
-                        ),
-                        _ => (Some(Indicator::dot().color(Color::Success)), Color::Success),
-                    }
-                }
-            }
+    fn on_starting_event(
+        &mut self,
+        _: &Entity<StartingState>,
+        event: &StartingEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if let StartingEvent::Finished(session) = event {
+            let mode =
+                cx.new(|cx| RunningState::new(session.clone(), self.workspace.clone(), window, cx));
+            self.mode = DebugSessionState::Running(mode);
+        } else if let StartingEvent::Failed = event {
+            self.mode = DebugSessionState::Failed(cx.new(FailedState::new));
        };
-
-        h_flex()
-            .gap_2()
-            .when_some(icon, |this, indicator| this.child(indicator))
-            .justify_between()
-            .child(Label::new(label).color(color))
-            .into_any_element()
+        cx.notify();
    }
 }
-
 impl EventEmitter<DebugPanelItemEvent> for DebugSession {}

 impl Focusable for DebugSession {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        match &self.mode {
+            DebugSessionState::Inert(inert_state) => inert_state.focus_handle(cx),
+            DebugSessionState::Starting(starting_state) => starting_state.focus_handle(cx),
+            DebugSessionState::Failed(failed_state) => failed_state.focus_handle(cx),
            DebugSessionState::Running(running_state) => running_state.focus_handle(cx),
        }
    }
@@ -148,6 +213,61 @@ impl Focusable for DebugSession {

 impl Item for DebugSession {
    type Event = DebugPanelItemEvent;
+    fn tab_content(&self, _: item::TabContentParams, _: &Window, cx: &App) -> AnyElement {
+        let (icon, label, color) = match &self.mode {
+            DebugSessionState::Inert(_) => (None, "New Session", Color::Default),
+            DebugSessionState::Starting(_) => (None, "Starting", Color::Default),
+            DebugSessionState::Failed(_) => (
+                Some(Indicator::dot().color(Color::Error)),
+                "Failed",
+                Color::Error,
+            ),
+            DebugSessionState::Running(state) => {
+                if state.read(cx).session().read(cx).is_terminated() {
+                    (
+                        Some(Indicator::dot().color(Color::Error)),
+                        "Terminated",
+                        Color::Error,
+                    )
+                } else {
+                    match state.read(cx).thread_status(cx).unwrap_or_default() {
+                        project::debugger::session::ThreadStatus::Stopped => (
+                            Some(Indicator::dot().color(Color::Conflict)),
+                            state
+                                .read_with(cx, |state, cx| state.thread_status(cx))
+                                .map(|status| status.label())
+                                .unwrap_or("Stopped"),
+                            Color::Conflict,
+                        ),
+                        _ => (
+                            Some(Indicator::dot().color(Color::Success)),
+                            state
+                                .read_with(cx, |state, cx| state.thread_status(cx))
+                                .map(|status| status.label())
+                                .unwrap_or("Running"),
+                            Color::Success,
+                        ),
+                    }
+                }
+            }
+        };
+
+        let is_starting = matches!(self.mode, DebugSessionState::Starting(_));
+
+        h_flex()
+            .gap_2()
+            .children(is_starting.then(|| {
+                Icon::new(IconName::ArrowCircle).with_animation(
+                    "starting-debug-session",
+                    Animation::new(Duration::from_secs(2)).repeat(),
+                    |this, delta| this.transform(Transformation::rotate(percentage(delta))),
+                )
+            }))
+            .when_some(icon, |this, indicator| this.child(indicator))
+            .justify_between()
+            .child(Label::new(label).color(color))
+            .into_any_element()
+    }
 }

 impl FollowableItem for DebugSession {
@@ -219,6 +339,15 @@ impl FollowableItem for DebugSession {
 impl Render for DebugSession {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        match &self.mode {
+            DebugSessionState::Inert(inert_state) => {
+                inert_state.update(cx, |this, cx| this.render(window, cx).into_any_element())
+            }
+            DebugSessionState::Starting(starting_state) => {
+                starting_state.update(cx, |this, cx| this.render(window, cx).into_any_element())
+            }
+            DebugSessionState::Failed(failed_state) => {
+                failed_state.update(cx, |this, cx| this.render(window, cx).into_any_element())
+            }
            DebugSessionState::Running(running_state) => {
                running_state.update(cx, |this, cx| this.render(window, cx).into_any_element())
            }
--- a/crates/debugger_ui/src/session/failed.rs
+++ b/crates/debugger_ui/src/session/failed.rs
@@ -0,0 +1,30 @@
+use gpui::{FocusHandle, Focusable};
+use ui::{
+    Color, Context, IntoElement, Label, LabelCommon, ParentElement, Render, Styled, Window, h_flex,
+};
+
+pub(crate) struct FailedState {
+    focus_handle: FocusHandle,
+}
+impl FailedState {
+    pub(super) fn new(cx: &mut Context<Self>) -> Self {
+        Self {
+            focus_handle: cx.focus_handle(),
+        }
+    }
+}
+
+impl Focusable for FailedState {
+    fn focus_handle(&self, _: &ui::App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+impl Render for FailedState {
+    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+        h_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .child(Label::new("Failed to spawn debugging session").color(Color::Error))
+    }
+}
--- a/crates/debugger_ui/src/session/inert.rs
+++ b/crates/debugger_ui/src/session/inert.rs
@@ -0,0 +1,336 @@
+use std::path::PathBuf;
+
+use dap::DebugRequestType;
+use editor::{Editor, EditorElement, EditorStyle};
+use gpui::{App, AppContext, Entity, EventEmitter, FocusHandle, Focusable, TextStyle, WeakEntity};
+use settings::Settings as _;
+use task::{DebugTaskDefinition, LaunchConfig, TCPHost};
+use theme::ThemeSettings;
+use ui::{
+    ActiveTheme as _, ButtonCommon, ButtonLike, Clickable, Context, ContextMenu, Disableable,
+    DropdownMenu, FluentBuilder, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
+    LabelCommon, LabelSize, ParentElement, PopoverMenu, PopoverMenuHandle, Render, SharedString,
+    SplitButton, Styled, Window, div, h_flex, relative, v_flex,
+};
+use workspace::Workspace;
+
+use crate::attach_modal::AttachModal;
+
+#[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
+enum SpawnMode {
+    #[default]
+    Launch,
+    Attach,
+}
+
+impl SpawnMode {
+    fn label(&self) -> &'static str {
+        match self {
+            SpawnMode::Launch => "Launch",
+            SpawnMode::Attach => "Attach",
+        }
+    }
+}
+
+impl From<DebugRequestType> for SpawnMode {
+    fn from(request: DebugRequestType) -> Self {
+        match request {
+            DebugRequestType::Launch(_) => SpawnMode::Launch,
+            DebugRequestType::Attach(_) => SpawnMode::Attach,
+        }
+    }
+}
+
+pub(crate) struct InertState {
+    focus_handle: FocusHandle,
+    selected_debugger: Option<SharedString>,
+    program_editor: Entity<Editor>,
+    cwd_editor: Entity<Editor>,
+    workspace: WeakEntity<Workspace>,
+    spawn_mode: SpawnMode,
+    popover_handle: PopoverMenuHandle<ContextMenu>,
+}
+
+impl InertState {
+    pub(super) fn new(
+        workspace: WeakEntity<Workspace>,
+        default_cwd: &str,
+        debug_config: Option<DebugTaskDefinition>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let selected_debugger = debug_config
+            .as_ref()
+            .map(|config| SharedString::from(config.adapter.clone()));
+
+        let spawn_mode = debug_config
+            .as_ref()
+            .map(|config| config.request.clone().into())
+            .unwrap_or_default();
+
+        let program = debug_config
+            .as_ref()
+            .and_then(|config| match &config.request {
+                DebugRequestType::Attach(_) => None,
+                DebugRequestType::Launch(launch_config) => Some(launch_config.program.clone()),
+            });
+
+        let program_editor = cx.new(|cx| {
+            let mut editor = Editor::single_line(window, cx);
+            if let Some(program) = program {
+                editor.insert(&program, window, cx);
+            } else {
+                editor.set_placeholder_text("Program path", cx);
+            }
+            editor
+        });
+
+        let cwd = debug_config
+            .and_then(|config| match &config.request {
+                DebugRequestType::Attach(_) => None,
+                DebugRequestType::Launch(launch_config) => launch_config.cwd.clone(),
+            })
+            .unwrap_or_else(|| PathBuf::from(default_cwd));
+
+        let cwd_editor = cx.new(|cx| {
+            let mut editor = Editor::single_line(window, cx);
+            editor.insert(cwd.to_str().unwrap_or_else(|| default_cwd), window, cx);
+            editor.set_placeholder_text("Working directory", cx);
+            editor
+        });
+
+        Self {
+            workspace,
+            cwd_editor,
+            program_editor,
+            selected_debugger,
+            spawn_mode,
+            focus_handle: cx.focus_handle(),
+            popover_handle: Default::default(),
+        }
+    }
+}
+impl Focusable for InertState {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+pub(crate) enum InertEvent {
+    Spawned { config: DebugTaskDefinition },
+}
+
+impl EventEmitter<InertEvent> for InertState {}
+
+static SELECT_DEBUGGER_LABEL: SharedString = SharedString::new_static("Select Debugger");
+
+impl Render for InertState {
+    fn render(
+        &mut self,
+        window: &mut ui::Window,
+        cx: &mut ui::Context<'_, Self>,
+    ) -> impl ui::IntoElement {
+        let weak = cx.weak_entity();
+        let workspace = self.workspace.clone();
+        let disable_buttons = self.selected_debugger.is_none();
+        let spawn_button = ButtonLike::new_rounded_left("spawn-debug-session")
+            .child(Label::new(self.spawn_mode.label()).size(LabelSize::Small))
+            .on_click(cx.listener(|this, _, window, cx| {
+                if this.spawn_mode == SpawnMode::Launch {
+                    let program = this.program_editor.read(cx).text(cx);
+                    let cwd = PathBuf::from(this.cwd_editor.read(cx).text(cx));
+                    let kind = this
+                        .selected_debugger
+                        .as_deref()
+                        .unwrap_or_else(|| {
+                            unimplemented!(
+                                "Automatic selection of a debugger based on users project"
+                            )
+                        })
+                        .to_string();
+
+                    cx.emit(InertEvent::Spawned {
+                        config: DebugTaskDefinition {
+                            label: "hard coded".into(),
+                            adapter: kind,
+                            request: DebugRequestType::Launch(LaunchConfig {
+                                program,
+                                cwd: Some(cwd),
+                            }),
+                            tcp_connection: Some(TCPHost::default()),
+                            initialize_args: None,
+                            args: Default::default(),
+                            locator: None,
+                        },
+                    });
+                } else {
+                    this.attach(window, cx)
+                }
+            }))
+            .disabled(disable_buttons);
+
+        v_flex()
+            .track_focus(&self.focus_handle)
+            .size_full()
+            .gap_1()
+            .p_2()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        h_flex()
+                            .w_full()
+                            .gap_2()
+                            .child(Self::render_editor(&self.program_editor, cx))
+                            .child(
+                                h_flex().child(DropdownMenu::new(
+                                    "dap-adapter-picker",
+                                    self.selected_debugger
+                                        .as_ref()
+                                        .unwrap_or_else(|| &SELECT_DEBUGGER_LABEL)
+                                        .clone(),
+                                    ContextMenu::build(window, cx, move |mut this, _, cx| {
+                                        let setter_for_name = |name: SharedString| {
+                                            let weak = weak.clone();
+                                            move |_: &mut Window, cx: &mut App| {
+                                                let name = name.clone();
+                                                weak.update(cx, move |this, cx| {
+                                                    this.selected_debugger = Some(name.clone());
+                                                    cx.notify();
+                                                })
+                                                .ok();
+                                            }
+                                        };
+                                        let available_adapters = workspace
+                                            .update(cx, |this, cx| {
+                                                this.project()
+                                                    .read(cx)
+                                                    .debug_adapters()
+                                                    .enumerate_adapters()
+                                            })
+                                            .ok()
+                                            .unwrap_or_default();
+
+                                        for adapter in available_adapters {
+                                            this = this.entry(
+                                                adapter.0.clone(),
+                                                None,
+                                                setter_for_name(adapter.0.clone()),
+                                            );
+                                        }
+                                        this
+                                    }),
+                                )),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .child(Self::render_editor(&self.cwd_editor, cx))
+                            .map(|this| {
+                                let entity = cx.weak_entity();
+                                this.child(SplitButton {
+                                    left: spawn_button,
+                                    right: PopoverMenu::new("debugger-select-spawn-mode")
+                                        .trigger(
+                                            ButtonLike::new_rounded_right(
+                                                "debugger-spawn-button-mode",
+                                            )
+                                            .layer(ui::ElevationIndex::ModalSurface)
+                                            .size(ui::ButtonSize::None)
+                                            .child(
+                                                div().px_1().child(
+                                                    Icon::new(IconName::ChevronDownSmall)
+                                                        .size(IconSize::XSmall),
+                                                ),
+                                            ),
+                                        )
+                                        .menu(move |window, cx| {
+                                            Some(ContextMenu::build(window, cx, {
+                                                let entity = entity.clone();
+                                                move |this, _, _| {
+                                                    this.entry("Launch", None, {
+                                                        let entity = entity.clone();
+                                                        move |_, cx| {
+                                                            let _ =
+                                                                entity.update(cx, |this, cx| {
+                                                                    this.spawn_mode =
+                                                                        SpawnMode::Launch;
+                                                                    cx.notify();
+                                                                });
+                                                        }
+                                                    })
+                                                    .entry("Attach", None, {
+                                                        let entity = entity.clone();
+                                                        move |_, cx| {
+                                                            let _ =
+                                                                entity.update(cx, |this, cx| {
+                                                                    this.spawn_mode =
+                                                                        SpawnMode::Attach;
+                                                                    cx.notify();
+                                                                });
+                                                        }
+                                                    })
+                                                }
+                                            }))
+                                        })
+                                        .with_handle(self.popover_handle.clone())
+                                        .into_any_element(),
+                                })
+                            }),
+                    ),
+            )
+    }
+}
+
+impl InertState {
+    fn render_editor(editor: &Entity<Editor>, cx: &Context<Self>) -> impl IntoElement {
+        let settings = ThemeSettings::get_global(cx);
+        let text_style = TextStyle {
+            color: cx.theme().colors().text,
+            font_family: settings.buffer_font.family.clone(),
+            font_features: settings.buffer_font.features.clone(),
+            font_size: settings.buffer_font_size(cx).into(),
+            font_weight: settings.buffer_font.weight,
+            line_height: relative(settings.buffer_line_height.value()),
+            ..Default::default()
+        };
+
+        EditorElement::new(
+            editor,
+            EditorStyle {
+                background: cx.theme().colors().editor_background,
+                local_player: cx.theme().players().local(),
+                text: text_style,
+                ..Default::default()
+            },
+        )
+    }
+
+    fn attach(&self, window: &mut Window, cx: &mut Context<Self>) {
+        let kind = self
+            .selected_debugger
+            .as_deref()
+            .map(|s| s.to_string())
+            .unwrap_or_else(|| {
+                unimplemented!("Automatic selection of a debugger based on users project")
+            });
+
+        let config = DebugTaskDefinition {
+            label: "hard coded attach".into(),
+            adapter: kind,
+            request: DebugRequestType::Attach(task::AttachConfig { process_id: None }),
+            initialize_args: None,
+            args: Default::default(),
+            locator: None,
+            tcp_connection: Some(TCPHost::default()),
+        };
+
+        let _ = self.workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().clone();
+            workspace.toggle_modal(window, cx, |window, cx| {
+                AttachModal::new(project, config, window, cx)
+            });
+        });
+    }
+}
--- 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-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></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-off-icon lucide-bug-off"><path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2"/><path d="M14.12 3.88 16 2"/><path d="M22 13h-4v-2a4 4 0 0 0-4-4h-1.3"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="m2 2 20 20"/><path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13"/><path d="M12 20v-8"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/></svg>
				`@@ -1 +0,0 @@`
				`Returns the path of the user's currently active tab.`