WIP

remove old comment
Slightly optimize the noop reordering case
2025-06-04 09:50:06 -07:00 · 2025-05-31 22:17:44 -07:00 · 2025-05-31 22:15:51 -07:00 · 2025-05-31 21:09:45 -07:00 · 2025-05-31 20:38:50 -07:00 · 2025-05-31 19:55:15 -07:00
296 changed files with 7054 additions and 15711 deletions
--- a/.github/actions/build_docs/action.yml
+++ b/.github/actions/build_docs/action.yml
@@ -1,26 +0,0 @@
-name: "Build docs"
-description: "Build the docs"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Setup mdBook
-      uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2
-      with:
-        mdbook-version: "0.4.37"
-
-    - name: Cache dependencies
-      uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
-      with:
-        save-if: ${{ github.ref == 'refs/heads/main' }}
-        cache-provider: "buildjet"
-
-    - name: Install Linux dependencies
-      shell: bash -euxo pipefail {0}
-      run: ./script/linux
-
-    - name: Build book
-      shell: bash -euxo pipefail {0}
-      run: |
-        mkdir -p target/deploy
-        mdbook build ./docs --dest-dir=../target/deploy/docs/
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
    timeout-minutes: 60
    runs-on:
      - self-hosted
-      - macOS
+      - test
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -191,27 +191,6 @@ jobs:
        with:
          config: ./typos.toml

-  check_docs:
-    timeout-minutes: 60
-    name: Check docs
-    needs: [job_spec]
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - buildjet-8vcpu-ubuntu-2204
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Configure CI
-        run: |
-          mkdir -p ./../.cargo
-          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
-      - name: Build docs
-        uses: ./.github/actions/build_docs
-
  macos_tests:
    timeout-minutes: 60
    name: (macOS) Run Clippy and tests
@@ -221,7 +200,7 @@ jobs:
      needs.job_spec.outputs.run_tests == 'true'
    runs-on:
      - self-hosted
-      - macOS
+      - test
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -503,9 +482,7 @@ jobs:
      - macos_tests
      - windows_clippy
      - windows_tests
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      always()
+    if: always()
    steps:
      - name: Check all tests passed
        run: |
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -9,7 +9,7 @@ jobs:
  deploy-docs:
    name: Deploy Docs
    if: github.repository_owner == 'zed-industries'
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    runs-on: ubuntu-latest

    steps:
      - name: Checkout repo
@@ -17,11 +17,24 @@ jobs:
        with:
          clean: false

+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2
+        with:
+          mdbook-version: "0.4.37"
+
      - name: Set up default .cargo/config.toml
        run: cp ./.cargo/collab-config.toml ./.cargo/config.toml

-      - name: Build docs
-        uses: ./.github/actions/build_docs
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxkbcommon-dev libxkbcommon-x11-dev
+
+      - name: Build book
+        run: |
+          set -euo pipefail
+          mkdir -p target/deploy
+          mdbook build ./docs --dest-dir=../target/deploy/docs/

      - name: Deploy Docs
        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -15,7 +15,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - macOS
+      - test
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -33,7 +33,7 @@ jobs:
    name: Run tests
    runs-on:
      - self-hosted
-      - macOS
+      - test
    needs: style
    steps:
      - name: Checkout repo
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -20,7 +20,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - macOS
+      - test
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -40,7 +40,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - macOS
+      - test
    needs: style
    steps:
      - name: Checkout repo
--- a/.github/workflows/unit_evals.yml
+++ b/.github/workflows/unit_evals.yml
@@ -1,85 +0,0 @@
-name: Run Unit Evals
-
-on:
-  schedule:
-    # GitHub might drop jobs at busy times, so we choose a random time in the middle of the night.
-    - cron: "47 1 * * *"
-  workflow_dispatch:
-
-concurrency:
-  # Allow only one workflow per any non-`main` branch.
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-
-jobs:
-  unit_evals:
-    timeout-minutes: 60
-    name: Run unit evals
-    runs-on:
-      - buildjet-16vcpu-ubuntu-2204
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-provider: "buildjet"
-
-      - name: Install Linux dependencies
-        run: ./script/linux
-
-      - name: Configure CI
-        run: |
-          mkdir -p ./../.cargo
-          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
-      - name: Install Rust
-        shell: bash -euxo pipefail {0}
-        run: |
-          cargo install cargo-nextest --locked
-
-      - name: Install Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: "18"
-
-      - name: Limit target directory size
-        shell: bash -euxo pipefail {0}
-        run: script/clear-target-dir-if-larger-than 100
-
-      - name: Run unit evals
-        shell: bash -euxo pipefail {0}
-        run: cargo nextest run --workspace --no-fail-fast --features eval --no-capture -E 'test(::eval_)' --test-threads 1
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-
-      - name: Send the pull request link into the Slack channel
-        if: ${{ failure() }}
-        uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52
-        with:
-          method: chat.postMessage
-          token: ${{ secrets.SLACK_APP_ZED_UNIT_EVALS_BOT_TOKEN }}
-          payload: |
-            channel: C04UDRNNJFQ
-            text: "Unit Evals Failed: https://github.com/zed-industries/zed/actions/runs/${{ github.run_id }}"
-
-      # Even the Linux runner is not stateful, in theory there is no need to do this cleanup.
-      # But, to avoid potential issues in the future if we choose to use a stateful Linux runner and forget to add code
-      # to clean up the config file, I’ve included the cleanup code here as a precaution.
-      # While it’s not strictly necessary at this moment, I believe it’s better to err on the side of caution.
-      - name: Clean CI config file
-        if: always()
-        run: rm -rf ./../.cargo
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,7 +114,6 @@ dependencies = [
 "serde_json_lenient",
 "settings",
 "smol",
- "sqlez",
 "streaming_diff",
 "telemetry",
 "telemetry_events",
@@ -134,7 +133,6 @@ dependencies = [
 "workspace-hack",
 "zed_actions",
 "zed_llm_client",
- "zstd",
 ]

 [[package]]
@@ -527,7 +525,6 @@ dependencies = [
 "fuzzy",
 "gpui",
 "indexed_docs",
- "indoc",
 "language",
 "language_model",
 "languages",
@@ -631,7 +628,6 @@ name = "assistant_tool"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "async-watch",
 "buffer_diff",
 "clock",
 "collections",
@@ -4543,8 +4539,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "clap",
- "command_palette",
- "gpui",
 "mdbook",
 "regex",
 "serde",
@@ -4552,7 +4546,6 @@ dependencies = [
 "settings",
 "util",
 "workspace-hack",
- "zed",
 ]

 [[package]]
@@ -7077,7 +7070,6 @@ dependencies = [
 "image",
 "inventory",
 "itertools 0.14.0",
- "libc",
 "log",
 "lyon",
 "media",
@@ -8766,7 +8758,6 @@ dependencies = [
 "serde",
 "serde_json",
 "settings",
- "shellexpand 2.1.2",
 "smallvec",
 "smol",
 "streaming-iterator",
@@ -8868,7 +8859,6 @@ dependencies = [
 "mistral",
 "ollama",
 "open_ai",
- "open_router",
 "partial-json-fixer",
 "project",
 "proto",
@@ -10713,19 +10703,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "open_router"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "workspace-hack",
-]
-
 [[package]]
 name = "opener"
 version = "0.7.2"
@@ -12117,7 +12094,6 @@ dependencies = [
 "unindent",
 "url",
 "util",
- "uuid",
 "which 6.0.3",
 "workspace-hack",
 "worktree",
@@ -16513,9 +16489,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter"
-version = "0.25.6"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cf18d43cbf0bfca51f657132cc616a5097edc4424d538bae6fa60142eaf9f0"
+checksum = "ac5fff5c47490dfdf473b5228039bfacad9d765d9b6939d26bf7cc064c1c7822"
 dependencies = [
 "cc",
 "regex",
@@ -16528,9 +16504,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter-bash"
-version = "0.25.0"
+version = "0.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871b0606e667e98a1237ebdc1b0d7056e0aebfdc3141d12b399865d4cb6ed8a6"
+checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -17134,7 +17110,6 @@ dependencies = [
 "futures-lite 1.13.0",
 "git2",
 "globset",
- "indoc",
 "itertools 0.14.0",
 "libc",
 "log",
@@ -19712,7 +19687,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.191.0"
+version = "0.190.0"
 dependencies = [
 "activity_indicator",
 "agent",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,6 @@ members = [
    "crates/notifications",
    "crates/ollama",
    "crates/open_ai",
-    "crates/open_router",
    "crates/outline",
    "crates/outline_panel",
    "crates/panel",
@@ -308,7 +307,6 @@ node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
-open_router = { path = "crates/open_router", features = ["schemars"] }
 outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 panel = { path = "crates/panel" }
@@ -574,8 +572,8 @@ tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
 toml = "0.8"
 tower-http = "0.4.4"
-tree-sitter = { version = "0.25.6", features = ["wasm"] }
-tree-sitter-bash = "0.25.0"
+tree-sitter = { version = "0.25.5", features = ["wasm"] }
+tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
 tree-sitter-css = "0.23"
--- a/assets/icons/ai_open_router.svg
+++ b/assets/icons/ai_open_router.svg
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" stroke="currentColor">
-  <g clip-path="url(#clip0_205_3)">
-    <path d="M0.094 7.78c0.469 0 2.281 -0.405 3.219 -0.936s0.938 -0.531 2.875 -1.906c2.453 -1.741 4.188 -1.158 7.031 -1.158" stroke-width="2.8125" />
-    <path d="m15.969 3.797 -4.805 2.774V1.023z" />
-    <path d="M0 7.781c0.469 0 2.281 0.405 3.219 0.936s0.938 0.531 2.875 1.906C8.547 12.364 10.281 11.781 13.125 11.781" stroke-width="2.8125" />
-    <path d="m15.875 11.764 -4.805 -2.774v5.548z" />
-  </g>
-</svg>
--- a/assets/icons/cursor_i_beam.svg
+++ b/assets/icons/cursor_i_beam.svg
@@ -1,4 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 20H16C14.9391 20 13.9217 19.6629 13.1716 19.0627C12.4214 18.4626 12 17.6487 12 16.8V7.2C12 6.35131 12.4214 5.53737 13.1716 4.93726C13.9217 4.33714 14.9391 4 16 4H17" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 20H8C9.06087 20 10.0783 19.5786 10.8284 18.8284C11.5786 18.0783 12 17.0609 12 16V15" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 4H8C9.06087 4 10.0783 4.42143 10.8284 5.17157C11.5786 5.92172 12 6.93913 12 8V9" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/list_todo.svg
+++ b/assets/icons/list_todo.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-list-todo-icon lucide-list-todo"><rect x="3" y="5" width="6" height="6" rx="1"/><path d="m3 17 2 2 4-4"/><path d="M13 6h8"/><path d="M13 12h8"/><path d="M13 18h8"/></svg>
--- a/assets/icons/play_alt.svg
+++ b/assets/icons/play_alt.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 3L13 8L4 13V3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/play_bug.svg
+++ b/assets/icons/play_bug.svg
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 12C2.35977 11.85 1 10.575 1 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M1.00875 15.2C1.00875 13.625 0.683456 12.275 4.00001 12.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 9C7 10.575 5.62857 11.85 4 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 12.2C6.98117 12.2 7 13.625 7 15.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="2.5" y="9" width="3" height="6" rx="1.5" fill="black"/>
-<path d="M9 10L13 8L4 3V7.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/sliders.svg
+++ b/assets/icons/sliders.svg
@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36667 3.79167C5.53364 3.79167 4.85833 4.46697 4.85833 5.3C4.85833 6.13303 5.53364 6.80833 6.36667 6.80833C7.1997 6.80833 7.875 6.13303 7.875 5.3C7.875 4.46697 7.1997 3.79167 6.36667 3.79167ZM2.1 5.925H3.67944C3.9626 7.14732 5.05824 8.05833 6.36667 8.05833C7.67509 8.05833 8.77073 7.14732 9.05389 5.925H14.9C15.2452 5.925 15.525 5.64518 15.525 5.3C15.525 4.95482 15.2452 4.675 14.9 4.675H9.05389C8.77073 3.45268 7.67509 2.54167 6.36667 2.54167C5.05824 2.54167 3.9626 3.45268 3.67944 4.675H2.1C1.75482 4.675 1.475 4.95482 1.475 5.3C1.475 5.64518 1.75482 5.925 2.1 5.925ZM13.3206 12.325C13.0374 13.5473 11.9418 14.4583 10.6333 14.4583C9.32491 14.4583 8.22927 13.5473 7.94611 12.325H2.1C1.75482 12.325 1.475 12.0452 1.475 11.7C1.475 11.3548 1.75482 11.075 2.1 11.075H7.94611C8.22927 9.85268 9.32491 8.94167 10.6333 8.94167C11.9418 8.94167 13.0374 9.85268 13.3206 11.075H14.9C15.2452 11.075 15.525 11.3548 15.525 11.7C15.525 12.0452 15.2452 12.325 14.9 12.325H13.3206ZM9.125 11.7C9.125 10.867 9.8003 10.1917 10.6333 10.1917C11.4664 10.1917 12.1417 10.867 12.1417 11.7C12.1417 12.533 11.4664 13.2083 10.6333 13.2083C9.8003 13.2083 9.125 12.533 9.125 11.7Z" fill="black"/>
 </svg>
--- a/assets/icons/star.svg
+++ b/assets/icons/star.svg
@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.97942 1.25171L6.9585 1.30199L5.58662 4.60039C5.54342 4.70426 5.44573 4.77523 5.3336 4.78422L1.7727 5.0697L1.71841 5.07405L1.38687 5.10063L1.08608 5.12475C0.820085 5.14607 0.712228 5.47802 0.914889 5.65162L1.14406 5.84793L1.39666 6.06431L1.43802 6.09974L4.15105 8.42374C4.23648 8.49692 4.2738 8.61176 4.24769 8.72118L3.41882 12.196L3.40618 12.249L3.32901 12.5725L3.25899 12.866C3.19708 13.1256 3.47945 13.3308 3.70718 13.1917L3.9647 13.0344L4.24854 12.861L4.29502 12.8326L7.34365 10.9705C7.43965 10.9119 7.5604 10.9119 7.6564 10.9705L10.705 12.8326L10.7515 12.861L11.0354 13.0344L11.2929 13.1917C11.5206 13.3308 11.803 13.1256 11.7411 12.866L11.671 12.5725L11.5939 12.249L11.5812 12.196L10.7524 8.72118C10.7263 8.61176 10.7636 8.49692 10.849 8.42374L13.562 6.09974L13.6034 6.06431L13.856 5.84793L14.0852 5.65162C14.2878 5.47802 14.18 5.14607 13.914 5.12475L13.6132 5.10063L13.2816 5.07405L13.2274 5.0697L9.66645 4.78422C9.55432 4.77523 9.45663 4.70426 9.41343 4.60039L8.04155 1.30199L8.02064 1.25171L7.89291 0.944609L7.77702 0.665992C7.67454 0.419604 7.32551 0.419604 7.22303 0.665992L7.10715 0.944609L6.97942 1.25171ZM7.50003 2.60397L6.50994 4.98442C6.32273 5.43453 5.89944 5.74207 5.41351 5.78103L2.84361 5.98705L4.8016 7.66428C5.17183 7.98142 5.33351 8.47903 5.2204 8.95321L4.62221 11.461L6.8224 10.1171C7.23842 9.86302 7.76164 9.86302 8.17766 10.1171L10.3778 11.461L9.77965 8.95321C9.66654 8.47903 9.82822 7.98142 10.1984 7.66428L12.1564 5.98705L9.58654 5.78103C9.10061 5.74207 8.67732 5.43453 8.49011 4.98442L7.50003 2.60397Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
--- a/assets/icons/star_filled.svg
+++ b/assets/icons/star_filled.svg
@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.22303 0.665992C7.32551 0.419604 7.67454 0.419604 7.77702 0.665992L9.41343 4.60039C9.45663 4.70426 9.55432 4.77523 9.66645 4.78422L13.914 5.12475C14.18 5.14607 14.2878 5.47802 14.0852 5.65162L10.849 8.42374C10.7636 8.49692 10.7263 8.61176 10.7524 8.72118L11.7411 12.866C11.803 13.1256 11.5206 13.3308 11.2929 13.1917L7.6564 10.9705C7.5604 10.9119 7.43965 10.9119 7.34365 10.9705L3.70718 13.1917C3.47945 13.3308 3.19708 13.1256 3.25899 12.866L4.24769 8.72118C4.2738 8.61176 4.23648 8.49692 4.15105 8.42374L0.914889 5.65162C0.712228 5.47802 0.820086 5.14607 1.08608 5.12475L5.3336 4.78422C5.44573 4.77523 5.54342 4.70426 5.58662 4.60039L7.22303 0.665992Z" fill="currentColor"></path></svg>
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2L6.72534 5.87534C6.6601 6.07367 6.5492 6.25392 6.40155 6.40155C6.25392 6.5492 6.07367 6.6601 5.87534 6.72534L2 8L5.87534 9.27466C6.07367 9.3399 6.25392 9.4508 6.40155 9.59845C6.5492 9.74608 6.6601 9.92633 6.72534 10.1247L8 14L9.27466 10.1247C9.3399 9.92633 9.4508 9.74608 9.59845 9.59845C9.74608 9.4508 9.92633 9.3399 10.1247 9.27466L14 8L10.1247 6.72534C9.92633 6.6601 9.74608 6.5492 9.59845 6.40155C9.4508 6.25392 9.3399 6.07367 9.27466 5.87534L8 2Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 1.75L5.88467 5.14092C5.82759 5.31446 5.73055 5.47218 5.60136 5.60136C5.47218 5.73055 5.31446 5.82759 5.14092 5.88467L1.75 7L5.14092 8.11533C5.31446 8.17241 5.47218 8.26945 5.60136 8.39864C5.73055 8.52782 5.82759 8.68554 5.88467 8.85908L7 12.25L8.11533 8.85908C8.17241 8.68554 8.26945 8.52782 8.39864 8.39864C8.52782 8.26945 8.68554 8.17241 8.85908 8.11533L12.25 7L8.85908 5.88467C8.68554 5.82759 8.52782 5.73055 8.39864 5.60136C8.26945 5.47218 8.17241 5.31446 8.11533 5.14092L7 1.75Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.91667 1.75V4.08333M1.75 2.91667H4.08333" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.0833 9.91667V12.25M9.91667 11.0833H12.25" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -31,6 +31,8 @@
      "ctrl-,": "zed::OpenSettings",
      "ctrl-q": "zed::Quit",
      "f4": "debugger::Start",
+      "alt-f4": "debugger::RerunLastSession",
+      "f5": "debugger::Continue",
      "shift-f5": "debugger::Stop",
      "ctrl-shift-f5": "debugger::Restart",
      "f6": "debugger::Pause",
@@ -120,7 +122,7 @@
      "ctrl-'": "editor::ToggleSelectedDiffHunks",
      "ctrl-\"": "editor::ExpandAllDiffHunks",
      "ctrl-i": "editor::ShowSignatureHelp",
-      "alt-g b": "git::Blame",
+      "alt-g b": "editor::ToggleGitBlame",
      "menu": "editor::OpenContextMenu",
      "shift-f10": "editor::OpenContextMenu",
      "ctrl-shift-e": "editor::ToggleEditPrediction",
@@ -278,9 +280,7 @@
      "enter": "agent::Chat",
      "ctrl-enter": "agent::ChatWithFollow",
      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
+      "shift-ctrl-r": "agent::OpenAgentDiff"
    }
  },
  {
@@ -512,14 +512,14 @@
  {
    "context": "Workspace",
    "bindings": {
-      "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
-      "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": false }],
-      "alt-shift-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+      "alt-open": "projects::OpenRecent",
+      "alt-ctrl-o": "projects::OpenRecent",
+      "alt-shift-open": "projects::OpenRemote",
+      "alt-ctrl-shift-o": "projects::OpenRemote",
      // Change to open path modal for existing remote connection by setting the parameter
      // "alt-ctrl-shift-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
-      "alt-ctrl-shift-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
      "alt-ctrl-shift-b": "branches::OpenRecent",
      "alt-shift-enter": "toast::RunAction",
      "ctrl-~": "workspace::NewTerminal",
@@ -583,24 +583,11 @@
      "ctrl-alt-r": "task::Rerun",
      "alt-t": "task::Rerun",
      "alt-shift-t": "task::Spawn",
-      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }],
+      "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" }],
-      "f5": "debugger::RerunLastSession"
-    }
-  },
-  {
-    "context": "Workspace && debugger_running",
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "bindings": {
-      "f5": "debugger::Continue"
    }
  },
  {
@@ -886,8 +873,7 @@
    "context": "DebugPanel",
    "bindings": {
      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
+      "ctrl-i": "debugger::ToggleSessionPicker"
    }
  },
  {
@@ -944,13 +930,6 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
-  {
-    "context": "FileFinder",
-    "bindings": {
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "bindings": {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -4,6 +4,8 @@
    "use_key_equivalents": true,
    "bindings": {
      "f4": "debugger::Start",
+      "alt-f4": "debugger::RerunLastSession",
+      "f5": "debugger::Continue",
      "shift-f5": "debugger::Stop",
      "shift-cmd-f5": "debugger::Restart",
      "f6": "debugger::Pause",
@@ -138,7 +140,7 @@
      "cmd-;": "editor::ToggleLineNumbers",
      "cmd-'": "editor::ToggleSelectedDiffHunks",
      "cmd-\"": "editor::ExpandAllDiffHunks",
-      "cmd-alt-g b": "git::Blame",
+      "cmd-alt-g b": "editor::ToggleGitBlame",
      "cmd-i": "editor::ShowSignatureHelp",
      "f9": "editor::ToggleBreakpoint",
      "shift-f9": "editor::EditLogBreakpoint",
@@ -315,9 +317,7 @@
      "enter": "agent::Chat",
      "cmd-enter": "agent::ChatWithFollow",
      "cmd-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
+      "shift-ctrl-r": "agent::OpenAgentDiff"
    }
  },
  {
@@ -584,9 +584,9 @@
    "bindings": {
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
-      "alt-cmd-o": ["projects::OpenRecent", { "create_new_window": false }],
-      "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
-      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true, "create_new_window": false }],
+      "alt-cmd-o": "projects::OpenRecent",
+      "ctrl-cmd-o": "projects::OpenRemote",
+      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true }],
      "alt-cmd-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "cmd-s": "workspace::Save",
@@ -635,8 +635,7 @@
      "cmd-k shift-right": "workspace::SwapPaneRight",
      "cmd-k shift-up": "workspace::SwapPaneUp",
      "cmd-k shift-down": "workspace::SwapPaneDown",
-      "cmd-shift-x": "zed::Extensions",
-      "f5": "debugger::RerunLastSession"
+      "cmd-shift-x": "zed::Extensions"
    }
  },
  {
@@ -653,20 +652,6 @@
      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
-  {
-    "context": "Workspace && debugger_running",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "debugger::Continue"
-    }
-  },
  // Bindings from Sublime Text
  {
    "context": "Editor",
@@ -951,8 +936,7 @@
    "context": "DebugPanel",
    "bindings": {
      "cmd-t": "debugger::ToggleThreadPicker",
-      "cmd-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
+      "cmd-i": "debugger::ToggleSessionPicker"
    }
  },
  {
@@ -1005,14 +989,6 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
-  {
-    "context": "FileFinder",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-a": "file_finder::ToggleSplitMenu",
-      "cmd-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "use_key_equivalents": true,
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -51,11 +51,7 @@
      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "alt-right": "editor::MoveToNextSubwordEnd",
-      "alt-left": "editor::MoveToPreviousSubwordStart",
-      "alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
+      "ctrl-delete": "editor::DeleteToNextWordEnd"
    }
  },
  {
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -53,11 +53,7 @@
      "cmd-shift-j": "editor::JoinLines",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "ctrl-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
+      "ctrl-delete": "editor::DeleteToNextWordEnd"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -198,8 +198,6 @@
      "9": ["vim::Number", 9],
      "ctrl-w d": "editor::GoToDefinitionSplit",
      "ctrl-w g d": "editor::GoToDefinitionSplit",
-      "ctrl-w ]": "editor::GoToDefinitionSplit",
-      "ctrl-w ctrl-]": "editor::GoToDefinitionSplit",
      "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit",
      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
      "ctrl-w space": "editor::OpenExcerptsSplit",
@@ -840,19 +838,6 @@
      "tab": "editor::AcceptEditPrediction"
    }
  },
-  {
-    "context": "MessageEditor > Editor && VimControl",
-    "bindings": {
-      "enter": "agent::Chat",
-      // TODO: Implement search
-      "/": null,
-      "?": null,
-      "#": null,
-      "*": null,
-      "n": null,
-      "shift-n": null
-    }
-  },
  {
    "context": "os != macos && Editor && edit_prediction_conflict",
    "bindings": {
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -17,13 +17,13 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 4. Use only the tools that are currently available.
 5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
 6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.
-7. Avoid HTML entity escaping - use plain characters instead.

 ## Searching and Reading

 If you are unsure how to fulfill the user's request, gather more information with tool calls and/or clarifying questions.

 {{! TODO: If there are files, we should mention it but otherwise omit that fact }}
+{{#if has_tools}}
 If appropriate, use tool calls to explore the current project, which contains the following root directories:

 {{#each worktrees}}
@@ -38,6 +38,7 @@ If appropriate, use tool calls to explore the current project, which contains th
 - As you learn about the structure of the project, use that information to scope `grep` searches to targeted subtrees of the project.
 - The user might specify a partial file path. If you don't know the full path, use `find_path` (not `grep`) before you read the file.
 {{/if}}
+{{/if}}
 {{else}}
 You are being tasked with providing a response, but you have no ability to use tools or to read or write any aspect of the user's system (other than any context the user might have provided to you).

--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -73,6 +73,9 @@
  "unnecessary_code_fade": 0.3,
  // Active pane styling settings.
  "active_pane_modifiers": {
+    // The factor to grow the active pane by. Defaults to 1.0
+    // which gives the same size as all other panes.
+    "magnification": 1.0,
    // Inset border size of the active pane, in pixels.
    "border_size": 0.0,
    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
@@ -125,8 +128,6 @@
  //
  // Default: true
  "restore_on_file_reopen": true,
-  // Whether to automatically close files that have been deleted on disk.
-  "close_on_file_delete": false,
  // Size of the drop target in the editor.
  "drop_target_size": 0.2,
  // Whether the window should be closed when using 'close active item' on a window with no tabs.
@@ -533,9 +534,6 @@
      "function": false
    }
  },
-  // Whether to resize all the panels in a dock when resizing the dock.
-  // Can be a combination of "left", "right" and "bottom".
-  "resize_all_panels_in_dock": ["left"],
  "project_panel": {
    // Whether to show the project panel button in the status bar
    "button": true,
@@ -733,6 +731,13 @@
      // The model to use.
      "model": "claude-sonnet-4"
    },
+    // The model to use when applying edits from the agent.
+    "editor_model": {
+      // The provider to use.
+      "provider": "zed.dev",
+      // The model to use.
+      "model": "claude-sonnet-4"
+    },
    // Additional parameters for language model requests. When making a request to a model, parameters will be taken
    // from the last entry in this list that matches the model's provider and name. In each entry, both provider
    // and model are optional, so that you can specify parameters for either one.
@@ -1500,11 +1505,11 @@
      }
    },
    "LaTeX": {
+      "format_on_save": "on",
      "formatter": "language_server",
      "language_servers": ["texlab", "..."],
      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-latex"]
+        "allowed": false
      }
    },
    "Markdown": {
@@ -1528,7 +1533,7 @@
      "allow_rewrap": "anywhere"
    },
    "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."]
+      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
    },
    "SCSS": {
      "prettier": {
@@ -1605,9 +1610,6 @@
      "version": "1",
      "api_url": "https://api.openai.com/v1"
    },
-    "open_router": {
-      "api_url": "https://openrouter.ai/api/v1"
-    },
    "lmstudio": {
      "api_url": "http://localhost:1234/api/v0"
    },
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -1,7 +1,3 @@
-// Some example tasks for common languages.
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
 [
  {
    "label": "Debug active PHP file",
--- a/assets/settings/initial_local_debug_tasks.json
+++ b/assets/settings/initial_local_debug_tasks.json
@@ -1,5 +0,0 @@
-// Project-local debug tasks
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
-[]
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -46,7 +46,6 @@ git.workspace = true
 gpui.workspace = true
 heed.workspace = true
 html_to_markdown.workspace = true
-indoc.workspace = true
 http_client.workspace = true
 indexed_docs.workspace = true
 inventory.workspace = true
@@ -79,7 +78,6 @@ serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
 smol.workspace = true
-sqlez.workspace = true
 streaming_diff.workspace = true
 telemetry.workspace = true
 telemetry_events.workspace = true
@@ -99,7 +97,6 @@ workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 zed_llm_client.workspace = true
-zstd.workspace = true

 [dev-dependencies]
 buffer_diff = { workspace = true, features = ["test-support"] }
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1,8 +1,9 @@
+use crate::AgentPanel;
 use crate::context::{AgentContextHandle, RULES_ICON};
 use crate::context_picker::{ContextPicker, MentionLink};
 use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::message_editor::{extract_message_creases, insert_message_creases};
+use crate::message_editor::insert_message_creases;
 use crate::thread::{
    LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
    ThreadEvent, ThreadFeedback, ThreadSummary,
@@ -12,7 +13,6 @@ use crate::tool_use::{PendingToolUseStatus, ToolUse};
 use crate::ui::{
    AddedContext, AgentNotification, AgentNotificationEvent, AnimatedLabel, ContextPill,
 };
-use crate::{AgentPanel, ModelUsageContext};
 use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
 use anyhow::Context as _;
 use assistant_tool::ToolUseStatus;
@@ -999,7 +999,7 @@ impl ActiveThread {
            ThreadEvent::Stopped(reason) => match reason {
                Ok(StopReason::EndTurn | StopReason::MaxTokens) => {
                    let used_tools = self.thread.read(cx).used_tools_since_last_user_message();
-                    self.play_notification_sound(window, cx);
+                    self.play_notification_sound(cx);
                    self.show_notification(
                        if used_tools {
                            "Finished running tools"
@@ -1014,18 +1014,9 @@ impl ActiveThread {
                _ => {}
            },
            ThreadEvent::ToolConfirmationNeeded => {
-                self.play_notification_sound(window, cx);
+                self.play_notification_sound(cx);
                self.show_notification("Waiting for tool confirmation", IconName::Info, window, cx);
            }
-            ThreadEvent::ToolUseLimitReached => {
-                self.play_notification_sound(window, cx);
-                self.show_notification(
-                    "Consecutive tool use limit reached.",
-                    IconName::Warning,
-                    window,
-                    cx,
-                );
-            }
            ThreadEvent::StreamedAssistantText(message_id, text) => {
                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(&message_id) {
                    rendered_message.append_text(text, cx);
@@ -1160,9 +1151,9 @@ impl ActiveThread {
        cx.notify();
    }

-    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
+    fn play_notification_sound(&self, cx: &mut App) {
        let settings = AgentSettings::get_global(cx);
-        if settings.play_sound_when_agent_done && !window.is_window_active() {
+        if settings.play_sound_when_agent_done {
            Audio::play_sound(Sound::AgentDone, cx);
        }
    }
@@ -1348,7 +1339,6 @@ impl ActiveThread {
                Some(self.text_thread_store.downgrade()),
                context_picker_menu_handle.clone(),
                SuggestContextKind::File,
-                ModelUsageContext::Thread(self.thread.clone()),
                window,
                cx,
            )
@@ -1518,7 +1508,31 @@ impl ActiveThread {
    }

    fn paste(&mut self, _: &Paste, _window: &mut Window, cx: &mut Context<Self>) {
-        attach_pasted_images_as_context(&self.context_store, cx);
+        let images = cx
+            .read_from_clipboard()
+            .map(|item| {
+                item.into_entries()
+                    .filter_map(|entry| {
+                        if let ClipboardEntry::Image(image) = entry {
+                            Some(image)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        if images.is_empty() {
+            return;
+        }
+        cx.stop_propagation();
+
+        self.context_store.update(cx, |store, cx| {
+            for image in images {
+                store.add_image_instance(Arc::new(image), cx);
+            }
+        });
    }

    fn cancel_editing_message(
@@ -1563,8 +1577,6 @@ impl ActiveThread {

        let edited_text = state.editor.read(cx).text(cx);

-        let creases = state.editor.update(cx, extract_message_creases);
-
        let new_context = self
            .context_store
            .read(cx)
@@ -1589,7 +1601,6 @@ impl ActiveThread {
                                message_id,
                                Role::User,
                                vec![MessageSegment::Text(edited_text)],
-                                creases,
                                Some(context.loaded_context),
                                checkpoint.ok(),
                                cx,
@@ -1803,10 +1814,9 @@ impl ActiveThread {

        // Get all the data we need from thread before we start using it in closures
        let checkpoint = thread.checkpoint_for_message(message_id);
-        let configured_model = thread.configured_model().map(|m| m.model);
        let added_context = thread
            .context_for_message(message_id)
-            .map(|context| AddedContext::new_attached(context, configured_model.as_ref(), cx))
+            .map(|context| AddedContext::new_attached(context, cx))
            .collect::<Vec<_>>();

        let tool_uses = thread.tool_uses_for_message(message_id, cx);
@@ -3629,38 +3639,6 @@ pub(crate) fn open_context(
    }
 }

-pub(crate) fn attach_pasted_images_as_context(
-    context_store: &Entity<ContextStore>,
-    cx: &mut App,
-) -> bool {
-    let images = cx
-        .read_from_clipboard()
-        .map(|item| {
-            item.into_entries()
-                .filter_map(|entry| {
-                    if let ClipboardEntry::Image(image) = entry {
-                        Some(image)
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>()
-        })
-        .unwrap_or_default();
-
-    if images.is_empty() {
-        return false;
-    }
-    cx.stop_propagation();
-
-    context_store.update(cx, |store, cx| {
-        for image in images {
-            store.add_image_instance(Arc::new(image), cx);
-        }
-    });
-    true
-}
-
 fn open_editor_at_position(
    project_path: project::ProjectPath,
    target_position: Point,
@@ -3690,13 +3668,10 @@ fn open_editor_at_position(
 #[cfg(test)]
 mod tests {
    use assistant_tool::{ToolRegistry, ToolWorkingSet};
-    use editor::{EditorSettings, display_map::CreaseMetadata};
+    use editor::EditorSettings;
    use fs::FakeFs;
    use gpui::{AppContext, TestAppContext, VisualTestContext};
-    use language_model::{
-        ConfiguredModel, LanguageModel, LanguageModelRegistry,
-        fake_provider::{FakeLanguageModel, FakeLanguageModelProvider},
-    };
+    use language_model::{LanguageModel, fake_provider::FakeLanguageModel};
    use project::Project;
    use prompt_store::PromptBuilder;
    use serde_json::json;
@@ -3757,87 +3732,6 @@ mod tests {
        assert!(!cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
    }

-    #[gpui::test]
-    async fn test_reinserting_creases_for_edited_message(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(cx, json!({})).await;
-
-        let (cx, active_thread, _, thread, model) =
-            setup_test_environment(cx, project.clone()).await;
-        cx.update(|_, cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry.set_default_model(
-                    Some(ConfiguredModel {
-                        provider: Arc::new(FakeLanguageModelProvider),
-                        model,
-                    }),
-                    cx,
-                );
-            });
-        });
-
-        let creases = vec![MessageCrease {
-            range: 14..22,
-            metadata: CreaseMetadata {
-                icon_path: "icon".into(),
-                label: "foo.txt".into(),
-            },
-            context: None,
-        }];
-
-        let message = thread.update(cx, |thread, cx| {
-            let message_id = thread.insert_user_message(
-                "Tell me about @foo.txt",
-                ContextLoadResult::default(),
-                None,
-                creases,
-                cx,
-            );
-            thread.message(message_id).cloned().unwrap()
-        });
-
-        active_thread.update_in(cx, |active_thread, window, cx| {
-            active_thread.start_editing_message(
-                message.id,
-                message.segments.as_slice(),
-                message.creases.as_slice(),
-                window,
-                cx,
-            );
-            let editor = active_thread
-                .editing_message
-                .as_ref()
-                .unwrap()
-                .1
-                .editor
-                .clone();
-            editor.update(cx, |editor, cx| editor.edit([(0..13, "modified")], cx));
-            active_thread.confirm_editing_message(&Default::default(), window, cx);
-        });
-        cx.run_until_parked();
-
-        let message = thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
-        active_thread.update_in(cx, |active_thread, window, cx| {
-            active_thread.start_editing_message(
-                message.id,
-                message.segments.as_slice(),
-                message.creases.as_slice(),
-                window,
-                cx,
-            );
-            let editor = active_thread
-                .editing_message
-                .as_ref()
-                .unwrap()
-                .1
-                .editor
-                .clone();
-            let text = editor.update(cx, |editor, cx| editor.text(cx));
-            assert_eq!(text, "modified @foo.txt");
-        });
-    }
-
    fn init_test_settings(cx: &mut TestAppContext) {
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -33,11 +33,9 @@ use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{App, Entity, actions, impl_actions};
+use gpui::{App, actions, impl_actions};
 use language::LanguageRegistry;
-use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
-};
+use language_model::{LanguageModelId, LanguageModelProviderId, LanguageModelRegistry};
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -117,28 +115,6 @@ impl ManageProfiles {

 impl_actions!(agent, [NewThread, ManageProfiles]);

-#[derive(Clone)]
-pub(crate) enum ModelUsageContext {
-    Thread(Entity<Thread>),
-    InlineAssistant,
-}
-
-impl ModelUsageContext {
-    pub fn configured_model(&self, cx: &App) -> Option<ConfiguredModel> {
-        match self {
-            Self::Thread(thread) => thread.read(cx).configured_model(),
-            Self::InlineAssistant => {
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            }
-        }
-    }
-
-    pub fn language_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        self.configured_model(cx)
-            .map(|configured_model| configured_model.model)
-    }
-}
-
 /// Initializes the `agent` crate.
 pub fn init(
    fs: Arc<dyn Fs>,
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -1086,7 +1086,7 @@ impl Render for AgentDiffToolbar {
                    .child(vertical_divider())
                    .when_some(editor.read(cx).workspace(), |this, _workspace| {
                        this.child(
-                            IconButton::new("review", IconName::ListTodo)
+                            IconButton::new("review", IconName::ListCollapse)
                                .icon_size(IconSize::Small)
                                .tooltip(Tooltip::for_action_title_in(
                                    "Review All Files",
@@ -1116,13 +1116,8 @@ impl Render for AgentDiffToolbar {
                    return Empty.into_any();
                };

-                let has_pending_edit_tool_use = agent_diff
-                    .read(cx)
-                    .thread
-                    .read(cx)
-                    .has_pending_edit_tool_uses();
-
-                if has_pending_edit_tool_use {
+                let is_generating = agent_diff.read(cx).thread.read(cx).is_generating();
+                if is_generating {
                    return div().px_2().child(spinner_icon).into_any();
                }

@@ -1377,7 +1372,6 @@ impl AgentDiff {
            | ThreadEvent::ToolFinished { .. }
            | ThreadEvent::CheckpointChanged
            | ThreadEvent::ToolConfirmationNeeded
-            | ThreadEvent::ToolUseLimitReached
            | ThreadEvent::CancelEditing => {}
        }
    }
@@ -1470,10 +1464,7 @@ impl AgentDiff {
        if !AgentSettings::get_global(cx).single_file_review {
            for (editor, _) in self.reviewing_editors.drain() {
                editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
+                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
                    .ok();
            }
            return;
@@ -1512,7 +1503,7 @@ impl AgentDiff {
                    multibuffer.add_diff(diff_handle.clone(), cx);
                });

-                let new_state = if thread.read(cx).has_pending_edit_tool_uses() {
+                let new_state = if thread.read(cx).is_generating() {
                    EditorState::Generating
                } else {
                    EditorState::Reviewing
@@ -1569,10 +1560,7 @@ impl AgentDiff {

            if in_workspace {
                editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
+                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
                    .ok();
                self.reviewing_editors.remove(&editor);
            }
--- a/crates/agent/src/agent_model_selector.rs
+++ b/crates/agent/src/agent_model_selector.rs
@@ -3,7 +3,7 @@ use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
 use picker::popover_menu::PickerPopoverMenu;

-use crate::ModelUsageContext;
+use crate::Thread;
 use assistant_context_editor::language_model_selector::{
    LanguageModelSelector, ToggleModelSelector, language_model_selector,
 };
@@ -12,6 +12,12 @@ use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{PopoverMenuHandle, Tooltip, prelude::*};

+#[derive(Clone)]
+pub enum ModelType {
+    Default(Entity<Thread>),
+    InlineAssistant,
+}
+
 pub struct AgentModelSelector {
    selector: Entity<LanguageModelSelector>,
    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
@@ -23,7 +29,7 @@ impl AgentModelSelector {
        fs: Arc<dyn Fs>,
        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
        focus_handle: FocusHandle,
-        model_usage_context: ModelUsageContext,
+        model_type: ModelType,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -32,14 +38,19 @@ impl AgentModelSelector {
                let fs = fs.clone();
                language_model_selector(
                    {
-                        let model_context = model_usage_context.clone();
-                        move |cx| model_context.configured_model(cx)
+                        let model_type = model_type.clone();
+                        move |cx| match &model_type {
+                            ModelType::Default(thread) => thread.read(cx).configured_model(),
+                            ModelType::InlineAssistant => {
+                                LanguageModelRegistry::read_global(cx).inline_assistant_model()
+                            }
+                        }
                    },
                    move |model, cx| {
                        let provider = model.provider_id().0.to_string();
                        let model_id = model.id().0.to_string();
-                        match &model_usage_context {
-                            ModelUsageContext::Thread(thread) => {
+                        match &model_type {
+                            ModelType::Default(thread) => {
                                thread.update(cx, |thread, cx| {
                                    let registry = LanguageModelRegistry::read_global(cx);
                                    if let Some(provider) = registry.provider(&model.provider_id())
@@ -61,7 +72,7 @@ impl AgentModelSelector {
                                    },
                                );
                            }
-                            ModelUsageContext::InlineAssistant => {
+                            ModelType::InlineAssistant => {
                                update_settings_file::<AgentSettings>(
                                    fs.clone(),
                                    cx,
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -734,7 +734,6 @@ impl Display for RulesContext {
 #[derive(Debug, Clone)]
 pub struct ImageContext {
    pub project_path: Option<ProjectPath>,
-    pub full_path: Option<Arc<Path>>,
    pub original_image: Arc<gpui::Image>,
    // TODO: handle this elsewhere and remove `ignore-interior-mutability` opt-out in clippy.toml
    // needed due to a false positive of `clippy::mutable_key_type`.
@@ -745,7 +744,6 @@ pub struct ImageContext {
 pub enum ImageStatus {
    Loading,
    Error,
-    Warning,
    Ready,
 }

@@ -762,17 +760,11 @@ impl ImageContext {
        self.image_task.clone().now_or_never().flatten()
    }

-    pub fn status(&self, model: Option<&Arc<dyn language_model::LanguageModel>>) -> ImageStatus {
+    pub fn status(&self) -> ImageStatus {
        match self.image_task.clone().now_or_never() {
            None => ImageStatus::Loading,
            Some(None) => ImageStatus::Error,
-            Some(Some(_)) => {
-                if model.is_some_and(|model| !model.supports_images()) {
-                    ImageStatus::Warning
-                } else {
-                    ImageStatus::Ready
-                }
-            }
+            Some(Some(_)) => ImageStatus::Ready,
        }
    }

--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -14,7 +14,7 @@ use http_client::HttpClientWithUrl;
 use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::{Completion, CompletionIntent, CompletionResponse, ProjectPath, Symbol, WorktreeId};
+use project::{Completion, CompletionIntent, ProjectPath, Symbol, WorktreeId};
 use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
@@ -746,7 +746,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        _trigger: CompletionContext,
        _window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<Completion>>>> {
        let state = buffer.update(cx, |buffer, _cx| {
            let position = buffer_position.to_point(buffer);
            let line_start = Point::new(position.row, 0);
@@ -756,13 +756,13 @@ impl CompletionProvider for ContextPickerCompletionProvider {
            MentionCompletion::try_parse(line, offset_to_line)
        });
        let Some(state) = state else {
-            return Task::ready(Ok(Vec::new()));
+            return Task::ready(Ok(None));
        };

        let Some((workspace, context_store)) =
            self.workspace.upgrade().zip(self.context_store.upgrade())
        else {
-            return Task::ready(Ok(Vec::new()));
+            return Task::ready(Ok(None));
        };

        let snapshot = buffer.read(cx).snapshot();
@@ -815,10 +815,10 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        cx.spawn(async move |_, cx| {
            let matches = search_task.await;
            let Some(editor) = editor.upgrade() else {
-                return Ok(Vec::new());
+                return Ok(None);
            };

-            let completions = cx.update(|cx| {
+            Ok(Some(cx.update(|cx| {
                matches
                    .into_iter()
                    .filter_map(|mat| match mat {
@@ -901,14 +901,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                        ),
                    })
                    .collect()
-            })?;
-
-            Ok(vec![CompletionResponse {
-                completions,
-                // Since this does its own filtering (see `filter_completions()` returns false),
-                // there is no benefit to computing whether this set of completions is incomplete.
-                is_incomplete: true,
-            }])
+            })?))
        })
    }

@@ -926,9 +919,8 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        &self,
        buffer: &Entity<language::Buffer>,
        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        _menu_is_open: bool,
+        _: &str,
+        _: bool,
        cx: &mut Context<Editor>,
    ) -> bool {
        let buffer = buffer.read(cx);
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -51,10 +51,6 @@ impl Tool for ContextServerTool {
        true
    }

-    fn may_perform_edits(&self) -> bool {
-        true
-    }
-
    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
        let mut schema = self.tool.input_schema.clone();
        assistant_tool::adapt_schema_to_format(&mut schema, format)?;
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -7,7 +7,7 @@ use assistant_context_editor::AssistantContext;
 use collections::{HashSet, IndexSet};
 use futures::{self, FutureExt};
 use gpui::{App, Context, Entity, EventEmitter, Image, SharedString, Task, WeakEntity};
-use language::{Buffer, File as _};
+use language::Buffer;
 use language_model::LanguageModelImage;
 use project::image_store::is_image_file;
 use project::{Project, ProjectItem, ProjectPath, Symbol};
@@ -304,13 +304,11 @@ impl ContextStore {
                project.open_image(project_path.clone(), cx)
            })?;
            let image_item = open_image_task.await?;
-
+            let image = image_item.read_with(cx, |image_item, _| image_item.image.clone())?;
            this.update(cx, |this, cx| {
-                let item = image_item.read(cx);
                this.insert_image(
-                    Some(item.project_path(cx)),
-                    Some(item.file.full_path(cx).into()),
-                    item.image.clone(),
+                    Some(image_item.read(cx).project_path(cx)),
+                    image,
                    remove_if_exists,
                    cx,
                )
@@ -319,13 +317,12 @@ impl ContextStore {
    }

    pub fn add_image_instance(&mut self, image: Arc<Image>, cx: &mut Context<ContextStore>) {
-        self.insert_image(None, None, image, false, cx);
+        self.insert_image(None, image, false, cx);
    }

    fn insert_image(
        &mut self,
        project_path: Option<ProjectPath>,
-        full_path: Option<Arc<Path>>,
        image: Arc<Image>,
        remove_if_exists: bool,
        cx: &mut Context<ContextStore>,
@@ -333,7 +330,6 @@ impl ContextStore {
        let image_task = LanguageModelImage::from_image(image.clone(), cx).shared();
        let context = AgentContextHandle::Image(ImageContext {
            project_path,
-            full_path,
            original_image: image,
            image_task,
            context_id: self.next_context_id.post_inc(),
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -23,7 +23,7 @@ use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::ui::{AddedContext, ContextPill};
 use crate::{
    AcceptSuggestedContext, AgentPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
-    ModelUsageContext, RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
+    RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
 };

 pub struct ContextStrip {
@@ -37,7 +37,6 @@ pub struct ContextStrip {
    _subscriptions: Vec<Subscription>,
    focused_index: Option<usize>,
    children_bounds: Option<Vec<Bounds<Pixels>>>,
-    model_usage_context: ModelUsageContext,
 }

 impl ContextStrip {
@@ -48,7 +47,6 @@ impl ContextStrip {
        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
        suggest_context_kind: SuggestContextKind,
-        model_usage_context: ModelUsageContext,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -83,7 +81,6 @@ impl ContextStrip {
            _subscriptions: subscriptions,
            focused_index: None,
            children_bounds: None,
-            model_usage_context,
        }
    }

@@ -101,20 +98,11 @@ impl ContextStrip {
                .as_ref()
                .and_then(|thread_store| thread_store.upgrade())
                .and_then(|thread_store| thread_store.read(cx).prompt_store().as_ref());
-
-            let current_model = self.model_usage_context.language_model(cx);
-
            self.context_store
                .read(cx)
                .context()
                .flat_map(|context| {
-                    AddedContext::new_pending(
-                        context.clone(),
-                        prompt_store,
-                        project,
-                        current_model.as_ref(),
-                        cx,
-                    )
+                    AddedContext::new_pending(context.clone(), prompt_store, project, cx)
                })
                .collect::<Vec<_>>()
        } else {
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -152,7 +152,7 @@ impl HistoryStore {
                    let entries = join_all(entries)
                        .await
                        .into_iter()
-                        .filter_map(|result| result.log_with_level(log::Level::Debug))
+                        .filter_map(|result| result.log_err())
                        .collect::<VecDeque<_>>();

                    this.update(cx, |this, _| {
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -1,4 +1,4 @@
-use crate::agent_model_selector::AgentModelSelector;
+use crate::agent_model_selector::{AgentModelSelector, ModelType};
 use crate::buffer_codegen::BufferCodegen;
 use crate::context::ContextCreasesAddon;
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
@@ -7,13 +7,12 @@ use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::{TextThreadStore, ThreadStore};
-use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
+use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
 use crate::{RemoveAllContext, ToggleContextPicker};
 use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use client::ErrorExt;
 use collections::VecDeque;
 use db::kvp::Dismissable;
-use editor::actions::Paste;
 use editor::display_map::EditorMargins;
 use editor::{
    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
@@ -100,7 +99,6 @@ impl<T: 'static> Render for PromptEditor<T> {

        v_flex()
            .key_context("PromptEditor")
-            .capture_action(cx.listener(Self::paste))
            .bg(cx.theme().colors().editor_background)
            .block_mouse_except_scroll()
            .gap_0p5()
@@ -305,10 +303,6 @@ impl<T: 'static> PromptEditor<T> {
        self.editor.read(cx).text(cx)
    }

-    fn paste(&mut self, _: &Paste, _window: &mut Window, cx: &mut Context<Self>) {
-        crate::active_thread::attach_pasted_images_as_context(&self.context_store, cx);
-    }
-
    fn toggle_rate_limit_notice(
        &mut self,
        _: &ClickEvent,
@@ -918,7 +912,6 @@ impl PromptEditor<BufferCodegen> {
                text_thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
-                ModelUsageContext::InlineAssistant,
                window,
                cx,
            )
@@ -937,7 +930,7 @@ impl PromptEditor<BufferCodegen> {
                    fs,
                    model_selector_menu_handle,
                    prompt_editor.focus_handle(cx),
-                    ModelUsageContext::InlineAssistant,
+                    ModelType::InlineAssistant,
                    window,
                    cx,
                )
@@ -1090,7 +1083,6 @@ impl PromptEditor<TerminalCodegen> {
                text_thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
-                ModelUsageContext::InlineAssistant,
                window,
                cx,
            )
@@ -1109,7 +1101,7 @@ impl PromptEditor<TerminalCodegen> {
                    fs,
                    model_selector_menu_handle.clone(),
                    prompt_editor.focus_handle(cx),
-                    ModelUsageContext::InlineAssistant,
+                    ModelType::InlineAssistant,
                    window,
                    cx,
                )
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -2,11 +2,11 @@ use std::collections::BTreeMap;
 use std::rc::Rc;
 use std::sync::Arc;

-use crate::agent_model_selector::AgentModelSelector;
+use crate::agent_model_selector::{AgentModelSelector, ModelType};
 use crate::context::{AgentContextKey, ContextCreasesAddon, ContextLoadResult, load_context};
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use crate::ui::{
-    MaxModeTooltip,
+    AnimatedLabel, MaxModeTooltip,
    preview::{AgentPreview, UsageCallout},
 };
 use agent_settings::{AgentSettings, CompletionMode};
@@ -24,10 +24,10 @@ use fs::Fs;
 use futures::future::Shared;
 use futures::{FutureExt as _, future};
 use gpui::{
-    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, Subscription, Task, TextStyle,
-    WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
+    Animation, AnimationExt, App, ClipboardEntry, Entity, EventEmitter, Focusable, Subscription,
+    Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
-use language::{Buffer, Language, Point};
+use language::{Buffer, Language};
 use language_model::{
    ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
    ZED_CLOUD_PROVIDER_ID,
@@ -51,9 +51,9 @@ use crate::profile_selector::ProfileSelector;
 use crate::thread::{MessageCrease, Thread, TokenUsageRatio};
 use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::{
-    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
-    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
-    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
+    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, NewThread,
+    OpenAgentDiff, RemoveAllContext, ToggleBurnMode, ToggleContextPicker, ToggleProfileSelector,
+    register_agent_preview,
 };

 #[derive(RegisterComponent)]
@@ -112,7 +112,6 @@ pub(crate) fn create_editor(
        editor.set_placeholder_text("Message the agent – @ to include context", cx);
        editor.set_show_indent_guides(false, cx);
        editor.set_soft_wrap();
-        editor.set_use_modal_editing(true);
        editor.set_context_menu_options(ContextMenuOptions {
            min_entries_visible: 12,
            max_entries_visible: 12,
@@ -169,7 +168,6 @@ impl MessageEditor {
                Some(text_thread_store.clone()),
                context_picker_menu_handle.clone(),
                SuggestContextKind::File,
-                ModelUsageContext::Thread(thread.clone()),
                window,
                cx,
            )
@@ -198,7 +196,7 @@ impl MessageEditor {
                fs.clone(),
                model_selector_menu_handle,
                editor.focus_handle(cx),
-                ModelUsageContext::Thread(thread.clone()),
+                ModelType::Default(thread.clone()),
                window,
                cx,
            )
@@ -432,24 +430,39 @@ impl MessageEditor {
    }

    fn paste(&mut self, _: &Paste, _: &mut Window, cx: &mut Context<Self>) {
-        crate::active_thread::attach_pasted_images_as_context(&self.context_store, cx);
+        let images = cx
+            .read_from_clipboard()
+            .map(|item| {
+                item.into_entries()
+                    .filter_map(|entry| {
+                        if let ClipboardEntry::Image(image) = entry {
+                            Some(image)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        if images.is_empty() {
+            return;
+        }
+        cx.stop_propagation();
+
+        self.context_store.update(cx, |store, cx| {
+            for image in images {
+                store.add_image_instance(Arc::new(image), cx);
+            }
+        });
    }

    fn handle_review_click(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
        self.edits_expanded = true;
        AgentDiffPane::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
        cx.notify();
    }

-    fn handle_edit_bar_expand(&mut self, cx: &mut Context<Self>) {
-        self.edits_expanded = !self.edits_expanded;
-        cx.notify();
-    }
-
    fn handle_file_click(
        &self,
        buffer: Entity<Buffer>,
@@ -480,40 +493,6 @@ impl MessageEditor {
        });
    }

-    fn handle_accept_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        self.thread.update(cx, |thread, cx| {
-            thread.keep_all_edits(cx);
-        });
-        cx.notify();
-    }
-
-    fn handle_reject_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread.read(cx).has_pending_edit_tool_uses() {
-            return;
-        }
-
-        // Since there's no reject_all_edits method in the thread API,
-        // we need to iterate through all buffers and reject their edits
-        let action_log = self.thread.read(cx).action_log().clone();
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-
-        for (buffer, _) in changed_buffers {
-            self.thread.update(cx, |thread, cx| {
-                let buffer_snapshot = buffer.read(cx);
-                let start = buffer_snapshot.anchor_before(Point::new(0, 0));
-                let end = buffer_snapshot.anchor_after(buffer_snapshot.max_point());
-                thread
-                    .reject_edits_in_ranges(buffer, vec![start..end], cx)
-                    .detach();
-            });
-        }
-        cx.notify();
-    }
-
    fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();
@@ -635,12 +614,6 @@ impl MessageEditor {
            .on_action(cx.listener(Self::move_up))
            .on_action(cx.listener(Self::expand_message_editor))
            .on_action(cx.listener(Self::toggle_burn_mode))
-            .on_action(
-                cx.listener(|this, _: &KeepAll, window, cx| this.handle_accept_all(window, cx)),
-            )
-            .on_action(
-                cx.listener(|this, _: &RejectAll, window, cx| this.handle_reject_all(window, cx)),
-            )
            .capture_action(cx.listener(Self::paste))
            .gap_2()
            .p_2()
@@ -896,10 +869,7 @@ impl MessageEditor {
        let bg_edit_files_disclosure = editor_bg_color.blend(active_color.opacity(0.3));

        let is_edit_changes_expanded = self.edits_expanded;
-        let thread = self.thread.read(cx);
-        let pending_edits = thread.has_pending_edit_tool_uses();
-
-        const EDIT_NOT_READY_TOOLTIP_LABEL: &str = "Wait until file edits are complete.";
+        let is_generating = self.thread.read(cx).is_generating();

        v_flex()
            .mt_1()
@@ -917,28 +887,31 @@ impl MessageEditor {
            }])
            .child(
                h_flex()
-                    .p_1()
+                    .id("edits-container")
+                    .cursor_pointer()
+                    .p_1p5()
                    .justify_between()
                    .when(is_edit_changes_expanded, |this| {
                        this.border_b_1().border_color(border_color)
                    })
+                    .on_click(
+                        cx.listener(|this, _, window, cx| this.handle_review_click(window, cx)),
+                    )
                    .child(
                        h_flex()
-                            .id("edits-container")
-                            .cursor_pointer()
-                            .w_full()
                            .gap_1()
                            .child(
                                Disclosure::new("edits-disclosure", is_edit_changes_expanded)
-                                    .on_click(cx.listener(|this, _, _, cx| {
-                                        this.handle_edit_bar_expand(cx)
+                                    .on_click(cx.listener(|this, _ev, _window, cx| {
+                                        this.edits_expanded = !this.edits_expanded;
+                                        cx.notify();
                                    })),
                            )
                            .map(|this| {
-                                if pending_edits {
+                                if is_generating {
                                    this.child(
-                                        Label::new(format!(
-                                            "Editing {} {}…",
+                                        AnimatedLabel::new(format!(
+                                            "Editing {} {}",
                                            changed_buffers.len(),
                                            if changed_buffers.len() == 1 {
                                                "file"
@@ -946,15 +919,7 @@ impl MessageEditor {
                                                "files"
                                            }
                                        ))
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small)
-                                        .with_animation(
-                                            "edit-label",
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.3, 0.7)),
-                                            |label, delta| label.alpha(delta),
-                                        ),
+                                        .size(LabelSize::Small),
                                    )
                                } else {
                                    this.child(
@@ -979,74 +944,23 @@ impl MessageEditor {
                                        .color(Color::Muted),
                                    )
                                }
-                            })
-                            .on_click(
-                                cx.listener(|this, _, _, cx| this.handle_edit_bar_expand(cx)),
-                            ),
+                            }),
                    )
                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                IconButton::new("review-changes", IconName::ListTodo)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip({
-                                        let focus_handle = focus_handle.clone();
-                                        move |window, cx| {
-                                            Tooltip::for_action_in(
-                                                "Review Changes",
-                                                &OpenAgentDiff,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_review_click(window, cx)
-                                    })),
+                        Button::new("review", "Review Changes")
+                            .label_size(LabelSize::Small)
+                            .key_binding(
+                                KeyBinding::for_action_in(
+                                    &OpenAgentDiff,
+                                    &focus_handle,
+                                    window,
+                                    cx,
+                                )
+                                .map(|kb| kb.size(rems_from_px(12.))),
                            )
-                            .child(ui::Divider::vertical().color(ui::DividerColor::Border))
-                            .child(
-                                Button::new("reject-all-changes", "Reject All")
-                                    .label_size(LabelSize::Small)
-                                    .disabled(pending_edits)
-                                    .when(pending_edits, |this| {
-                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                                    })
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &RejectAll,
-                                            &focus_handle.clone(),
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                    )
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_reject_all(window, cx)
-                                    })),
-                            )
-                            .child(
-                                Button::new("accept-all-changes", "Accept All")
-                                    .label_size(LabelSize::Small)
-                                    .disabled(pending_edits)
-                                    .when(pending_edits, |this| {
-                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                                    })
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &KeepAll,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                    )
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.handle_accept_all(window, cx)
-                                    })),
-                            ),
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.handle_review_click(window, cx)
+                            })),
                    ),
            )
            .when(is_edit_changes_expanded, |parent| {
--- a/crates/agent/src/terminal_codegen.rs
+++ b/crates/agent/src/terminal_codegen.rs
@@ -179,17 +179,18 @@ impl TerminalTransaction {
        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
        let input = Self::sanitize_input(hunk);
        self.terminal
-            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
+            .update(cx, |terminal, _| terminal.input(input));
    }

    pub fn undo(&self, cx: &mut App) {
        self.terminal
-            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
+            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
    }

    pub fn complete(&self, cx: &mut App) {
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
+        self.terminal.update(cx, |terminal, _| {
+            terminal.input(CARRIAGE_RETURN.to_string())
+        });
    }

    fn sanitize_input(mut input: String) -> String {
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -106,7 +106,7 @@ impl TerminalInlineAssistant {
        });
        let prompt_editor_render = prompt_editor.clone();
        let block = terminal_view::BlockProperties {
-            height: 4,
+            height: 2,
            render: Box::new(move |_| prompt_editor_render.clone().into_any_element()),
        };
        terminal_view.update(cx, |terminal_view, cx| {
@@ -202,7 +202,7 @@ impl TerminalInlineAssistant {
            .update(cx, |terminal, cx| {
                terminal
                    .terminal()
-                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
+                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
            })
            .log_err();

--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -871,16 +871,7 @@ impl Thread {
        self.tool_use
            .pending_tool_uses()
            .iter()
-            .all(|pending_tool_use| pending_tool_use.status.is_error())
-    }
-
-    /// Returns whether any pending tool uses may perform edits
-    pub fn has_pending_edit_tool_uses(&self) -> bool {
-        self.tool_use
-            .pending_tool_uses()
-            .iter()
-            .filter(|pending_tool_use| !pending_tool_use.status.is_error())
-            .any(|pending_tool_use| pending_tool_use.may_perform_edits)
+            .all(|tool_use| tool_use.status.is_error())
    }

    pub fn tool_uses_for_message(&self, id: MessageId, cx: &App) -> Vec<ToolUse> {
@@ -1032,7 +1023,6 @@ impl Thread {
        id: MessageId,
        new_role: Role,
        new_segments: Vec<MessageSegment>,
-        creases: Vec<MessageCrease>,
        loaded_context: Option<LoadedContext>,
        checkpoint: Option<GitStoreCheckpoint>,
        cx: &mut Context<Self>,
@@ -1042,7 +1032,6 @@ impl Thread {
        };
        message.role = new_role;
        message.segments = new_segments;
-        message.creases = creases;
        if let Some(context) = loaded_context {
            message.loaded_context = context;
        }
@@ -1684,7 +1673,6 @@ impl Thread {
                                        }
                                        CompletionRequestStatus::ToolUseLimitReached => {
                                            thread.tool_use_limit_reached = true;
-                                            cx.emit(ThreadEvent::ToolUseLimitReached);
                                        }
                                    }
                                }
@@ -2855,7 +2843,6 @@ pub enum ThreadEvent {
    },
    CheckpointChanged,
    ToolConfirmationNeeded,
-    ToolUseLimitReached,
    CancelEditing,
    CompletionCanceled,
 }
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,7 +1,8 @@
+use std::borrow::Cow;
 use std::cell::{Ref, RefCell};
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;

 use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
@@ -16,7 +17,8 @@ use gpui::{
    App, BackgroundExecutor, Context, Entity, EventEmitter, Global, ReadGlobal, SharedString,
    Subscription, Task, prelude::*,
 };
-
+use heed::Database;
+use heed::types::SerdeBincode;
 use language_model::{LanguageModelToolResultContent, LanguageModelToolUseId, Role, TokenUsage};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
@@ -33,52 +35,14 @@ use crate::context_server_tool::ContextServerTool;
 use crate::thread::{
    DetailedSummaryState, ExceededWindowError, MessageId, ProjectSnapshot, Thread, ThreadId,
 };
-use indoc::indoc;
-use sqlez::{
-    bindable::{Bind, Column},
-    connection::Connection,
-    statement::Statement,
-};

-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DataType {
-    #[serde(rename = "json")]
-    Json,
-    #[serde(rename = "zstd")]
-    Zstd,
-}
-
-impl Bind for DataType {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let value = match self {
-            DataType::Json => "json",
-            DataType::Zstd => "zstd",
-        };
-        value.bind(statement, start_index)
-    }
-}
-
-impl Column for DataType {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (value, next_index) = String::column(statement, start_index)?;
-        let data_type = match value.as_str() {
-            "json" => DataType::Json,
-            "zstd" => DataType::Zstd,
-            _ => anyhow::bail!("Unknown data type: {}", value),
-        };
-        Ok((data_type, next_index))
-    }
-}
-
-const RULES_FILE_NAMES: [&'static str; 8] = [
+const RULES_FILE_NAMES: [&'static str; 6] = [
    ".rules",
    ".cursorrules",
    ".windsurfrules",
    ".clinerules",
    ".github/copilot-instructions.md",
    "CLAUDE.md",
-    "AGENT.md",
-    "AGENTS.md",
 ];

 pub fn init(cx: &mut App) {
@@ -902,27 +866,25 @@ impl Global for GlobalThreadsDatabase {}

 pub(crate) struct ThreadsDatabase {
    executor: BackgroundExecutor,
-    connection: Arc<Mutex<Connection>>,
+    env: heed::Env,
+    threads: Database<SerdeBincode<ThreadId>, SerializedThread>,
 }

-impl ThreadsDatabase {
-    fn connection(&self) -> Arc<Mutex<Connection>> {
-        self.connection.clone()
-    }
+impl heed::BytesEncode<'_> for SerializedThread {
+    type EItem = SerializedThread;

-    const COMPRESSION_LEVEL: i32 = 3;
-}
-
-impl Bind for ThreadId {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.to_string().bind(statement, start_index)
+    fn bytes_encode(item: &Self::EItem) -> Result<Cow<[u8]>, heed::BoxedError> {
+        serde_json::to_vec(item).map(Cow::Owned).map_err(Into::into)
    }
 }

-impl Column for ThreadId {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (id_str, next_index) = String::column(statement, start_index)?;
-        Ok((ThreadId::from(id_str.as_str()), next_index))
+impl<'a> heed::BytesDecode<'a> for SerializedThread {
+    type DItem = SerializedThread;
+
+    fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
+        // We implement this type manually because we want to call `SerializedThread::from_json`,
+        // instead of the Deserialize trait implementation for `SerializedThread`.
+        SerializedThread::from_json(bytes).map_err(Into::into)
    }
 }

@@ -938,8 +900,8 @@ impl ThreadsDatabase {
        let database_future = executor
            .spawn({
                let executor = executor.clone();
-                let threads_dir = paths::data_dir().join("threads");
-                async move { ThreadsDatabase::new(threads_dir, executor) }
+                let database_path = paths::data_dir().join("threads/threads-db.1.mdb");
+                async move { ThreadsDatabase::new(database_path, executor) }
            })
            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
            .boxed()
@@ -948,144 +910,41 @@ impl ThreadsDatabase {
        cx.set_global(GlobalThreadsDatabase(database_future));
    }

-    pub fn new(threads_dir: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
-        std::fs::create_dir_all(&threads_dir)?;
-
-        let sqlite_path = threads_dir.join("threads.db");
-        let mdb_path = threads_dir.join("threads-db.1.mdb");
-
-        let needs_migration_from_heed = mdb_path.exists();
-
-        let connection = Connection::open_file(&sqlite_path.to_string_lossy());
-
-        connection.exec(indoc! {"
-                CREATE TABLE IF NOT EXISTS threads (
-                    id TEXT PRIMARY KEY,
-                    summary TEXT NOT NULL,
-                    updated_at TEXT NOT NULL,
-                    data_type TEXT NOT NULL,
-                    data BLOB NOT NULL
-                )
-            "})?()
-        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
-
-        let db = Self {
-            executor: executor.clone(),
-            connection: Arc::new(Mutex::new(connection)),
-        };
-
-        if needs_migration_from_heed {
-            let db_connection = db.connection();
-            let executor_clone = executor.clone();
-            executor
-                .spawn(async move {
-                    log::info!("Starting threads.db migration");
-                    Self::migrate_from_heed(&mdb_path, db_connection, executor_clone)?;
-                    std::fs::remove_dir_all(mdb_path)?;
-                    log::info!("threads.db migrated to sqlite");
-                    Ok::<(), anyhow::Error>(())
-                })
-                .detach();
-        }
-
-        Ok(db)
-    }
-
-    // Remove this migration after 2025-09-01
-    fn migrate_from_heed(
-        mdb_path: &Path,
-        connection: Arc<Mutex<Connection>>,
-        _executor: BackgroundExecutor,
-    ) -> Result<()> {
-        use heed::types::SerdeBincode;
-        struct SerializedThreadHeed(SerializedThread);
-
-        impl heed::BytesEncode<'_> for SerializedThreadHeed {
-            type EItem = SerializedThreadHeed;
-
-            fn bytes_encode(
-                item: &Self::EItem,
-            ) -> Result<std::borrow::Cow<[u8]>, heed::BoxedError> {
-                serde_json::to_vec(&item.0)
-                    .map(std::borrow::Cow::Owned)
-                    .map_err(Into::into)
-            }
-        }
-
-        impl<'a> heed::BytesDecode<'a> for SerializedThreadHeed {
-            type DItem = SerializedThreadHeed;
-
-            fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
-                SerializedThread::from_json(bytes)
-                    .map(SerializedThreadHeed)
-                    .map_err(Into::into)
-            }
-        }
+    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
+        std::fs::create_dir_all(&path)?;

        const ONE_GB_IN_BYTES: usize = 1024 * 1024 * 1024;
-
        let env = unsafe {
            heed::EnvOpenOptions::new()
                .map_size(ONE_GB_IN_BYTES)
                .max_dbs(1)
-                .open(mdb_path)?
+                .open(path)?
        };

-        let txn = env.write_txn()?;
-        let threads: heed::Database<SerdeBincode<ThreadId>, SerializedThreadHeed> = env
-            .open_database(&txn, Some("threads"))?
-            .ok_or_else(|| anyhow!("threads database not found"))?;
+        let mut txn = env.write_txn()?;
+        let threads = env.create_database(&mut txn, Some("threads"))?;
+        txn.commit()?;

-        for result in threads.iter(&txn)? {
-            let (thread_id, thread_heed) = result?;
-            Self::save_thread_sync(&connection, thread_id, thread_heed.0)?;
-        }
-
-        Ok(())
-    }
-
-    fn save_thread_sync(
-        connection: &Arc<Mutex<Connection>>,
-        id: ThreadId,
-        thread: SerializedThread,
-    ) -> Result<()> {
-        let json_data = serde_json::to_string(&thread)?;
-        let summary = thread.summary.to_string();
-        let updated_at = thread.updated_at.to_rfc3339();
-
-        let connection = connection.lock().unwrap();
-
-        let compressed = zstd::encode_all(json_data.as_bytes(), Self::COMPRESSION_LEVEL)?;
-        let data_type = DataType::Zstd;
-        let data = compressed;
-
-        let mut insert = connection.exec_bound::<(ThreadId, String, String, DataType, Vec<u8>)>(indoc! {"
-            INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
-        "})?;
-
-        insert((id, summary, updated_at, data_type, data))?;
-
-        Ok(())
+        Ok(Self {
+            executor,
+            env,
+            threads,
+        })
    }

    pub fn list_threads(&self) -> Task<Result<Vec<SerializedThreadMetadata>>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;

        self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-            let mut select =
-                connection.select_bound::<(), (ThreadId, String, String)>(indoc! {"
-                SELECT id, summary, updated_at FROM threads ORDER BY updated_at DESC
-            "})?;
-
-            let rows = select(())?;
+            let txn = env.read_txn()?;
+            let mut iter = threads.iter(&txn)?;
            let mut threads = Vec::new();
-
-            for (id, summary, updated_at) in rows {
+            while let Some((key, value)) = iter.next().transpose()? {
                threads.push(SerializedThreadMetadata {
-                    id,
-                    summary: summary.into(),
-                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
+                    id: key,
+                    summary: value.summary,
+                    updated_at: value.updated_at,
                });
            }

@@ -1094,51 +953,36 @@ impl ThreadsDatabase {
    }

    pub fn try_find_thread(&self, id: ThreadId) -> Task<Result<Option<SerializedThread>>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;

        self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-            let mut select = connection.select_bound::<ThreadId, (DataType, Vec<u8>)>(indoc! {"
-                SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
-            "})?;
-
-            let rows = select(id)?;
-            if let Some((data_type, data)) = rows.into_iter().next() {
-                let json_data = match data_type {
-                    DataType::Zstd => {
-                        let decompressed = zstd::decode_all(&data[..])?;
-                        String::from_utf8(decompressed)?
-                    }
-                    DataType::Json => String::from_utf8(data)?,
-                };
-
-                let thread = SerializedThread::from_json(json_data.as_bytes())?;
-                Ok(Some(thread))
-            } else {
-                Ok(None)
-            }
+            let txn = env.read_txn()?;
+            let thread = threads.get(&txn, &id)?;
+            Ok(thread)
        })
    }

    pub fn save_thread(&self, id: ThreadId, thread: SerializedThread) -> Task<Result<()>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;

-        self.executor
-            .spawn(async move { Self::save_thread_sync(&connection, id, thread) })
+        self.executor.spawn(async move {
+            let mut txn = env.write_txn()?;
+            threads.put(&mut txn, &id, &thread)?;
+            txn.commit()?;
+            Ok(())
+        })
    }

    pub fn delete_thread(&self, id: ThreadId) -> Task<Result<()>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;

        self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-
-            let mut delete = connection.exec_bound::<ThreadId>(indoc! {"
-                DELETE FROM threads WHERE id = ?
-            "})?;
-
-            delete(id)?;
-
+            let mut txn = env.write_txn()?;
+            threads.delete(&mut txn, &id)?;
+            txn.commit()?;
            Ok(())
        })
    }
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -337,12 +337,6 @@ impl ToolUseState {
            )
            .into();

-        let may_perform_edits = self
-            .tools
-            .read(cx)
-            .tool(&tool_use.name, cx)
-            .is_some_and(|tool| tool.may_perform_edits());
-
        self.pending_tool_uses_by_id.insert(
            tool_use.id.clone(),
            PendingToolUse {
@@ -351,7 +345,6 @@ impl ToolUseState {
                name: tool_use.name.clone(),
                ui_text: ui_text.clone(),
                input: tool_use.input,
-                may_perform_edits,
                status,
            },
        );
@@ -525,7 +518,6 @@ pub struct PendingToolUse {
    pub ui_text: Arc<str>,
    pub input: serde_json::Value,
    pub status: PendingToolUseStatus,
-    pub may_perform_edits: bool,
 }

 #[derive(Debug, Clone)]
--- a/crates/agent/src/ui/context_pill.rs
+++ b/crates/agent/src/ui/context_pill.rs
@@ -93,9 +93,20 @@ impl ContextPill {
            Self::Suggested {
                icon_path: Some(icon_path),
                ..
+            }
+            | Self::Added {
+                context:
+                    AddedContext {
+                        icon_path: Some(icon_path),
+                        ..
+                    },
+                ..
            } => Icon::from_path(icon_path),
-            Self::Suggested { kind, .. } => Icon::new(kind.icon()),
-            Self::Added { context, .. } => context.icon(),
+            Self::Suggested { kind, .. }
+            | Self::Added {
+                context: AddedContext { kind, .. },
+                ..
+            } => Icon::new(kind.icon()),
        }
    }
 }
@@ -122,7 +133,6 @@ impl RenderOnce for ContextPill {
                on_click,
            } => {
                let status_is_error = matches!(context.status, ContextStatus::Error { .. });
-                let status_is_warning = matches!(context.status, ContextStatus::Warning { .. });

                base_pill
                    .pr(if on_remove.is_some() { px(2.) } else { px(4.) })
@@ -130,9 +140,6 @@ impl RenderOnce for ContextPill {
                        if status_is_error {
                            pill.bg(cx.theme().status().error_background)
                                .border_color(cx.theme().status().error_border)
-                        } else if status_is_warning {
-                            pill.bg(cx.theme().status().warning_background)
-                                .border_color(cx.theme().status().warning_border)
                        } else if *focused {
                            pill.bg(color.element_background)
                                .border_color(color.border_focused)
@@ -188,8 +195,7 @@ impl RenderOnce for ContextPill {
                                        |label, delta| label.opacity(delta),
                                    )
                                    .into_any_element(),
-                                ContextStatus::Warning { message }
-                                | ContextStatus::Error { message } => element
+                                ContextStatus::Error { message } => element
                                    .tooltip(ui::Tooltip::text(message.clone()))
                                    .into_any_element(),
                            }),
@@ -264,7 +270,6 @@ pub enum ContextStatus {
    Ready,
    Loading { message: SharedString },
    Error { message: SharedString },
-    Warning { message: SharedString },
 }

 #[derive(RegisterComponent)]
@@ -280,19 +285,6 @@ pub struct AddedContext {
 }

 impl AddedContext {
-    pub fn icon(&self) -> Icon {
-        match &self.status {
-            ContextStatus::Warning { .. } => Icon::new(IconName::Warning).color(Color::Warning),
-            ContextStatus::Error { .. } => Icon::new(IconName::XCircle).color(Color::Error),
-            _ => {
-                if let Some(icon_path) = &self.icon_path {
-                    Icon::from_path(icon_path)
-                } else {
-                    Icon::new(self.kind.icon())
-                }
-            }
-        }
-    }
    /// Creates an `AddedContext` by retrieving relevant details of `AgentContext`. This returns a
    /// `None` if `DirectoryContext` or `RulesContext` no longer exist.
    ///
@@ -301,7 +293,6 @@ impl AddedContext {
        handle: AgentContextHandle,
        prompt_store: Option<&Entity<PromptStore>>,
        project: &Project,
-        model: Option<&Arc<dyn language_model::LanguageModel>>,
        cx: &App,
    ) -> Option<AddedContext> {
        match handle {
@@ -313,15 +304,11 @@ impl AddedContext {
            AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
            AgentContextHandle::TextThread(handle) => Some(Self::pending_text_thread(handle, cx)),
            AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
-            AgentContextHandle::Image(handle) => Some(Self::image(handle, model, cx)),
+            AgentContextHandle::Image(handle) => Some(Self::image(handle)),
        }
    }

-    pub fn new_attached(
-        context: &AgentContext,
-        model: Option<&Arc<dyn language_model::LanguageModel>>,
-        cx: &App,
-    ) -> AddedContext {
+    pub fn new_attached(context: &AgentContext, cx: &App) -> AddedContext {
        match context {
            AgentContext::File(context) => Self::attached_file(context, cx),
            AgentContext::Directory(context) => Self::attached_directory(context),
@@ -331,7 +318,7 @@ impl AddedContext {
            AgentContext::Thread(context) => Self::attached_thread(context),
            AgentContext::TextThread(context) => Self::attached_text_thread(context),
            AgentContext::Rules(context) => Self::attached_rules(context),
-            AgentContext::Image(context) => Self::image(context.clone(), model, cx),
+            AgentContext::Image(context) => Self::image(context.clone()),
        }
    }

@@ -346,8 +333,14 @@ impl AddedContext {

    fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let (name, parent) =
-            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+        let name = full_path
+            .file_name()
+            .map(|n| n.to_string_lossy().into_owned().into())
+            .unwrap_or_else(|| full_path_string.clone());
+        let parent = full_path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|n| n.to_string_lossy().into_owned().into());
        AddedContext {
            kind: ContextKind::File,
            name,
@@ -377,8 +370,14 @@ impl AddedContext {

    fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let (name, parent) =
-            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+        let name = full_path
+            .file_name()
+            .map(|n| n.to_string_lossy().into_owned().into())
+            .unwrap_or_else(|| full_path_string.clone());
+        let parent = full_path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|n| n.to_string_lossy().into_owned().into());
        AddedContext {
            kind: ContextKind::Directory,
            name,
@@ -606,45 +605,22 @@ impl AddedContext {
        }
    }

-    fn image(
-        context: ImageContext,
-        model: Option<&Arc<dyn language_model::LanguageModel>>,
-        cx: &App,
-    ) -> AddedContext {
-        let (name, parent, icon_path) = if let Some(full_path) = context.full_path.as_ref() {
-            let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-            let (name, parent) =
-                extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
-            let icon_path = FileIcons::get_icon(&full_path, cx);
-            (name, parent, icon_path)
-        } else {
-            ("Image".into(), None, None)
-        };
-
-        let status = match context.status(model) {
-            ImageStatus::Loading => ContextStatus::Loading {
-                message: "Loading…".into(),
-            },
-            ImageStatus::Error => ContextStatus::Error {
-                message: "Failed to load Image".into(),
-            },
-            ImageStatus::Warning => ContextStatus::Warning {
-                message: format!(
-                    "{} doesn't support attaching Images as Context",
-                    model.map(|m| m.name().0).unwrap_or_else(|| "Model".into())
-                )
-                .into(),
-            },
-            ImageStatus::Ready => ContextStatus::Ready,
-        };
-
+    fn image(context: ImageContext) -> AddedContext {
        AddedContext {
            kind: ContextKind::Image,
-            name,
-            parent,
+            name: "Image".into(),
+            parent: None,
            tooltip: None,
-            icon_path,
-            status,
+            icon_path: None,
+            status: match context.status() {
+                ImageStatus::Loading => ContextStatus::Loading {
+                    message: "Loading…".into(),
+                },
+                ImageStatus::Error => ContextStatus::Error {
+                    message: "Failed to load image".into(),
+                },
+                ImageStatus::Ready => ContextStatus::Ready,
+            },
            render_hover: Some(Rc::new({
                let image = context.original_image.clone();
                move |_, cx| {
@@ -663,22 +639,6 @@ impl AddedContext {
    }
 }

-fn extract_file_name_and_directory_from_full_path(
-    path: &Path,
-    name_fallback: &SharedString,
-) -> (SharedString, Option<SharedString>) {
-    let name = path
-        .file_name()
-        .map(|n| n.to_string_lossy().into_owned().into())
-        .unwrap_or_else(|| name_fallback.clone());
-    let parent = path
-        .parent()
-        .and_then(|p| p.file_name())
-        .map(|n| n.to_string_lossy().into_owned().into());
-
-    (name, parent)
-}
-
 #[derive(Debug, Clone)]
 struct ContextFileExcerpt {
    pub file_name_and_range: SharedString,
@@ -805,52 +765,37 @@ impl Component for AddedContext {
        let mut next_context_id = ContextId::zero();
        let image_ready = (
            "Ready",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-                },
-                None,
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
+            }),
        );

        let image_loading = (
            "Loading",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: cx
-                        .background_spawn(async move {
-                            smol::Timer::after(Duration::from_secs(60 * 5)).await;
-                            Some(LanguageModelImage::empty())
-                        })
-                        .shared(),
-                },
-                None,
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: cx
+                    .background_spawn(async move {
+                        smol::Timer::after(Duration::from_secs(60 * 5)).await;
+                        Some(LanguageModelImage::empty())
+                    })
+                    .shared(),
+            }),
        );

        let image_error = (
            "Error",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(None).shared(),
-                },
-                None,
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: Task::ready(None).shared(),
+            }),
        );

        Some(
@@ -870,60 +815,3 @@ impl Component for AddedContext {
        )
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::App;
-    use language_model::{LanguageModel, fake_provider::FakeLanguageModel};
-    use std::sync::Arc;
-
-    #[gpui::test]
-    fn test_image_context_warning_for_unsupported_model(cx: &mut App) {
-        let model: Arc<dyn LanguageModel> = Arc::new(FakeLanguageModel::default());
-        assert!(!model.supports_images());
-
-        let image_context = ImageContext {
-            context_id: ContextId::zero(),
-            project_path: None,
-            original_image: Arc::new(Image::empty()),
-            image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-            full_path: None,
-        };
-
-        let added_context = AddedContext::image(image_context, Some(&model), cx);
-
-        assert!(matches!(
-            added_context.status,
-            ContextStatus::Warning { .. }
-        ));
-
-        assert!(matches!(added_context.kind, ContextKind::Image));
-        assert_eq!(added_context.name.as_ref(), "Image");
-        assert!(added_context.parent.is_none());
-        assert!(added_context.icon_path.is_none());
-    }
-
-    #[gpui::test]
-    fn test_image_context_ready_for_no_model(cx: &mut App) {
-        let image_context = ImageContext {
-            context_id: ContextId::zero(),
-            project_path: None,
-            original_image: Arc::new(Image::empty()),
-            image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-            full_path: None,
-        };
-
-        let added_context = AddedContext::image(image_context, None, cx);
-
-        assert!(
-            matches!(added_context.status, ContextStatus::Ready),
-            "Expected ready status when no model provided"
-        );
-
-        assert!(matches!(added_context.kind, ContextKind::Image));
-        assert_eq!(added_context.name.as_ref(), "Image");
-        assert!(added_context.parent.is_none());
-        assert!(added_context.icon_path.is_none());
-    }
-}
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -372,8 +372,6 @@ impl AgentSettingsContent {
                                None,
                                None,
                                Some(language_model.supports_tools()),
-                                Some(language_model.supports_images()),
-                                None,
                            )),
                            api_url,
                        });
@@ -691,7 +689,6 @@ pub struct AgentSettingsContentV2 {
 pub enum CompletionMode {
    #[default]
    Normal,
-    #[serde(alias = "max")]
    Burn,
 }

@@ -730,7 +727,6 @@ impl JsonSchema for LanguageModelProviderSetting {
                "zed.dev".into(),
                "copilot_chat".into(),
                "deepseek".into(),
-                "openrouter".into(),
                "mistral".into(),
            ]),
            ..Default::default()
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -60,7 +60,6 @@ zed_actions.workspace = true
 zed_llm_client.workspace = true

 [dev-dependencies]
-indoc.workspace = true
 language_model = { workspace = true, features = ["test-support"] }
 languages = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -1646,35 +1646,34 @@ impl ContextEditor {
        let context = self.context.read(cx);

        let mut text = String::new();
-
-        // If selection is empty, we want to copy the entire line
-        if selection.range().is_empty() {
-            let snapshot = context.buffer().read(cx).snapshot();
-            let point = snapshot.offset_to_point(selection.range().start);
-            selection.start = snapshot.point_to_offset(Point::new(point.row, 0));
-            selection.end = snapshot
-                .point_to_offset(cmp::min(Point::new(point.row + 1, 0), snapshot.max_point()));
-            for chunk in context.buffer().read(cx).text_for_range(selection.range()) {
-                text.push_str(chunk);
-            }
-        } else {
-            for message in context.messages(cx) {
-                if message.offset_range.start >= selection.range().end {
-                    break;
-                } else if message.offset_range.end >= selection.range().start {
-                    let range = cmp::max(message.offset_range.start, selection.range().start)
-                        ..cmp::min(message.offset_range.end, selection.range().end);
-                    if !range.is_empty() {
-                        for chunk in context.buffer().read(cx).text_for_range(range) {
-                            text.push_str(chunk);
-                        }
-                        if message.offset_range.end < selection.range().end {
-                            text.push('\n');
-                        }
+        for message in context.messages(cx) {
+            if message.offset_range.start >= selection.range().end {
+                break;
+            } else if message.offset_range.end >= selection.range().start {
+                let range = cmp::max(message.offset_range.start, selection.range().start)
+                    ..cmp::min(message.offset_range.end, selection.range().end);
+                if range.is_empty() {
+                    let snapshot = context.buffer().read(cx).snapshot();
+                    let point = snapshot.offset_to_point(range.start);
+                    selection.start = snapshot.point_to_offset(Point::new(point.row, 0));
+                    selection.end = snapshot.point_to_offset(cmp::min(
+                        Point::new(point.row + 1, 0),
+                        snapshot.max_point(),
+                    ));
+                    for chunk in context.buffer().read(cx).text_for_range(selection.range()) {
+                        text.push_str(chunk);
+                    }
+                } else {
+                    for chunk in context.buffer().read(cx).text_for_range(range) {
+                        text.push_str(chunk);
+                    }
+                    if message.offset_range.end < selection.range().end {
+                        text.push('\n');
                    }
                }
            }
        }
+
        (text, CopyMetadata { creases }, vec![selection])
    }

@@ -3265,92 +3264,74 @@ mod tests {
    use super::*;
    use fs::FakeFs;
    use gpui::{App, TestAppContext, VisualTestContext};
-    use indoc::indoc;
    use language::{Buffer, LanguageRegistry};
-    use pretty_assertions::assert_eq;
    use prompt_store::PromptBuilder;
-    use text::OffsetRangeExt;
    use unindent::Unindent;
    use util::path;

-    #[gpui::test]
-    async fn test_copy_paste_whole_message(cx: &mut TestAppContext) {
-        let (context, context_editor, mut cx) = setup_context_editor_text(vec![
-            (Role::User, "What is the Zed editor?"),
-            (
-                Role::Assistant,
-                "Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.",
-            ),
-            (Role::User, ""),
-        ],cx).await;
-
-        // Select & Copy whole user message
-        assert_copy_paste_context_editor(
-            &context_editor,
-            message_range(&context, 0, &mut cx),
-            indoc! {"
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-                What is the Zed editor?
-            "},
-            &mut cx,
-        );
-
-        // Select & Copy whole assistant message
-        assert_copy_paste_context_editor(
-            &context_editor,
-            message_range(&context, 1, &mut cx),
-            indoc! {"
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-            "},
-            &mut cx,
-        );
-    }
-
    #[gpui::test]
    async fn test_copy_paste_no_selection(cx: &mut TestAppContext) {
-        let (context, context_editor, mut cx) = setup_context_editor_text(
-            vec![
-                (Role::User, "user1"),
-                (Role::Assistant, "assistant1"),
-                (Role::Assistant, "assistant2"),
-                (Role::User, ""),
-            ],
-            cx,
-        )
-        .await;
+        cx.update(init_test);

-        // Copy and paste first assistant message
-        let message_2_range = message_range(&context, 1, &mut cx);
-        assert_copy_paste_context_editor(
-            &context_editor,
-            message_2_range.start..message_2_range.start,
-            indoc! {"
-                user1
-                assistant1
-                assistant2
-                assistant1
-            "},
-            &mut cx,
-        );
+        let fs = FakeFs::new(cx.executor());
+        let registry = Arc::new(LanguageRegistry::test(cx.executor()));
+        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+        let context = cx.new(|cx| {
+            AssistantContext::local(
+                registry,
+                None,
+                None,
+                prompt_builder.clone(),
+                Arc::new(SlashCommandWorkingSet::default()),
+                cx,
+            )
+        });
+        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let workspace = window.root(cx).unwrap();
+        let cx = &mut VisualTestContext::from_window(*window, cx);

-        // Copy and cut second assistant message
-        let message_3_range = message_range(&context, 2, &mut cx);
-        assert_copy_paste_context_editor(
-            &context_editor,
-            message_3_range.start..message_3_range.start,
-            indoc! {"
-                user1
-                assistant1
-                assistant2
-                assistant1
-                assistant2
-            "},
-            &mut cx,
-        );
+        let context_editor = window
+            .update(cx, |_, window, cx| {
+                cx.new(|cx| {
+                    ContextEditor::for_context(
+                        context,
+                        fs,
+                        workspace.downgrade(),
+                        project,
+                        None,
+                        window,
+                        cx,
+                    )
+                })
+            })
+            .unwrap();
+
+        context_editor.update_in(cx, |context_editor, window, cx| {
+            context_editor.editor.update(cx, |editor, cx| {
+                editor.set_text("abc\ndef\nghi", window, cx);
+                editor.move_to_beginning(&Default::default(), window, cx);
+            })
+        });
+
+        context_editor.update_in(cx, |context_editor, window, cx| {
+            context_editor.editor.update(cx, |editor, cx| {
+                editor.copy(&Default::default(), window, cx);
+                editor.paste(&Default::default(), window, cx);
+
+                assert_eq!(editor.text(cx), "abc\nabc\ndef\nghi");
+            })
+        });
+
+        context_editor.update_in(cx, |context_editor, window, cx| {
+            context_editor.editor.update(cx, |editor, cx| {
+                editor.cut(&Default::default(), window, cx);
+                assert_eq!(editor.text(cx), "abc\ndef\nghi");
+
+                editor.paste(&Default::default(), window, cx);
+                assert_eq!(editor.text(cx), "abc\nabc\ndef\nghi");
+            })
+        });
    }

    #[gpui::test]
@@ -3427,129 +3408,6 @@ mod tests {
        }
    }

-    async fn setup_context_editor_text(
-        messages: Vec<(Role, &str)>,
-        cx: &mut TestAppContext,
-    ) -> (
-        Entity<AssistantContext>,
-        Entity<ContextEditor>,
-        VisualTestContext,
-    ) {
-        cx.update(init_test);
-
-        let fs = FakeFs::new(cx.executor());
-        let context = create_context_with_messages(messages, cx);
-
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let mut cx = VisualTestContext::from_window(*window, cx);
-
-        let context_editor = window
-            .update(&mut cx, |_, window, cx| {
-                cx.new(|cx| {
-                    let editor = ContextEditor::for_context(
-                        context.clone(),
-                        fs,
-                        workspace.downgrade(),
-                        project,
-                        None,
-                        window,
-                        cx,
-                    );
-                    editor
-                })
-            })
-            .unwrap();
-
-        (context, context_editor, cx)
-    }
-
-    fn message_range(
-        context: &Entity<AssistantContext>,
-        message_ix: usize,
-        cx: &mut TestAppContext,
-    ) -> Range<usize> {
-        context.update(cx, |context, cx| {
-            context
-                .messages(cx)
-                .nth(message_ix)
-                .unwrap()
-                .anchor_range
-                .to_offset(&context.buffer().read(cx).snapshot())
-        })
-    }
-
-    fn assert_copy_paste_context_editor<T: editor::ToOffset>(
-        context_editor: &Entity<ContextEditor>,
-        range: Range<T>,
-        expected_text: &str,
-        cx: &mut VisualTestContext,
-    ) {
-        context_editor.update_in(cx, |context_editor, window, cx| {
-            context_editor.editor.update(cx, |editor, cx| {
-                editor.change_selections(None, window, cx, |s| s.select_ranges([range]));
-            });
-
-            context_editor.copy(&Default::default(), window, cx);
-
-            context_editor.editor.update(cx, |editor, cx| {
-                editor.move_to_end(&Default::default(), window, cx);
-            });
-
-            context_editor.paste(&Default::default(), window, cx);
-
-            context_editor.editor.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), expected_text);
-            });
-        });
-    }
-
-    fn create_context_with_messages(
-        mut messages: Vec<(Role, &str)>,
-        cx: &mut TestAppContext,
-    ) -> Entity<AssistantContext> {
-        let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        cx.new(|cx| {
-            let mut context = AssistantContext::local(
-                registry,
-                None,
-                None,
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                cx,
-            );
-            let mut message_1 = context.messages(cx).next().unwrap();
-            let (role, text) = messages.remove(0);
-
-            loop {
-                if role == message_1.role {
-                    context.buffer().update(cx, |buffer, cx| {
-                        buffer.edit([(message_1.offset_range, text)], None, cx);
-                    });
-                    break;
-                }
-                let mut ids = HashSet::default();
-                ids.insert(message_1.id);
-                context.cycle_message_roles(ids, cx);
-                message_1 = context.messages(cx).next().unwrap();
-            }
-
-            let mut last_message_id = message_1.id;
-            for (role, text) in messages {
-                context.insert_message_after(last_message_id, role, MessageStatus::Done, cx);
-                let message = context.messages(cx).last().unwrap();
-                last_message_id = message.id;
-                context.buffer().update(cx, |buffer, cx| {
-                    buffer.edit([(message.offset_range, text)], None, cx);
-                })
-            }
-
-            context
-        })
-    }
-
    fn init_test(cx: &mut App) {
        let settings_store = SettingsStore::test(cx);
        prompt_store::init(cx);
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -48,7 +48,7 @@ impl SlashCommandCompletionProvider {
        name_range: Range<Anchor>,
        window: &mut Window,
        cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
        let slash_commands = self.slash_commands.clone();
        let candidates = slash_commands
            .command_names(cx)
@@ -71,27 +71,28 @@ impl SlashCommandCompletionProvider {
            .await;

            cx.update(|_, cx| {
-                let completions = matches
-                    .into_iter()
-                    .filter_map(|mat| {
-                        let command = slash_commands.command(&mat.string, cx)?;
-                        let mut new_text = mat.string.clone();
-                        let requires_argument = command.requires_argument();
-                        let accepts_arguments = command.accepts_arguments();
-                        if requires_argument || accepts_arguments {
-                            new_text.push(' ');
-                        }
+                Some(
+                    matches
+                        .into_iter()
+                        .filter_map(|mat| {
+                            let command = slash_commands.command(&mat.string, cx)?;
+                            let mut new_text = mat.string.clone();
+                            let requires_argument = command.requires_argument();
+                            let accepts_arguments = command.accepts_arguments();
+                            if requires_argument || accepts_arguments {
+                                new_text.push(' ');
+                            }

-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    let command_name = mat.string.clone();
-                                    let command_range = command_range.clone();
-                                    let editor = editor.clone();
-                                    let workspace = workspace.clone();
-                                    Arc::new(
+                            let confirm =
+                                editor
+                                    .clone()
+                                    .zip(workspace.clone())
+                                    .map(|(editor, workspace)| {
+                                        let command_name = mat.string.clone();
+                                        let command_range = command_range.clone();
+                                        let editor = editor.clone();
+                                        let workspace = workspace.clone();
+                                        Arc::new(
                                            move |intent: CompletionIntent,
                                            window: &mut Window,
                                            cx: &mut App| {
@@ -117,27 +118,22 @@ impl SlashCommandCompletionProvider {
                                                }
                                            },
                                        ) as Arc<_>
-                                });
-
-                        Some(project::Completion {
-                            replace_range: name_range.clone(),
-                            documentation: Some(CompletionDocumentation::SingleLine(
-                                command.description().into(),
-                            )),
-                            new_text,
-                            label: command.label(cx),
-                            icon_path: None,
-                            insert_text_mode: None,
-                            confirm,
-                            source: CompletionSource::Custom,
+                                    });
+                            Some(project::Completion {
+                                replace_range: name_range.clone(),
+                                documentation: Some(CompletionDocumentation::SingleLine(
+                                    command.description().into(),
+                                )),
+                                new_text,
+                                label: command.label(cx),
+                                icon_path: None,
+                                insert_text_mode: None,
+                                confirm,
+                                source: CompletionSource::Custom,
+                            })
                        })
-                    })
-                    .collect();
-
-                vec![project::CompletionResponse {
-                    completions,
-                    is_incomplete: false,
-                }]
+                        .collect(),
+                )
            })
        })
    }
@@ -151,7 +147,7 @@ impl SlashCommandCompletionProvider {
        last_argument_range: Range<Anchor>,
        window: &mut Window,
        cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
        let new_cancel_flag = Arc::new(AtomicBool::new(false));
        let mut flag = self.cancel_flag.lock();
        flag.store(true, SeqCst);
@@ -169,27 +165,28 @@ impl SlashCommandCompletionProvider {
            let workspace = self.workspace.clone();
            let arguments = arguments.to_vec();
            cx.background_spawn(async move {
-                let completions = completions
-                    .await?
-                    .into_iter()
-                    .map(|new_argument| {
-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    Arc::new({
-                                        let mut completed_arguments = arguments.clone();
-                                        if new_argument.replace_previous_arguments {
-                                            completed_arguments.clear();
-                                        } else {
-                                            completed_arguments.pop();
-                                        }
-                                        completed_arguments.push(new_argument.new_text.clone());
+                Ok(Some(
+                    completions
+                        .await?
+                        .into_iter()
+                        .map(|new_argument| {
+                            let confirm =
+                                editor
+                                    .clone()
+                                    .zip(workspace.clone())
+                                    .map(|(editor, workspace)| {
+                                        Arc::new({
+                                            let mut completed_arguments = arguments.clone();
+                                            if new_argument.replace_previous_arguments {
+                                                completed_arguments.clear();
+                                            } else {
+                                                completed_arguments.pop();
+                                            }
+                                            completed_arguments.push(new_argument.new_text.clone());

-                                        let command_range = command_range.clone();
-                                        let command_name = command_name.clone();
-                                        move |intent: CompletionIntent,
+                                            let command_range = command_range.clone();
+                                            let command_name = command_name.clone();
+                                            move |intent: CompletionIntent,
                                              window: &mut Window,
                                              cx: &mut App| {
                                            if new_argument.after_completion.run()
@@ -213,41 +210,34 @@ impl SlashCommandCompletionProvider {
                                                !new_argument.after_completion.run()
                                            }
                                        }
-                                    }) as Arc<_>
-                                });
+                                        }) as Arc<_>
+                                    });

-                        let mut new_text = new_argument.new_text.clone();
-                        if new_argument.after_completion == AfterCompletion::Continue {
-                            new_text.push(' ');
-                        }
+                            let mut new_text = new_argument.new_text.clone();
+                            if new_argument.after_completion == AfterCompletion::Continue {
+                                new_text.push(' ');
+                            }

-                        project::Completion {
-                            replace_range: if new_argument.replace_previous_arguments {
-                                argument_range.clone()
-                            } else {
-                                last_argument_range.clone()
-                            },
-                            label: new_argument.label,
-                            icon_path: None,
-                            new_text,
-                            documentation: None,
-                            confirm,
-                            insert_text_mode: None,
-                            source: CompletionSource::Custom,
-                        }
-                    })
-                    .collect();
-
-                Ok(vec![project::CompletionResponse {
-                    completions,
-                    is_incomplete: false,
-                }])
+                            project::Completion {
+                                replace_range: if new_argument.replace_previous_arguments {
+                                    argument_range.clone()
+                                } else {
+                                    last_argument_range.clone()
+                                },
+                                label: new_argument.label,
+                                icon_path: None,
+                                new_text,
+                                documentation: None,
+                                confirm,
+                                insert_text_mode: None,
+                                source: CompletionSource::Custom,
+                            }
+                        })
+                        .collect(),
+                ))
            })
        } else {
-            Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                is_incomplete: false,
-            }]))
+            Task::ready(Ok(Some(Vec::new())))
        }
    }
 }
@@ -261,7 +251,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        _: editor::CompletionContext,
        window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
        let Some((name, arguments, command_range, last_argument_range)) =
            buffer.update(cx, |buffer, _cx| {
                let position = buffer_position.to_point(buffer);
@@ -305,10 +295,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                Some((name, arguments, command_range, last_argument_range))
            })
        else {
-            return Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                is_incomplete: false,
-            }]));
+            return Task::ready(Ok(Some(Vec::new())));
        };

        if let Some((arguments, argument_range)) = arguments {
@@ -342,7 +329,6 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        position: language::Anchor,
        _text: &str,
        _trigger_in_words: bool,
-        _menu_is_open: bool,
        cx: &mut Context<Editor>,
    ) -> bool {
        let buffer = buffer.read(cx);
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -13,7 +13,6 @@ path = "src/assistant_tool.rs"

 [dependencies]
 anyhow.workspace = true
-async-watch.workspace = true
 buffer_diff.workspace = true
 clock.workspace = true
 collections.workspace = true
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -1,7 +1,7 @@
 use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiff;
 use collections::BTreeMap;
-use futures::{FutureExt, StreamExt, channel::mpsc};
+use futures::{StreamExt, channel::mpsc};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
 use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
 use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
@@ -92,21 +92,21 @@ impl ActionLog {
                let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
                let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
                let diff_base;
-                let unreviewed_edits;
+                let unreviewed_changes;
                if is_created {
                    diff_base = Rope::default();
-                    unreviewed_edits = Patch::new(vec![Edit {
+                    unreviewed_changes = Patch::new(vec![Edit {
                        old: 0..1,
                        new: 0..text_snapshot.max_point().row + 1,
                    }])
                } else {
                    diff_base = buffer.read(cx).as_rope().clone();
-                    unreviewed_edits = Patch::default();
+                    unreviewed_changes = Patch::default();
                }
                TrackedBuffer {
                    buffer: buffer.clone(),
                    diff_base,
-                    unreviewed_edits: unreviewed_edits,
+                    unreviewed_changes,
                    snapshot: text_snapshot.clone(),
                    status,
                    version: buffer.read(cx).version(),
@@ -175,7 +175,7 @@ impl ActionLog {
                    .map_or(false, |file| file.disk_state() != DiskState::Deleted)
                {
                    // If the buffer had been deleted by a tool, but it got
-                    // resurrected externally, we want to clear the edits we
+                    // resurrected externally, we want to clear the changes we
                    // were tracking and reset the buffer's state.
                    self.tracked_buffers.remove(&buffer);
                    self.track_buffer_internal(buffer, false, cx);
@@ -188,274 +188,108 @@ impl ActionLog {
    async fn maintain_diff(
        this: WeakEntity<Self>,
        buffer: Entity<Buffer>,
-        mut buffer_updates: mpsc::UnboundedReceiver<(ChangeAuthor, text::BufferSnapshot)>,
+        mut diff_update: mpsc::UnboundedReceiver<(ChangeAuthor, text::BufferSnapshot)>,
        cx: &mut AsyncApp,
    ) -> Result<()> {
-        let git_store = this.read_with(cx, |this, cx| this.project.read(cx).git_store().clone())?;
-        let git_diff = this
-            .update(cx, |this, cx| {
-                this.project.update(cx, |project, cx| {
-                    project.open_uncommitted_diff(buffer.clone(), cx)
-                })
-            })?
-            .await
-            .ok();
-        let buffer_repo = git_store.read_with(cx, |git_store, cx| {
-            git_store.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-        })?;
+        while let Some((author, buffer_snapshot)) = diff_update.next().await {
+            let (rebase, diff, language, language_registry) =
+                this.read_with(cx, |this, cx| {
+                    let tracked_buffer = this
+                        .tracked_buffers
+                        .get(&buffer)
+                        .context("buffer not tracked")?;

-        let (git_diff_updates_tx, mut git_diff_updates_rx) = async_watch::channel(());
-        let _repo_subscription =
-            if let Some((git_diff, (buffer_repo, _))) = git_diff.as_ref().zip(buffer_repo) {
-                cx.update(|cx| {
-                    let mut old_head = buffer_repo.read(cx).head_commit.clone();
-                    Some(cx.subscribe(git_diff, move |_, event, cx| match event {
-                        buffer_diff::BufferDiffEvent::DiffChanged { .. } => {
-                            let new_head = buffer_repo.read(cx).head_commit.clone();
-                            if new_head != old_head {
-                                old_head = new_head;
-                                git_diff_updates_tx.send(()).ok();
+                    let rebase = cx.background_spawn({
+                        let mut base_text = tracked_buffer.diff_base.clone();
+                        let old_snapshot = tracked_buffer.snapshot.clone();
+                        let new_snapshot = buffer_snapshot.clone();
+                        let unreviewed_changes = tracked_buffer.unreviewed_changes.clone();
+                        async move {
+                            let edits = diff_snapshots(&old_snapshot, &new_snapshot);
+                            if let ChangeAuthor::User = author {
+                                apply_non_conflicting_edits(
+                                    &unreviewed_changes,
+                                    edits,
+                                    &mut base_text,
+                                    new_snapshot.as_rope(),
+                                );
                            }
+                            (Arc::new(base_text.to_string()), base_text)
                        }
-                        _ => {}
-                    }))
-                })?
-            } else {
-                None
-            };
+                    });

-        loop {
-            futures::select_biased! {
-                buffer_update = buffer_updates.next() => {
-                    if let Some((author, buffer_snapshot)) = buffer_update {
-                        Self::track_edits(&this, &buffer, author, buffer_snapshot, cx).await?;
-                    } else {
-                        break;
-                    }
-                }
-                _ = git_diff_updates_rx.changed().fuse() => {
-                    if let Some(git_diff) = git_diff.as_ref() {
-                        Self::keep_committed_edits(&this, &buffer, &git_diff, cx).await?;
-                    }
-                }
+                    anyhow::Ok((
+                        rebase,
+                        tracked_buffer.diff.clone(),
+                        tracked_buffer.buffer.read(cx).language().cloned(),
+                        tracked_buffer.buffer.read(cx).language_registry(),
+                    ))
+                })??;
+
+            let (new_base_text, new_diff_base) = rebase.await;
+            let diff_snapshot = BufferDiff::update_diff(
+                diff.clone(),
+                buffer_snapshot.clone(),
+                Some(new_base_text),
+                true,
+                false,
+                language,
+                language_registry,
+                cx,
+            )
+            .await;
+
+            let mut unreviewed_changes = Patch::default();
+            if let Ok(diff_snapshot) = diff_snapshot {
+                unreviewed_changes = cx
+                    .background_spawn({
+                        let diff_snapshot = diff_snapshot.clone();
+                        let buffer_snapshot = buffer_snapshot.clone();
+                        let new_diff_base = new_diff_base.clone();
+                        async move {
+                            let mut unreviewed_changes = Patch::default();
+                            for hunk in diff_snapshot.hunks_intersecting_range(
+                                Anchor::MIN..Anchor::MAX,
+                                &buffer_snapshot,
+                            ) {
+                                let old_range = new_diff_base
+                                    .offset_to_point(hunk.diff_base_byte_range.start)
+                                    ..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
+                                let new_range = hunk.range.start..hunk.range.end;
+                                unreviewed_changes.push(point_to_row_edit(
+                                    Edit {
+                                        old: old_range,
+                                        new: new_range,
+                                    },
+                                    &new_diff_base,
+                                    &buffer_snapshot.as_rope(),
+                                ));
+                            }
+                            unreviewed_changes
+                        }
+                    })
+                    .await;
+
+                diff.update(cx, |diff, cx| {
+                    diff.set_snapshot(diff_snapshot, &buffer_snapshot, cx)
+                })?;
            }
+            this.update(cx, |this, cx| {
+                let tracked_buffer = this
+                    .tracked_buffers
+                    .get_mut(&buffer)
+                    .context("buffer not tracked")?;
+                tracked_buffer.diff_base = new_diff_base;
+                tracked_buffer.snapshot = buffer_snapshot;
+                tracked_buffer.unreviewed_changes = unreviewed_changes;
+                cx.notify();
+                anyhow::Ok(())
+            })??;
        }

        Ok(())
    }

-    async fn track_edits(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        author: ChangeAuthor,
-        buffer_snapshot: text::BufferSnapshot,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let rebase = this.read_with(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get(buffer)
-                .context("buffer not tracked")?;
-
-            let rebase = cx.background_spawn({
-                let mut base_text = tracked_buffer.diff_base.clone();
-                let old_snapshot = tracked_buffer.snapshot.clone();
-                let new_snapshot = buffer_snapshot.clone();
-                let unreviewed_edits = tracked_buffer.unreviewed_edits.clone();
-                async move {
-                    let edits = diff_snapshots(&old_snapshot, &new_snapshot);
-                    if let ChangeAuthor::User = author {
-                        apply_non_conflicting_edits(
-                            &unreviewed_edits,
-                            edits,
-                            &mut base_text,
-                            new_snapshot.as_rope(),
-                        );
-                    }
-                    (Arc::new(base_text.to_string()), base_text)
-                }
-            });
-
-            anyhow::Ok(rebase)
-        })??;
-        let (new_base_text, new_diff_base) = rebase.await;
-        Self::update_diff(
-            this,
-            buffer,
-            buffer_snapshot,
-            new_base_text,
-            new_diff_base,
-            cx,
-        )
-        .await
-    }
-
-    async fn keep_committed_edits(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        git_diff: &Entity<BufferDiff>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let buffer_snapshot = this.read_with(cx, |this, _cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get(buffer)
-                .context("buffer not tracked")?;
-            anyhow::Ok(tracked_buffer.snapshot.clone())
-        })??;
-        let (new_base_text, new_diff_base) = this
-            .read_with(cx, |this, cx| {
-                let tracked_buffer = this
-                    .tracked_buffers
-                    .get(buffer)
-                    .context("buffer not tracked")?;
-                let old_unreviewed_edits = tracked_buffer.unreviewed_edits.clone();
-                let agent_diff_base = tracked_buffer.diff_base.clone();
-                let git_diff_base = git_diff.read(cx).base_text().as_rope().clone();
-                let buffer_text = tracked_buffer.snapshot.as_rope().clone();
-                anyhow::Ok(cx.background_spawn(async move {
-                    let mut old_unreviewed_edits = old_unreviewed_edits.into_iter().peekable();
-                    let committed_edits = language::line_diff(
-                        &agent_diff_base.to_string(),
-                        &git_diff_base.to_string(),
-                    )
-                    .into_iter()
-                    .map(|(old, new)| Edit { old, new });
-
-                    let mut new_agent_diff_base = agent_diff_base.clone();
-                    let mut row_delta = 0i32;
-                    for committed in committed_edits {
-                        while let Some(unreviewed) = old_unreviewed_edits.peek() {
-                            // If the committed edit matches the unreviewed
-                            // edit, assume the user wants to keep it.
-                            if committed.old == unreviewed.old {
-                                let unreviewed_new =
-                                    buffer_text.slice_rows(unreviewed.new.clone()).to_string();
-                                let committed_new =
-                                    git_diff_base.slice_rows(committed.new.clone()).to_string();
-                                if unreviewed_new == committed_new {
-                                    let old_byte_start =
-                                        new_agent_diff_base.point_to_offset(Point::new(
-                                            (unreviewed.old.start as i32 + row_delta) as u32,
-                                            0,
-                                        ));
-                                    let old_byte_end =
-                                        new_agent_diff_base.point_to_offset(cmp::min(
-                                            Point::new(
-                                                (unreviewed.old.end as i32 + row_delta) as u32,
-                                                0,
-                                            ),
-                                            new_agent_diff_base.max_point(),
-                                        ));
-                                    new_agent_diff_base
-                                        .replace(old_byte_start..old_byte_end, &unreviewed_new);
-                                    row_delta +=
-                                        unreviewed.new_len() as i32 - unreviewed.old_len() as i32;
-                                }
-                            } else if unreviewed.old.start >= committed.old.end {
-                                break;
-                            }
-
-                            old_unreviewed_edits.next().unwrap();
-                        }
-                    }
-
-                    (
-                        Arc::new(new_agent_diff_base.to_string()),
-                        new_agent_diff_base,
-                    )
-                }))
-            })??
-            .await;
-
-        Self::update_diff(
-            this,
-            buffer,
-            buffer_snapshot,
-            new_base_text,
-            new_diff_base,
-            cx,
-        )
-        .await
-    }
-
-    async fn update_diff(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        buffer_snapshot: text::BufferSnapshot,
-        new_base_text: Arc<String>,
-        new_diff_base: Rope,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (diff, language, language_registry) = this.read_with(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get(buffer)
-                .context("buffer not tracked")?;
-            anyhow::Ok((
-                tracked_buffer.diff.clone(),
-                buffer.read(cx).language().cloned(),
-                buffer.read(cx).language_registry().clone(),
-            ))
-        })??;
-        let diff_snapshot = BufferDiff::update_diff(
-            diff.clone(),
-            buffer_snapshot.clone(),
-            Some(new_base_text),
-            true,
-            false,
-            language,
-            language_registry,
-            cx,
-        )
-        .await;
-        let mut unreviewed_edits = Patch::default();
-        if let Ok(diff_snapshot) = diff_snapshot {
-            unreviewed_edits = cx
-                .background_spawn({
-                    let diff_snapshot = diff_snapshot.clone();
-                    let buffer_snapshot = buffer_snapshot.clone();
-                    let new_diff_base = new_diff_base.clone();
-                    async move {
-                        let mut unreviewed_edits = Patch::default();
-                        for hunk in diff_snapshot
-                            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer_snapshot)
-                        {
-                            let old_range = new_diff_base
-                                .offset_to_point(hunk.diff_base_byte_range.start)
-                                ..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
-                            let new_range = hunk.range.start..hunk.range.end;
-                            unreviewed_edits.push(point_to_row_edit(
-                                Edit {
-                                    old: old_range,
-                                    new: new_range,
-                                },
-                                &new_diff_base,
-                                &buffer_snapshot.as_rope(),
-                            ));
-                        }
-                        unreviewed_edits
-                    }
-                })
-                .await;
-
-            diff.update(cx, |diff, cx| {
-                diff.set_snapshot(diff_snapshot, &buffer_snapshot, cx);
-            })?;
-        }
-        this.update(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get_mut(buffer)
-                .context("buffer not tracked")?;
-            tracked_buffer.diff_base = new_diff_base;
-            tracked_buffer.snapshot = buffer_snapshot;
-            tracked_buffer.unreviewed_edits = unreviewed_edits;
-            cx.notify();
-            anyhow::Ok(())
-        })?
-    }
-
    /// Track a buffer as read, so we can notify the model about user edits.
    pub fn buffer_read(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
        self.track_buffer_internal(buffer, false, cx);
@@ -516,7 +350,7 @@ impl ActionLog {
                    buffer_range.start.to_point(buffer)..buffer_range.end.to_point(buffer);
                let mut delta = 0i32;

-                tracked_buffer.unreviewed_edits.retain_mut(|edit| {
+                tracked_buffer.unreviewed_changes.retain_mut(|edit| {
                    edit.old.start = (edit.old.start as i32 + delta) as u32;
                    edit.old.end = (edit.old.end as i32 + delta) as u32;

@@ -627,7 +461,7 @@ impl ActionLog {
                    .project
                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx));

-                // Clear all tracked edits for this buffer and start over as if we just read it.
+                // Clear all tracked changes for this buffer and start over as if we just read it.
                self.tracked_buffers.remove(&buffer);
                self.buffer_read(buffer.clone(), cx);
                cx.notify();
@@ -643,7 +477,7 @@ impl ActionLog {
                        .peekable();

                    let mut edits_to_revert = Vec::new();
-                    for edit in tracked_buffer.unreviewed_edits.edits() {
+                    for edit in tracked_buffer.unreviewed_changes.edits() {
                        let new_range = tracked_buffer
                            .snapshot
                            .anchor_before(Point::new(edit.new.start, 0))
@@ -695,7 +529,7 @@ impl ActionLog {
            .retain(|_buffer, tracked_buffer| match tracked_buffer.status {
                TrackedBufferStatus::Deleted => false,
                _ => {
-                    tracked_buffer.unreviewed_edits.clear();
+                    tracked_buffer.unreviewed_changes.clear();
                    tracked_buffer.diff_base = tracked_buffer.snapshot.as_rope().clone();
                    tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
                    true
@@ -704,11 +538,11 @@ impl ActionLog {
        cx.notify();
    }

-    /// Returns the set of buffers that contain edits that haven't been reviewed by the user.
+    /// Returns the set of buffers that contain changes that haven't been reviewed by the user.
    pub fn changed_buffers(&self, cx: &App) -> BTreeMap<Entity<Buffer>, Entity<BufferDiff>> {
        self.tracked_buffers
            .iter()
-            .filter(|(_, tracked)| tracked.has_edits(cx))
+            .filter(|(_, tracked)| tracked.has_changes(cx))
            .map(|(buffer, tracked)| (buffer.clone(), tracked.diff.clone()))
            .collect()
    }
@@ -828,7 +662,11 @@ fn point_to_row_edit(edit: Edit<Point>, old_text: &Rope, new_text: &Rope) -> Edi
            old: edit.old.start.row + 1..edit.old.end.row + 1,
            new: edit.new.start.row + 1..edit.new.end.row + 1,
        }
-    } else if edit.old.start.column == 0 && edit.old.end.column == 0 && edit.new.end.column == 0 {
+    } else if edit.old.start.column == 0
+        && edit.old.end.column == 0
+        && edit.new.end.column == 0
+        && edit.old.end != old_text.max_point()
+    {
        Edit {
            old: edit.old.start.row..edit.old.end.row,
            new: edit.new.start.row..edit.new.end.row,
@@ -856,7 +694,7 @@ enum TrackedBufferStatus {
 struct TrackedBuffer {
    buffer: Entity<Buffer>,
    diff_base: Rope,
-    unreviewed_edits: Patch<u32>,
+    unreviewed_changes: Patch<u32>,
    status: TrackedBufferStatus,
    version: clock::Global,
    diff: Entity<BufferDiff>,
@@ -868,7 +706,7 @@ struct TrackedBuffer {
 }

 impl TrackedBuffer {
-    fn has_edits(&self, cx: &App) -> bool {
+    fn has_changes(&self, cx: &App) -> bool {
        self.diff
            .read(cx)
            .hunks(&self.buffer.read(cx), cx)
@@ -889,6 +727,8 @@ pub struct ChangedBuffer {

 #[cfg(test)]
 mod tests {
+    use std::env;
+
    use super::*;
    use buffer_diff::DiffHunkStatusKind;
    use gpui::TestAppContext;
@@ -897,7 +737,6 @@ mod tests {
    use rand::prelude::*;
    use serde_json::json;
    use settings::SettingsStore;
-    use std::env;
    use util::{RandomCharIter, path};

    #[ctor::ctor]
@@ -1912,15 +1751,15 @@ mod tests {
                        .unwrap();
                }
                _ => {
-                    let is_agent_edit = rng.gen_bool(0.5);
-                    if is_agent_edit {
+                    let is_agent_change = rng.gen_bool(0.5);
+                    if is_agent_change {
                        log::info!("agent edit");
                    } else {
                        log::info!("user edit");
                    }
                    cx.update(|cx| {
                        buffer.update(cx, |buffer, cx| buffer.randomly_edit(&mut rng, 1, cx));
-                        if is_agent_edit {
+                        if is_agent_change {
                            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
                        }
                    });
@@ -1945,7 +1784,7 @@ mod tests {
                let tracked_buffer = log.tracked_buffers.get(&buffer).unwrap();
                let mut old_text = tracked_buffer.diff_base.clone();
                let new_text = buffer.read(cx).as_rope();
-                for edit in tracked_buffer.unreviewed_edits.edits() {
+                for edit in tracked_buffer.unreviewed_changes.edits() {
                    let old_start = old_text.point_to_offset(Point::new(edit.new.start, 0));
                    let old_end = old_text.point_to_offset(cmp::min(
                        Point::new(edit.new.start + edit.old_len(), 0),
@@ -1961,171 +1800,6 @@ mod tests {
        }
    }

-    #[gpui::test]
-    async fn test_keep_edits_on_commit(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "file.txt": "a\nb\nc\nd\ne\nf\ng\nh\ni\nj",
-            }),
-        )
-        .await;
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt".into(), "a\nb\nc\nd\ne\nf\ng\nh\ni\nj".into())],
-            "0000000",
-        );
-        cx.run_until_parked();
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path(path!("/project/file.txt"), cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit(
-                    [
-                        // Edit at the very start: a -> A
-                        (Point::new(0, 0)..Point::new(0, 1), "A"),
-                        // Deletion in the middle: remove lines d and e
-                        (Point::new(3, 0)..Point::new(5, 0), ""),
-                        // Modification: g -> GGG
-                        (Point::new(6, 0)..Point::new(6, 1), "GGG"),
-                        // Addition: insert new line after h
-                        (Point::new(7, 1)..Point::new(7, 1), "\nNEW"),
-                        // Edit the very last character: j -> J
-                        (Point::new(9, 0)..Point::new(9, 1), "J"),
-                    ],
-                    None,
-                    cx,
-                );
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(0, 0)..Point::new(1, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "a\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(3, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "d\ne\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(5, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "g\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Simulate a git commit that matches some edits but not others:
-        // - Accepts the first edit (a -> A)
-        // - Accepts the deletion (remove d and e)
-        // - Makes a different change to g (g -> G instead of GGG)
-        // - Ignores the NEW line addition
-        // - Ignores the last line edit (j stays as j)
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt".into(), "A\nb\nc\nf\nG\nh\ni\nj".into())],
-            "0000001",
-        );
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(5, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "g\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Make another commit that accepts the NEW line but with different content
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[(
-                "file.txt".into(),
-                "A\nb\nc\nf\nGGG\nh\nDIFFERENT\ni\nj".into(),
-            )],
-            "0000002",
-        );
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Final commit that accepts all remaining edits
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt".into(), "A\nb\nc\nf\nGGG\nh\nNEW\ni\nJ".into())],
-            "0000003",
-        );
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
    #[derive(Debug, Clone, PartialEq, Eq)]
    struct HunkStatus {
        range: Range<Point>,
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -218,9 +218,6 @@ pub trait Tool: 'static + Send + Sync {
    /// before having permission to run.
    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool;

-    /// Returns true if the tool may perform edits.
-    fn may_perform_edits(&self) -> bool;
-
    /// Returns the JSON schema that describes the tool's input.
    fn input_schema(&self, _: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
        Ok(serde_json::Value::Object(serde_json::Map::default()))
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -16,24 +16,11 @@ pub fn adapt_schema_to_format(
    }

    match format {
-        LanguageModelToolSchemaFormat::JsonSchema => preprocess_json_schema(json),
+        LanguageModelToolSchemaFormat::JsonSchema => Ok(()),
        LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
    }
 }

-fn preprocess_json_schema(json: &mut Value) -> Result<()> {
-    // `additionalProperties` defaults to `false` unless explicitly specified.
-    // This prevents models from hallucinating tool parameters.
-    if let Value::Object(obj) = json {
-        if let Some(Value::String(type_str)) = obj.get("type") {
-            if type_str == "object" && !obj.contains_key("additionalProperties") {
-                obj.insert("additionalProperties".to_string(), Value::Bool(false));
-            }
-        }
-    }
-    Ok(())
-}
-
 /// Tries to adapt the json schema so that it is compatible with https://ai.google.dev/api/caching#Schema
 fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
    if let Value::Object(obj) = json {
@@ -250,59 +237,4 @@ mod tests {

        assert!(adapt_to_json_schema_subset(&mut json).is_err());
    }
-
-    #[test]
-    fn test_preprocess_json_schema_adds_additional_properties() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string"
-                }
-            }
-        });
-
-        preprocess_json_schema(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            })
-        );
-    }
-
-    #[test]
-    fn test_preprocess_json_schema_preserves_additional_properties() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string"
-                }
-            },
-            "additionalProperties": true
-        });
-
-        preprocess_json_schema(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": true
-            })
-        );
-    }
 }
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -37,13 +37,13 @@ use crate::diagnostics_tool::DiagnosticsTool;
 use crate::edit_file_tool::EditFileTool;
 use crate::fetch_tool::FetchTool;
 use crate::find_path_tool::FindPathTool;
+use crate::grep_tool::GrepTool;
 use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
 use crate::thinking_tool::ThinkingTool;

 pub use edit_file_tool::{EditFileMode, EditFileToolInput};
 pub use find_path_tool::FindPathToolInput;
-pub use grep_tool::{GrepTool, GrepToolInput};
 pub use open_tool::OpenTool;
 pub use read_file_tool::{ReadFileTool, ReadFileToolInput};
 pub use terminal_tool::TerminalTool;
@@ -126,7 +126,6 @@ mod tests {
                    }
                },
                "required": ["location"],
-                "additionalProperties": false
            })
        );
    }
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -48,10 +48,6 @@ impl Tool for CopyPathTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        true
-    }
-
    fn description(&self) -> String {
        include_str!("./copy_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -33,16 +33,12 @@ impl Tool for CreateDirectoryTool {
        "create_directory".into()
    }

-    fn description(&self) -> String {
-        include_str!("./create_directory_tool/description.md").into()
-    }
-
    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
+    fn description(&self) -> String {
+        include_str!("./create_directory_tool/description.md").into()
    }

    fn icon(&self) -> IconName {
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -37,10 +37,6 @@ impl Tool for DeletePathTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        true
-    }
-
    fn description(&self) -> String {
        include_str!("./delete_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -50,10 +50,6 @@ impl Tool for DiagnosticsTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./diagnostics_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -54,7 +54,6 @@ impl Template for EditFilePromptTemplate {
 pub enum EditAgentOutputEvent {
    ResolvingEditRange(Range<Anchor>),
    UnresolvedEditRange,
-    AmbiguousEditRange(Vec<Range<usize>>),
    Edited,
 }

@@ -270,29 +269,16 @@ impl EditAgent {
                }
            }

-            let (edit_events_, mut resolved_old_text) = resolve_old_text.await?;
+            let (edit_events_, resolved_old_text) = resolve_old_text.await?;
            edit_events = edit_events_;

            // If we can't resolve the old text, restart the loop waiting for a
            // new edit (or for the stream to end).
-            let resolved_old_text = match resolved_old_text.len() {
-                1 => resolved_old_text.pop().unwrap(),
-                0 => {
-                    output_events
-                        .unbounded_send(EditAgentOutputEvent::UnresolvedEditRange)
-                        .ok();
-                    continue;
-                }
-                _ => {
-                    let ranges = resolved_old_text
-                        .into_iter()
-                        .map(|text| text.range)
-                        .collect();
-                    output_events
-                        .unbounded_send(EditAgentOutputEvent::AmbiguousEditRange(ranges))
-                        .ok();
-                    continue;
-                }
+            let Some(resolved_old_text) = resolved_old_text else {
+                output_events
+                    .unbounded_send(EditAgentOutputEvent::UnresolvedEditRange)
+                    .ok();
+                continue;
            };

            // Compute edits in the background and apply them as they become
@@ -419,7 +405,7 @@ impl EditAgent {
        mut edit_events: T,
        cx: &mut AsyncApp,
    ) -> (
-        Task<Result<(T, Vec<ResolvedOldText>)>>,
+        Task<Result<(T, Option<ResolvedOldText>)>>,
        async_watch::Receiver<Option<Range<usize>>>,
    )
    where
@@ -439,29 +425,21 @@ impl EditAgent {
                }
            }

-            let matches = matcher.finish();
-
-            let old_range = if matches.len() == 1 {
-                matches.first()
+            let old_range = matcher.finish();
+            old_range_tx.send(old_range.clone())?;
+            if let Some(old_range) = old_range {
+                let line_indent =
+                    LineIndent::from_iter(matcher.query_lines().first().unwrap().chars());
+                Ok((
+                    edit_events,
+                    Some(ResolvedOldText {
+                        range: old_range,
+                        indent: line_indent,
+                    }),
+                ))
            } else {
-                // No matches or multiple ambiguous matches
-                None
-            };
-            old_range_tx.send(old_range.cloned())?;
-
-            let indent = LineIndent::from_iter(
-                matcher
-                    .query_lines()
-                    .first()
-                    .unwrap_or(&String::new())
-                    .chars(),
-            );
-            let resolved_old_texts = matches
-                .into_iter()
-                .map(|range| ResolvedOldText { range, indent })
-                .collect::<Vec<_>>();
-
-            Ok((edit_events, resolved_old_texts))
+                Ok((edit_events, None))
+            }
        });

        (task, old_range_rx)
@@ -1344,76 +1322,6 @@ mod tests {
        EditAgent::new(model, project, action_log, Templates::new())
    }

-    #[gpui::test(iterations = 10)]
-    async fn test_non_unique_text_error(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let original_text = indoc! {"
-                function foo() {
-                    return 42;
-                }
-
-                function bar() {
-                    return 42;
-                }
-
-                function baz() {
-                    return 42;
-                }
-            "};
-        let buffer = cx.new(|cx| Buffer::local(original_text, cx));
-        let (apply, mut events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        // When <old_text> matches text in more than one place
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text>
-                return 42;
-                </old_text>
-                <new_text>
-                return 100;
-                </new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        // Then the text should remain unchanged
-        let result_text = buffer.read_with(cx, |buffer, _| buffer.snapshot().text());
-        assert_eq!(
-            result_text,
-            indoc! {"
-                function foo() {
-                    return 42;
-                }
-
-                function bar() {
-                    return 42;
-                }
-
-                function baz() {
-                    return 42;
-                }
-            "},
-            "Text should remain unchanged when there are multiple matches"
-        );
-
-        // And AmbiguousEditRange even should be emitted
-        let events = drain_events(&mut events);
-        let ambiguous_ranges = vec![17..31, 52..66, 87..101];
-        assert!(
-            events.contains(&EditAgentOutputEvent::AmbiguousEditRange(ambiguous_ranges)),
-            "Should emit AmbiguousEditRange for non-unique text"
-        );
-    }
-
    fn drain_events(
        stream: &mut UnboundedReceiver<EditAgentOutputEvent>,
    ) -> Vec<EditAgentOutputEvent> {
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1351,7 +1351,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {

    let mismatched_tag_ratio =
        cumulative_parser_metrics.mismatched_tags as f32 / cumulative_parser_metrics.tags as f32;
-    if mismatched_tag_ratio > 0.10 {
+    if mismatched_tag_ratio > 0.05 {
        for eval_output in eval_outputs {
            println!("{}", eval_output);
        }
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -11,7 +11,7 @@ pub struct StreamingFuzzyMatcher {
    snapshot: TextBufferSnapshot,
    query_lines: Vec<String>,
    incomplete_line: String,
-    best_matches: Vec<Range<usize>>,
+    best_match: Option<Range<usize>>,
    matrix: SearchMatrix,
 }

@@ -22,7 +22,7 @@ impl StreamingFuzzyMatcher {
            snapshot,
            query_lines: Vec::new(),
            incomplete_line: String::new(),
-            best_matches: Vec::new(),
+            best_match: None,
            matrix: SearchMatrix::new(buffer_line_count + 1),
        }
    }
@@ -55,41 +55,31 @@ impl StreamingFuzzyMatcher {

            self.incomplete_line.replace_range(..last_pos + 1, "");

-            self.best_matches = self.resolve_location_fuzzy();
-
-            if let Some(first_match) = self.best_matches.first() {
-                Some(first_match.clone())
-            } else {
-                None
-            }
-        } else {
-            if let Some(first_match) = self.best_matches.first() {
-                Some(first_match.clone())
-            } else {
-                None
-            }
+            self.best_match = self.resolve_location_fuzzy();
        }
+
+        self.best_match.clone()
    }

-    /// Finish processing and return the final best match(es).
+    /// Finish processing and return the final best match.
    ///
    /// This processes any remaining incomplete line before returning the final
    /// match result.
-    pub fn finish(&mut self) -> Vec<Range<usize>> {
+    pub fn finish(&mut self) -> Option<Range<usize>> {
        // Process any remaining incomplete line
        if !self.incomplete_line.is_empty() {
            self.query_lines.push(self.incomplete_line.clone());
-            self.incomplete_line.clear();
-            self.best_matches = self.resolve_location_fuzzy();
+            self.best_match = self.resolve_location_fuzzy();
        }
-        self.best_matches.clone()
+
+        self.best_match.clone()
    }

-    fn resolve_location_fuzzy(&mut self) -> Vec<Range<usize>> {
+    fn resolve_location_fuzzy(&mut self) -> Option<Range<usize>> {
        let new_query_line_count = self.query_lines.len();
        let old_query_line_count = self.matrix.rows.saturating_sub(1);
        if new_query_line_count == old_query_line_count {
-            return Vec::new();
+            return None;
        }

        self.matrix.resize_rows(new_query_line_count + 1);
@@ -142,61 +132,53 @@ impl StreamingFuzzyMatcher {
            }
        }

-        // Find all matches with the best cost
+        // Traceback to find the best match
        let buffer_line_count = self.snapshot.max_point().row as usize + 1;
+        let mut buffer_row_end = buffer_line_count as u32;
        let mut best_cost = u32::MAX;
-        let mut matches_with_best_cost = Vec::new();
-
        for col in 1..=buffer_line_count {
            let cost = self.matrix.get(new_query_line_count, col).cost;
            if cost < best_cost {
                best_cost = cost;
-                matches_with_best_cost.clear();
-                matches_with_best_cost.push(col as u32);
-            } else if cost == best_cost {
-                matches_with_best_cost.push(col as u32);
+                buffer_row_end = col as u32;
            }
        }

-        // Find ranges for the matches
-        let mut valid_matches = Vec::new();
-        for &buffer_row_end in &matches_with_best_cost {
-            let mut matched_lines = 0;
-            let mut query_row = new_query_line_count;
-            let mut buffer_row_start = buffer_row_end;
-            while query_row > 0 && buffer_row_start > 0 {
-                let current = self.matrix.get(query_row, buffer_row_start as usize);
-                match current.direction {
-                    SearchDirection::Diagonal => {
-                        query_row -= 1;
-                        buffer_row_start -= 1;
-                        matched_lines += 1;
-                    }
-                    SearchDirection::Up => {
-                        query_row -= 1;
-                    }
-                    SearchDirection::Left => {
-                        buffer_row_start -= 1;
-                    }
+        let mut matched_lines = 0;
+        let mut query_row = new_query_line_count;
+        let mut buffer_row_start = buffer_row_end;
+        while query_row > 0 && buffer_row_start > 0 {
+            let current = self.matrix.get(query_row, buffer_row_start as usize);
+            match current.direction {
+                SearchDirection::Diagonal => {
+                    query_row -= 1;
+                    buffer_row_start -= 1;
+                    matched_lines += 1;
+                }
+                SearchDirection::Up => {
+                    query_row -= 1;
+                }
+                SearchDirection::Left => {
+                    buffer_row_start -= 1;
                }
            }
-
-            let matched_buffer_row_count = buffer_row_end - buffer_row_start;
-            let matched_ratio = matched_lines as f32
-                / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
-            if matched_ratio >= 0.8 {
-                let buffer_start_ix = self
-                    .snapshot
-                    .point_to_offset(Point::new(buffer_row_start, 0));
-                let buffer_end_ix = self.snapshot.point_to_offset(Point::new(
-                    buffer_row_end - 1,
-                    self.snapshot.line_len(buffer_row_end - 1),
-                ));
-                valid_matches.push((buffer_row_start, buffer_start_ix..buffer_end_ix));
-            }
        }

-        valid_matches.into_iter().map(|(_, range)| range).collect()
+        let matched_buffer_row_count = buffer_row_end - buffer_row_start;
+        let matched_ratio = matched_lines as f32
+            / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
+        if matched_ratio >= 0.8 {
+            let buffer_start_ix = self
+                .snapshot
+                .point_to_offset(Point::new(buffer_row_start, 0));
+            let buffer_end_ix = self.snapshot.point_to_offset(Point::new(
+                buffer_row_end - 1,
+                self.snapshot.line_len(buffer_row_end - 1),
+            ));
+            Some(buffer_start_ix..buffer_end_ix)
+        } else {
+            None
+        }
    }
 }

@@ -656,35 +638,28 @@ mod tests {
            matcher.push(chunk);
        }

-        let actual_ranges = matcher.finish();
+        let result = matcher.finish();

        // If no expected ranges, we expect no match
        if expected_ranges.is_empty() {
-            assert!(
-                actual_ranges.is_empty(),
+            assert_eq!(
+                result, None,
                "Expected no match for query: {:?}, but found: {:?}",
-                query,
-                actual_ranges
+                query, result
            );
        } else {
+            let mut actual_ranges = Vec::new();
+            if let Some(range) = result {
+                actual_ranges.push(range);
+            }
+
            let text_with_actual_range = generate_marked_text(&text, &actual_ranges, false);
            pretty_assertions::assert_eq!(
                text_with_actual_range,
                text_with_expected_range,
-                indoc! {"
-                    Query: {:?}
-                    Chunks: {:?}
-                    Expected marked text: {}
-                    Actual marked text: {}
-                    Expected ranges: {:?}
-                    Actual ranges: {:?}"
-                },
+                "Query: {:?}, Chunks: {:?}",
                query,
-                chunks,
-                text_with_expected_range,
-                text_with_actual_range,
-                expected_ranges,
-                actual_ranges
+                chunks
            );
        }
    }
@@ -712,11 +687,8 @@ mod tests {

    fn finish(mut finder: StreamingFuzzyMatcher) -> Option<String> {
        let snapshot = finder.snapshot.clone();
-        let matches = finder.finish();
-        if let Some(range) = matches.first() {
-            Some(snapshot.text_for_range(range.clone()).collect::<String>())
-        } else {
-            None
-        }
+        finder
+            .finish()
+            .map(|range| snapshot.text_for_range(range).collect::<String>())
    }
 }
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -2,7 +2,6 @@ use crate::{
    Templates,
    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent},
    schema::json_schema_for,
-    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{
@@ -14,7 +13,7 @@ use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, WeakEntity, pulsating_between, px,
+    TextStyleRefinement, WeakEntity, pulsating_between,
 };
 use indoc::formatdoc;
 use language::{
@@ -129,10 +128,6 @@ impl Tool for EditFileTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        true
-    }
-
    fn description(&self) -> String {
        include_str!("edit_file_tool/description.md").to_string()
    }
@@ -239,7 +234,6 @@ impl Tool for EditFileTool {
            };

            let mut hallucinated_old_text = false;
-            let mut ambiguous_ranges = Vec::new();
            while let Some(event) = events.next().await {
                match event {
                    EditAgentOutputEvent::Edited => {
@@ -248,7 +242,6 @@ impl Tool for EditFileTool {
                        }
                    }
                    EditAgentOutputEvent::UnresolvedEditRange => hallucinated_old_text = true,
-                    EditAgentOutputEvent::AmbiguousEditRange(ranges) => ambiguous_ranges = ranges,
                    EditAgentOutputEvent::ResolvingEditRange(range) => {
                        if let Some(card) = card_clone.as_ref() {
                            card.update(cx, |card, cx| card.reveal_range(range, cx))?;
@@ -331,17 +324,6 @@ impl Tool for EditFileTool {
                        I can perform the requested edits.
                    "}
                );
-                anyhow::ensure!(
-                    ambiguous_ranges.is_empty(),
-                    // TODO: Include ambiguous_ranges, converted to line numbers.
-                    //       This would work best if we add `line_hint` parameter
-                    //       to edit_file_tool
-                    formatdoc! {"
-                        <old_text> matches more than one position in the file. Read the
-                        relevant sections of {input_path} again and extend <old_text> so
-                        that I can perform the requested edits.
-                    "}
-                );
                Ok(ToolResultOutput {
                    content: ToolResultContent::Text("No edits were made.".into()),
                    output: serde_json::to_value(output).ok(),
@@ -902,8 +884,30 @@ impl ToolCard for EditFileToolCard {
            (element.into_any_element(), line_height)
        });

+        let (full_height_icon, full_height_tooltip_label) = if self.full_height_expanded {
+            (IconName::ChevronUp, "Collapse Code Block")
+        } else {
+            (IconName::ChevronDown, "Expand Code Block")
+        };
+
+        let gradient_overlay =
+            div()
+                .absolute()
+                .bottom_0()
+                .left_0()
+                .w_full()
+                .h_2_5()
+                .bg(gpui::linear_gradient(
+                    0.,
+                    gpui::linear_color_stop(cx.theme().colors().editor_background, 0.),
+                    gpui::linear_color_stop(cx.theme().colors().editor_background.opacity(0.), 1.),
+                ));
+
        let border_color = cx.theme().colors().border.opacity(0.6);

+        const DEFAULT_COLLAPSED_LINES: u32 = 10;
+        let is_collapsible = self.total_lines.unwrap_or(0) > DEFAULT_COLLAPSED_LINES;
+
        let waiting_for_diff = {
            let styles = [
                ("w_4_5", (0.1, 0.85), 2000),
@@ -988,34 +992,48 @@ impl ToolCard for EditFileToolCard {
                card.child(waiting_for_diff)
            })
            .when(self.preview_expanded && !self.is_loading(), |card| {
-                let editor_view = v_flex()
-                    .relative()
-                    .h_full()
-                    .when(!self.full_height_expanded, |editor_container| {
-                        editor_container.max_h(px(COLLAPSED_LINES as f32 * editor_line_height.0))
-                    })
-                    .overflow_hidden()
-                    .border_t_1()
-                    .border_color(border_color)
-                    .bg(cx.theme().colors().editor_background)
-                    .child(editor);
-
                card.child(
-                    ToolOutputPreview::new(editor_view.into_any_element(), self.editor.entity_id())
-                        .with_total_lines(self.total_lines.unwrap_or(0) as usize)
-                        .toggle_state(self.full_height_expanded)
-                        .with_collapsed_fade()
-                        .on_toggle({
-                            let this = cx.entity().downgrade();
-                            move |is_expanded, _window, cx| {
-                                if let Some(this) = this.upgrade() {
-                                    this.update(cx, |this, _cx| {
-                                        this.full_height_expanded = is_expanded;
-                                    });
-                                }
-                            }
-                        }),
+                    v_flex()
+                        .relative()
+                        .h_full()
+                        .when(!self.full_height_expanded, |editor_container| {
+                            editor_container
+                                .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
+                        })
+                        .overflow_hidden()
+                        .border_t_1()
+                        .border_color(border_color)
+                        .bg(cx.theme().colors().editor_background)
+                        .child(editor)
+                        .when(
+                            !self.full_height_expanded && is_collapsible,
+                            |editor_container| editor_container.child(gradient_overlay),
+                        ),
                )
+                .when(is_collapsible, |card| {
+                    card.child(
+                        h_flex()
+                            .id(("expand-button", self.editor.entity_id()))
+                            .flex_none()
+                            .cursor_pointer()
+                            .h_5()
+                            .justify_center()
+                            .border_t_1()
+                            .rounded_b_md()
+                            .border_color(border_color)
+                            .bg(cx.theme().colors().editor_background)
+                            .hover(|style| style.bg(cx.theme().colors().element_hover.opacity(0.1)))
+                            .child(
+                                Icon::new(full_height_icon)
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .tooltip(Tooltip::text(full_height_tooltip_label))
+                            .on_click(cx.listener(move |this, _event, _window, _cx| {
+                                this.full_height_expanded = !this.full_height_expanded;
+                            })),
+                    )
+                })
            })
    }
 }
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -118,11 +118,7 @@ impl Tool for FetchTool {
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
-    }
-
-    fn may_perform_edits(&self) -> bool {
-        false
+        true
    }

    fn description(&self) -> String {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -59,10 +59,6 @@ impl Tool for FindPathTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./find_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -6,12 +6,11 @@ use gpui::{AnyWindowHandle, App, Entity, Task};
 use language::{OffsetRangeExt, ParseStatus, Point};
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{
-    Project, WorktreeSettings,
+    Project,
    search::{SearchQuery, SearchResult},
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::Settings;
 use std::{cmp, fmt::Write, sync::Arc};
 use ui::IconName;
 use util::RangeExt;
@@ -61,10 +60,6 @@ impl Tool for GrepTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./grep_tool/description.md").into()
    }
@@ -131,23 +126,6 @@ impl Tool for GrepTool {
            }
        };

-        // Exclude global file_scan_exclusions and private_files settings
-        let exclude_matcher = {
-            let global_settings = WorktreeSettings::get_global(cx);
-            let exclude_patterns = global_settings
-                .file_scan_exclusions
-                .sources()
-                .iter()
-                .chain(global_settings.private_files.sources().iter());
-
-            match PathMatcher::new(exclude_patterns) {
-                Ok(matcher) => matcher,
-                Err(error) => {
-                    return Task::ready(Err(anyhow!("invalid exclude pattern: {error}"))).into();
-                }
-            }
-        };
-
        let query = match SearchQuery::regex(
            &input.regex,
            false,
@@ -155,7 +133,7 @@ impl Tool for GrepTool {
            false,
            false,
            include_matcher,
-            exclude_matcher,
+            PathMatcher::default(), // For now, keep it simple and don't enable an exclude pattern.
            true, // Always match file include pattern against *full project paths* that start with a project root.
            None,
        ) {
@@ -178,24 +156,12 @@ impl Tool for GrepTool {
                    continue;
                }

-                let Ok((Some(path), mut parse_status)) = buffer.read_with(cx, |buffer, cx| {
+                let (Some(path), mut parse_status) = buffer.read_with(cx, |buffer, cx| {
                    (buffer.file().map(|file| file.full_path(cx)), buffer.parse_status())
-                }) else {
+                })? else {
                    continue;
                };

-                // Check if this file should be excluded based on its worktree settings
-                if let Ok(Some(project_path)) = project.read_with(cx, |project, cx| {
-                    project.find_project_path(&path, cx)
-                }) {
-                    if cx.update(|cx| {
-                        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-                        worktree_settings.is_path_excluded(&project_path.path)
-                            || worktree_settings.is_path_private(&project_path.path)
-                    }).unwrap_or(false) {
-                        continue;
-                    }
-                }

                while *parse_status.borrow() != ParseStatus::Idle {
                    parse_status.changed().await?;
@@ -314,11 +280,10 @@ impl Tool for GrepTool {
 mod tests {
    use super::*;
    use assistant_tool::Tool;
-    use gpui::{AppContext, TestAppContext, UpdateGlobal};
+    use gpui::{AppContext, TestAppContext};
    use language::{Language, LanguageConfig, LanguageMatcher};
    use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project, WorktreeSettings};
-    use serde_json::json;
+    use project::{FakeFs, Project};
    use settings::SettingsStore;
    use unindent::Unindent;
    use util::path;
@@ -330,7 +295,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor().clone());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            serde_json::json!({
                "src": {
                    "main.rs": "fn main() {\n    println!(\"Hello, world!\");\n}",
@@ -418,7 +383,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor().clone());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            serde_json::json!({
                "case_test.txt": "This file has UPPERCASE and lowercase text.\nUPPERCASE patterns should match only with case_sensitive: true",
            }),
@@ -499,7 +464,7 @@ mod tests {

        // Create test file with syntax structures
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            serde_json::json!({
                "test_syntax.rs": r#"
                    fn top_level_function() {
@@ -820,488 +785,4 @@ mod tests {
        .with_outline_query(include_str!("../../languages/src/rust/outline.scm"))
        .unwrap()
    }
-
-    #[gpui::test]
-    async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/"),
-            json!({
-                "project_root": {
-                    "allowed_file.rs": "fn main() { println!(\"This file is in the project\"); }",
-                    ".mysecrets": "SECRET_KEY=abc123\nfn secret() { /* private */ }",
-                    ".secretdir": {
-                        "config": "fn special_configuration() { /* excluded */ }"
-                    },
-                    ".mymetadata": "fn custom_metadata() { /* excluded */ }",
-                    "subdir": {
-                        "normal_file.rs": "fn normal_file_content() { /* Normal */ }",
-                        "special.privatekey": "fn private_key_content() { /* private */ }",
-                        "data.mysensitive": "fn sensitive_data() { /* private */ }"
-                    }
-                },
-                "outside_project": {
-                    "sensitive_file.rs": "fn outside_function() { /* This file is outside the project */ }"
-                }
-            }),
-        )
-        .await;
-
-        cx.update(|cx| {
-            use gpui::UpdateGlobal;
-            use project::WorktreeSettings;
-            use settings::SettingsStore;
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                    ]);
-                    settings.private_files = Some(vec![
-                        "**/.mysecrets".to_string(),
-                        "**/*.privatekey".to_string(),
-                        "**/*.mysensitive".to_string(),
-                    ]);
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project_root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-
-        // Searching for files outside the project worktree should return no results
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "outside_function"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not find files outside the project worktree"
-        );
-
-        // Searching within the project should succeed
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "main"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.iter().any(|p| p.contains("allowed_file.rs")),
-            "grep_tool should be able to search files inside worktrees"
-        );
-
-        // Searching files that match file_scan_exclusions should return no results
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "special_configuration"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search files in .secretdir (file_scan_exclusions)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "custom_metadata"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mymetadata files (file_scan_exclusions)"
-        );
-
-        // Searching private files should return no results
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "SECRET_KEY"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mysecrets (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "private_key_content"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .privatekey files (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "sensitive_data"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mysensitive files (private_files)"
-        );
-
-        // Searching a normal file should still work, even with private_files configured
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "normal_file_content"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.iter().any(|p| p.contains("normal_file.rs")),
-            "Should be able to search normal files"
-        );
-
-        // Path traversal attempts with .. in include_pattern should not escape project
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "outside_function",
-                    "include_pattern": "../outside_project/**/*.rs"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        let results = result.unwrap();
-        let paths = extract_paths_from_results(&results.content.as_str().unwrap());
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not allow escaping project boundaries with relative paths"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_grep_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private files
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs"]
-                    }"#
-                },
-                "src": {
-                    "main.rs": "fn main() { let secret_key = \"hidden\"; }",
-                    "secret.rs": "const API_KEY: &str = \"secret_value\";",
-                    "utils.rs": "pub fn get_config() -> String { \"config\".to_string() }"
-                },
-                "tests": {
-                    "test.rs": "fn test_secret() { assert!(true); }",
-                    "fixture.sql": "SELECT * FROM secret_table;"
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private files
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                },
-                "lib": {
-                    "public.js": "export function getSecret() { return 'public'; }",
-                    "private.js": "const SECRET_KEY = \"private_value\";",
-                    "data.json": "{\"secret_data\": \"hidden\"}"
-                },
-                "docs": {
-                    "README.md": "# Documentation with secret info",
-                    "internal.md": "Internal secret documentation"
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.private_files = Some(vec!["**/.env".to_string()]);
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        // Wait for worktrees to be fully scanned
-        cx.executor().run_until_parked();
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-
-        // Search for "secret" - should exclude files based on worktree-specific settings
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "secret",
-                    "case_sensitive": false
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        let paths = extract_paths_from_results(&content);
-
-        // Should find matches in non-private files
-        assert!(
-            paths.iter().any(|p| p.contains("main.rs")),
-            "Should find 'secret' in worktree1/src/main.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("test.rs")),
-            "Should find 'secret' in worktree1/tests/test.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("public.js")),
-            "Should find 'secret' in worktree2/lib/public.js"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("README.md")),
-            "Should find 'secret' in worktree2/docs/README.md"
-        );
-
-        // Should NOT find matches in private/excluded files based on worktree settings
-        assert!(
-            !paths.iter().any(|p| p.contains("secret.rs")),
-            "Should not search in worktree1/src/secret.rs (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("fixture.sql")),
-            "Should not search in worktree1/tests/fixture.sql (local file_scan_exclusions)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("private.js")),
-            "Should not search in worktree2/lib/private.js (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("data.json")),
-            "Should not search in worktree2/lib/data.json (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("internal.md")),
-            "Should not search in worktree2/docs/internal.md (local file_scan_exclusions)"
-        );
-
-        // Test with `include_pattern` specific to one worktree
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "regex": "secret",
-                    "include_pattern": "worktree1/**/*.rs"
-                });
-                Arc::new(GrepTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        let paths = extract_paths_from_results(&content);
-
-        // Should only find matches in worktree1 *.rs files (excluding private ones)
-        assert!(
-            paths.iter().any(|p| p.contains("main.rs")),
-            "Should find match in worktree1/src/main.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("test.rs")),
-            "Should find match in worktree1/tests/test.rs"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("secret.rs")),
-            "Should not find match in excluded worktree1/src/secret.rs"
-        );
-        assert!(
-            paths.iter().all(|p| !p.contains("worktree2")),
-            "Should not find any matches in worktree2"
-        );
-    }
-
-    // Helper function to extract file paths from grep results
-    fn extract_paths_from_results(results: &str) -> Vec<String> {
-        results
-            .lines()
-            .filter(|line| line.starts_with("## Matches in "))
-            .map(|line| {
-                line.strip_prefix("## Matches in ")
-                    .unwrap()
-                    .trim()
-                    .to_string()
-            })
-            .collect()
-    }
 }
--- a/crates/assistant_tools/src/grep_tool/description.md
+++ b/crates/assistant_tools/src/grep_tool/description.md
@@ -6,4 +6,3 @@ Searches the contents of files in the project with a regular expression
 - Never use this tool to search for paths. Only search file contents with this tool.
 - Use this tool when you need to find files containing specific patterns
 - Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
- DO NOT use HTML entities solely to escape characters in the tool parameters.
--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -3,10 +3,9 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, Entity, Task};
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::{Project, WorktreeSettings};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::Settings;
 use std::{fmt::Write, path::Path, sync::Arc};
 use ui::IconName;
 use util::markdown::MarkdownInlineCode;
@@ -49,10 +48,6 @@ impl Tool for ListDirectoryTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./list_directory_tool/description.md").into()
    }
@@ -120,80 +115,21 @@ impl Tool for ListDirectoryTool {
        else {
            return Task::ready(Err(anyhow!("Worktree not found"))).into();
        };
+        let worktree = worktree.read(cx);

-        // Check if the directory whose contents we're listing is itself excluded or private
-        let global_settings = WorktreeSettings::get_global(cx);
-        if global_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's global `file_scan_exclusions` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        if global_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's global `private_files` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-        if worktree_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's worktree`file_scan_exclusions` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        if worktree_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's worktree `private_paths` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        let worktree_snapshot = worktree.read(cx).snapshot();
-        let worktree_root_name = worktree.read(cx).root_name().to_string();
-
-        let Some(entry) = worktree_snapshot.entry_for_path(&project_path.path) else {
+        let Some(entry) = worktree.entry_for_path(&project_path.path) else {
            return Task::ready(Err(anyhow!("Path not found: {}", input.path))).into();
        };

        if !entry.is_dir() {
            return Task::ready(Err(anyhow!("{} is not a directory.", input.path))).into();
        }
-        let worktree_snapshot = worktree.read(cx).snapshot();

        let mut folders = Vec::new();
        let mut files = Vec::new();

-        for entry in worktree_snapshot.child_entries(&project_path.path) {
-            // Skip private and excluded files and directories
-            if global_settings.is_path_private(&entry.path)
-                || global_settings.is_path_excluded(&entry.path)
-            {
-                continue;
-            }
-
-            if project
-                .read(cx)
-                .find_project_path(&entry.path, cx)
-                .map(|project_path| {
-                    let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-
-                    worktree_settings.is_path_excluded(&project_path.path)
-                        || worktree_settings.is_path_private(&project_path.path)
-                })
-                .unwrap_or(false)
-            {
-                continue;
-            }
-
-            let full_path = Path::new(&worktree_root_name)
+        for entry in worktree.child_entries(&project_path.path) {
+            let full_path = Path::new(worktree.root_name())
                .join(&entry.path)
                .display()
                .to_string();
@@ -226,10 +162,10 @@ impl Tool for ListDirectoryTool {
 mod tests {
    use super::*;
    use assistant_tool::Tool;
-    use gpui::{AppContext, TestAppContext, UpdateGlobal};
+    use gpui::{AppContext, TestAppContext};
    use indoc::indoc;
    use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project, WorktreeSettings};
+    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
    use util::path;
@@ -257,7 +193,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/project"),
+            "/project",
            json!({
                "src": {
                    "main.rs": "fn main() {}",
@@ -387,7 +323,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/project"),
+            "/project",
            json!({
                "empty_dir": {}
            }),
@@ -419,7 +355,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/project"),
+            "/project",
            json!({
                "file.txt": "content"
            }),
@@ -472,394 +408,4 @@ mod tests {
                .contains("is not a directory")
        );
    }
-
-    #[gpui::test]
-    async fn test_list_directory_security(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                "normal_dir": {
-                    "file1.txt": "content",
-                    "file2.txt": "content"
-                },
-                ".mysecrets": "SECRET_KEY=abc123",
-                ".secretdir": {
-                    "config": "special configuration",
-                    "secret.txt": "secret content"
-                },
-                ".mymetadata": "custom metadata",
-                "visible_dir": {
-                    "normal.txt": "normal content",
-                    "special.privatekey": "private key content",
-                    "data.mysensitive": "sensitive data",
-                    ".hidden_subdir": {
-                        "hidden_file.txt": "hidden content"
-                    }
-                }
-            }),
-        )
-        .await;
-
-        // Configure settings explicitly
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                        "**/.hidden_subdir".to_string(),
-                    ]);
-                    settings.private_files = Some(vec![
-                        "**/.mysecrets".to_string(),
-                        "**/*.privatekey".to_string(),
-                        "**/*.mysensitive".to_string(),
-                    ]);
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-        let tool = Arc::new(ListDirectoryTool);
-
-        // Listing root directory should exclude private and excluded files
-        let input = json!({
-            "path": "project"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-
-        // Should include normal directories
-        assert!(content.contains("normal_dir"), "Should list normal_dir");
-        assert!(content.contains("visible_dir"), "Should list visible_dir");
-
-        // Should NOT include excluded or private files
-        assert!(
-            !content.contains(".secretdir"),
-            "Should not list .secretdir (file_scan_exclusions)"
-        );
-        assert!(
-            !content.contains(".mymetadata"),
-            "Should not list .mymetadata (file_scan_exclusions)"
-        );
-        assert!(
-            !content.contains(".mysecrets"),
-            "Should not list .mysecrets (private_files)"
-        );
-
-        // Trying to list an excluded directory should fail
-        let input = json!({
-            "path": "project/.secretdir"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(
-            result.is_err(),
-            "Should not be able to list excluded directory"
-        );
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("file_scan_exclusions"),
-            "Error should mention file_scan_exclusions"
-        );
-
-        // Listing a directory should exclude private files within it
-        let input = json!({
-            "path": "project/visible_dir"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-
-        // Should include normal files
-        assert!(content.contains("normal.txt"), "Should list normal.txt");
-
-        // Should NOT include private files
-        assert!(
-            !content.contains("privatekey"),
-            "Should not list .privatekey files (private_files)"
-        );
-        assert!(
-            !content.contains("mysensitive"),
-            "Should not list .mysensitive files (private_files)"
-        );
-
-        // Should NOT include subdirectories that match exclusions
-        assert!(
-            !content.contains(".hidden_subdir"),
-            "Should not list .hidden_subdir (file_scan_exclusions)"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private files
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs", "**/config.toml"]
-                    }"#
-                },
-                "src": {
-                    "main.rs": "fn main() { println!(\"Hello from worktree1\"); }",
-                    "secret.rs": "const API_KEY: &str = \"secret_key_1\";",
-                    "config.toml": "[database]\nurl = \"postgres://localhost/db1\""
-                },
-                "tests": {
-                    "test.rs": "mod tests { fn test_it() {} }",
-                    "fixture.sql": "CREATE TABLE users (id INT, name VARCHAR(255));"
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private files
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                },
-                "lib": {
-                    "public.js": "export function greet() { return 'Hello from worktree2'; }",
-                    "private.js": "const SECRET_TOKEN = \"private_token_2\";",
-                    "data.json": "{\"api_key\": \"json_secret_key\"}"
-                },
-                "docs": {
-                    "README.md": "# Public Documentation",
-                    "internal.md": "# Internal Secrets and Configuration"
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.private_files = Some(vec!["**/.env".to_string()]);
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        // Wait for worktrees to be fully scanned
-        cx.executor().run_until_parked();
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-        let tool = Arc::new(ListDirectoryTool);
-
-        // Test listing worktree1/src - should exclude secret.rs and config.toml based on local settings
-        let input = json!({
-            "path": "worktree1/src"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        assert!(content.contains("main.rs"), "Should list main.rs");
-        assert!(
-            !content.contains("secret.rs"),
-            "Should not list secret.rs (local private_files)"
-        );
-        assert!(
-            !content.contains("config.toml"),
-            "Should not list config.toml (local private_files)"
-        );
-
-        // Test listing worktree1/tests - should exclude fixture.sql based on local settings
-        let input = json!({
-            "path": "worktree1/tests"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        assert!(content.contains("test.rs"), "Should list test.rs");
-        assert!(
-            !content.contains("fixture.sql"),
-            "Should not list fixture.sql (local file_scan_exclusions)"
-        );
-
-        // Test listing worktree2/lib - should exclude private.js and data.json based on local settings
-        let input = json!({
-            "path": "worktree2/lib"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        assert!(content.contains("public.js"), "Should list public.js");
-        assert!(
-            !content.contains("private.js"),
-            "Should not list private.js (local private_files)"
-        );
-        assert!(
-            !content.contains("data.json"),
-            "Should not list data.json (local private_files)"
-        );
-
-        // Test listing worktree2/docs - should exclude internal.md based on local settings
-        let input = json!({
-            "path": "worktree2/docs"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        let content = result.content.as_str().unwrap();
-        assert!(content.contains("README.md"), "Should list README.md");
-        assert!(
-            !content.contains("internal.md"),
-            "Should not list internal.md (local file_scan_exclusions)"
-        );
-
-        // Test trying to list an excluded directory directly
-        let input = json!({
-            "path": "worktree1/src/secret.rs"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        // This should fail because we're trying to list a file, not a directory
-        assert!(result.is_err(), "Should fail when trying to list a file");
-    }
 }
--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -46,10 +46,6 @@ impl Tool for MovePathTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        true
-    }
-
    fn description(&self) -> String {
        include_str!("./move_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -37,10 +37,6 @@ impl Tool for NowTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        "Returns the current datetime in RFC 3339 format. Only use this tool when the user specifically asks for it or the current task would benefit from knowing the current datetime.".into()
    }
--- a/crates/assistant_tools/src/open_tool.rs
+++ b/crates/assistant_tools/src/open_tool.rs
@@ -26,9 +26,7 @@ impl Tool for OpenTool {
    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        true
    }
-    fn may_perform_edits(&self) -> bool {
-        false
-    }
+
    fn description(&self) -> String {
        include_str!("./open_tool/description.md").to_string()
    }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -12,10 +12,9 @@ use language::{Anchor, Point};
 use language_model::{
    LanguageModel, LanguageModelImage, LanguageModelRequest, LanguageModelToolSchemaFormat,
 };
-use project::{AgentLocation, Project, WorktreeSettings};
+use project::{AgentLocation, Project};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::Settings;
 use std::sync::Arc;
 use ui::IconName;
 use util::markdown::MarkdownInlineCode;
@@ -59,10 +58,6 @@ impl Tool for ReadFileTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./read_file_tool/description.md").into()
    }
@@ -108,48 +103,12 @@ impl Tool for ReadFileTool {
            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path))).into();
        };

-        // Error out if this path is either excluded or private in global settings
-        let global_settings = WorktreeSettings::get_global(cx);
-        if global_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the global `file_scan_exclusions` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        if global_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the global `private_files` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        // Error out if this path is either excluded or private in worktree settings
-        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-        if worktree_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the worktree `file_scan_exclusions` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
-        if worktree_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the worktree `private_files` setting: {}",
-                &input.path
-            )))
-            .into();
-        }
-
        let file_path = input.path.clone();

        if image_store::is_image_file(&project, &project_path, cx) {
            if !model.supports_images() {
                return Task::ready(Err(anyhow!(
-                    "Attempted to read an image, but Zed doesn't currently support sending images to {}.",
+                    "Attempted to read an image, but Zed doesn't currently sending images to {}.",
                    model.name().0
                )))
                .into();
@@ -289,10 +248,10 @@ impl Tool for ReadFileTool {
 #[cfg(test)]
 mod test {
    use super::*;
-    use gpui::{AppContext, TestAppContext, UpdateGlobal};
+    use gpui::{AppContext, TestAppContext};
    use language::{Language, LanguageConfig, LanguageMatcher};
    use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project, WorktreeSettings};
+    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
    use util::path;
@@ -302,7 +261,7 @@ mod test {
        init_test(cx);

        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/root"), json!({})).await;
+        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let model = Arc::new(FakeLanguageModel::default());
@@ -336,7 +295,7 @@ mod test {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            json!({
                "small_file.txt": "This is a small file content"
            }),
@@ -375,7 +334,7 @@ mod test {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            json!({
                "large_file.rs": (0..1000).map(|i| format!("struct Test{} {{\n    a: u32,\n    b: usize,\n}}", i)).collect::<Vec<_>>().join("\n")
            }),
@@ -466,7 +425,7 @@ mod test {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            json!({
                "multiline.txt": "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
            }),
@@ -507,7 +466,7 @@ mod test {

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
-            path!("/root"),
+            "/root",
            json!({
                "multiline.txt": "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
            }),
@@ -638,544 +597,4 @@ mod test {
        )
        .unwrap()
    }
-
-    #[gpui::test]
-    async fn test_read_file_security(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/"),
-            json!({
-                "project_root": {
-                    "allowed_file.txt": "This file is in the project",
-                    ".mysecrets": "SECRET_KEY=abc123",
-                    ".secretdir": {
-                        "config": "special configuration"
-                    },
-                    ".mymetadata": "custom metadata",
-                    "subdir": {
-                        "normal_file.txt": "Normal file content",
-                        "special.privatekey": "private key content",
-                        "data.mysensitive": "sensitive data"
-                    }
-                },
-                "outside_project": {
-                    "sensitive_file.txt": "This file is outside the project"
-                }
-            }),
-        )
-        .await;
-
-        cx.update(|cx| {
-            use gpui::UpdateGlobal;
-            use project::WorktreeSettings;
-            use settings::SettingsStore;
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                    ]);
-                    settings.private_files = Some(vec![
-                        "**/.mysecrets".to_string(),
-                        "**/*.privatekey".to_string(),
-                        "**/*.mysensitive".to_string(),
-                    ]);
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project_root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-
-        // Reading a file outside the project worktree should fail
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "/outside_project/sensitive_file.txt"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read an absolute path outside a worktree"
-        );
-
-        // Reading a file within the project should succeed
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/allowed_file.txt"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_ok(),
-            "read_file_tool should be able to read files inside worktrees"
-        );
-
-        // Reading files that match file_scan_exclusions should fail
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/.secretdir/config"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read files in .secretdir (file_scan_exclusions)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/.mymetadata"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mymetadata files (file_scan_exclusions)"
-        );
-
-        // Reading private files should fail
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/.mysecrets"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mysecrets (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/subdir/special.privatekey"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .privatekey files (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/subdir/data.mysensitive"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mysensitive files (private_files)"
-        );
-
-        // Reading a normal file should still work, even with private_files configured
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/subdir/normal_file.txt"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(result.is_ok(), "Should be able to read normal files");
-        assert_eq!(
-            result.unwrap().content.as_str().unwrap(),
-            "Normal file content"
-        );
-
-        // Path traversal attempts with .. should fail
-        let result = cx
-            .update(|cx| {
-                let input = json!({
-                    "path": "project_root/../outside_project/sensitive_file.txt"
-                });
-                Arc::new(ReadFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read a relative path that resolves to outside a worktree"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_read_file_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private_files setting
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                "src": {
-                    "main.rs": "fn main() { println!(\"Hello from worktree1\"); }",
-                    "secret.rs": "const API_KEY: &str = \"secret_key_1\";",
-                    "config.toml": "[database]\nurl = \"postgres://localhost/db1\""
-                },
-                "tests": {
-                    "test.rs": "mod tests { fn test_it() {} }",
-                    "fixture.sql": "CREATE TABLE users (id INT, name VARCHAR(255));"
-                },
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs", "**/config.toml"]
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private_files setting
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                "lib": {
-                    "public.js": "export function greet() { return 'Hello from worktree2'; }",
-                    "private.js": "const SECRET_TOKEN = \"private_token_2\";",
-                    "data.json": "{\"api_key\": \"json_secret_key\"}"
-                },
-                "docs": {
-                    "README.md": "# Public Documentation",
-                    "internal.md": "# Internal Secrets and Configuration"
-                },
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<WorktreeSettings>(cx, |settings| {
-                    settings.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.private_files = Some(vec!["**/.env".to_string()]);
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-        let tool = Arc::new(ReadFileTool);
-
-        // Test reading allowed files in worktree1
-        let input = json!({
-            "path": "worktree1/src/main.rs"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        assert_eq!(
-            result.content.as_str().unwrap(),
-            "fn main() { println!(\"Hello from worktree1\"); }"
-        );
-
-        // Test reading private file in worktree1 should fail
-        let input = json!({
-            "path": "worktree1/src/secret.rs"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Error should mention worktree private_files setting"
-        );
-
-        // Test reading excluded file in worktree1 should fail
-        let input = json!({
-            "path": "worktree1/tests/fixture.sql"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `file_scan_exclusions` setting"),
-            "Error should mention worktree file_scan_exclusions setting"
-        );
-
-        // Test reading allowed files in worktree2
-        let input = json!({
-            "path": "worktree2/lib/public.js"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await
-            .unwrap();
-
-        assert_eq!(
-            result.content.as_str().unwrap(),
-            "export function greet() { return 'Hello from worktree2'; }"
-        );
-
-        // Test reading private file in worktree2 should fail
-        let input = json!({
-            "path": "worktree2/lib/private.js"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Error should mention worktree private_files setting"
-        );
-
-        // Test reading excluded file in worktree2 should fail
-        let input = json!({
-            "path": "worktree2/docs/internal.md"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `file_scan_exclusions` setting"),
-            "Error should mention worktree file_scan_exclusions setting"
-        );
-
-        // Test that files allowed in one worktree but not in another are handled correctly
-        // (e.g., config.toml is private in worktree1 but doesn't exist in worktree2)
-        let input = json!({
-            "path": "worktree1/src/config.toml"
-        });
-
-        let result = cx
-            .update(|cx| {
-                tool.clone().run(
-                    input,
-                    Arc::default(),
-                    project.clone(),
-                    action_log.clone(),
-                    model.clone(),
-                    None,
-                    cx,
-                )
-            })
-            .output
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Config.toml should be blocked by worktree1's private_files setting"
-        );
-    }
 }
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -1,7 +1,4 @@
-use crate::{
-    schema::json_schema_for,
-    ui::{COLLAPSED_LINES, ToolOutputPreview},
-};
+use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
@@ -28,7 +25,7 @@ use terminal_view::TerminalView;
 use theme::ThemeSettings;
 use ui::{Disclosure, Tooltip, prelude::*};
 use util::{
-    ResultExt, get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
+    get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
    time::duration_alt_display,
 };
 use workspace::Workspace;
@@ -80,10 +77,6 @@ impl Tool for TerminalTool {
        true
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./terminal_tool/description.md").to_string()
    }
@@ -261,24 +254,22 @@ impl Tool for TerminalTool {

                let terminal_view = window.update(cx, |_, window, cx| {
                    cx.new(|cx| {
-                        let mut view = TerminalView::new(
+                        TerminalView::new(
                            terminal.clone(),
                            workspace.downgrade(),
                            None,
                            project.downgrade(),
+                            true,
                            window,
                            cx,
-                        );
-                        view.set_embedded_mode(None, cx);
-                        view
+                        )
                    })
                })?;

-                card.update(cx, |card, _| {
+                let _ = card.update(cx, |card, _| {
                    card.terminal = Some(terminal_view.clone());
                    card.start_instant = Instant::now();
-                })
-                .log_err();
+                });

                let exit_status = terminal
                    .update(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
@@ -294,7 +285,7 @@ impl Tool for TerminalTool {
                    exit_status.map(portable_pty::ExitStatus::from),
                );

-                card.update(cx, |card, _| {
+                let _ = card.update(cx, |card, _| {
                    card.command_finished = true;
                    card.exit_status = exit_status;
                    card.was_content_truncated = processed_content.len() < previous_len;
@@ -302,8 +293,7 @@ impl Tool for TerminalTool {
                    card.content_line_count = content_line_count;
                    card.finished_with_empty_output = finished_with_empty_output;
                    card.elapsed_time = Some(card.start_instant.elapsed());
-                })
-                .log_err();
+                });

                Ok(processed_content.into())
            }
@@ -483,6 +473,7 @@ impl ToolCard for TerminalToolCard {
        let time_elapsed = self
            .elapsed_time
            .unwrap_or_else(|| self.start_instant.elapsed());
+        let should_hide_terminal = tool_failed || self.finished_with_empty_output;

        let header_bg = cx
            .theme()
@@ -583,7 +574,7 @@ impl ToolCard for TerminalToolCard {
                        ),
                )
            })
-            .when(!self.finished_with_empty_output, |header| {
+            .when(!should_hide_terminal, |header| {
                header.child(
                    Disclosure::new(
                        ("terminal-tool-disclosure", self.entity_id),
@@ -627,43 +618,19 @@ impl ToolCard for TerminalToolCard {
                        ),
                    ),
            )
-            .when(
-                self.preview_expanded && !self.finished_with_empty_output,
-                |this| {
-                    this.child(
-                        div()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(border_color)
-                            .bg(cx.theme().colors().editor_background)
-                            .rounded_b_md()
-                            .text_ui_sm(cx)
-                            .child(
-                                ToolOutputPreview::new(
-                                    terminal.clone().into_any_element(),
-                                    terminal.entity_id(),
-                                )
-                                .with_total_lines(self.content_line_count)
-                                .toggle_state(!terminal.read(cx).is_content_limited(window))
-                                .on_toggle({
-                                    let terminal = terminal.clone();
-                                    move |is_expanded, _, cx| {
-                                        terminal.update(cx, |terminal, cx| {
-                                            terminal.set_embedded_mode(
-                                                if is_expanded {
-                                                    None
-                                                } else {
-                                                    Some(COLLAPSED_LINES)
-                                                },
-                                                cx,
-                                            );
-                                        });
-                                    }
-                                }),
-                            ),
-                    )
-                },
-            )
+            .when(self.preview_expanded && !should_hide_terminal, |this| {
+                this.child(
+                    div()
+                        .pt_2()
+                        .min_h_72()
+                        .border_t_1()
+                        .border_color(border_color)
+                        .bg(cx.theme().colors().editor_background)
+                        .rounded_b_md()
+                        .text_ui_sm(cx)
+                        .child(terminal.clone()),
+                )
+            })
            .into_any()
    }
 }
--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -28,10 +28,6 @@ impl Tool for ThinkingTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        include_str!("./thinking_tool/description.md").to_string()
    }
--- a/crates/assistant_tools/src/ui.rs
+++ b/crates/assistant_tools/src/ui.rs
@@ -1,5 +1,3 @@
 mod tool_call_card_header;
-mod tool_output_preview;

 pub use tool_call_card_header::*;
-pub use tool_output_preview::*;
--- a/crates/assistant_tools/src/ui/tool_output_preview.rs
+++ b/crates/assistant_tools/src/ui/tool_output_preview.rs
@@ -1,115 +0,0 @@
-use gpui::{AnyElement, EntityId, prelude::*};
-use ui::{Tooltip, prelude::*};
-
-#[derive(IntoElement)]
-pub struct ToolOutputPreview<F>
-where
-    F: Fn(bool, &mut Window, &mut App) + 'static,
-{
-    content: AnyElement,
-    entity_id: EntityId,
-    full_height: bool,
-    total_lines: usize,
-    collapsed_fade: bool,
-    on_toggle: Option<F>,
-}
-
-pub const COLLAPSED_LINES: usize = 10;
-
-impl<F> ToolOutputPreview<F>
-where
-    F: Fn(bool, &mut Window, &mut App) + 'static,
-{
-    pub fn new(content: AnyElement, entity_id: EntityId) -> Self {
-        Self {
-            content,
-            entity_id,
-            full_height: true,
-            total_lines: 0,
-            collapsed_fade: false,
-            on_toggle: None,
-        }
-    }
-
-    pub fn with_total_lines(mut self, total_lines: usize) -> Self {
-        self.total_lines = total_lines;
-        self
-    }
-
-    pub fn toggle_state(mut self, full_height: bool) -> Self {
-        self.full_height = full_height;
-        self
-    }
-
-    pub fn with_collapsed_fade(mut self) -> Self {
-        self.collapsed_fade = true;
-        self
-    }
-
-    pub fn on_toggle(mut self, listener: F) -> Self {
-        self.on_toggle = Some(listener);
-        self
-    }
-}
-
-impl<F> RenderOnce for ToolOutputPreview<F>
-where
-    F: Fn(bool, &mut Window, &mut App) + 'static,
-{
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        if self.total_lines <= COLLAPSED_LINES {
-            return self.content;
-        }
-        let border_color = cx.theme().colors().border.opacity(0.6);
-
-        let (icon, tooltip_label) = if self.full_height {
-            (IconName::ChevronUp, "Collapse")
-        } else {
-            (IconName::ChevronDown, "Expand")
-        };
-
-        let gradient_overlay =
-            if self.collapsed_fade && !self.full_height {
-                Some(div().absolute().bottom_5().left_0().w_full().h_2_5().bg(
-                    gpui::linear_gradient(
-                        0.,
-                        gpui::linear_color_stop(cx.theme().colors().editor_background, 0.),
-                        gpui::linear_color_stop(
-                            cx.theme().colors().editor_background.opacity(0.),
-                            1.,
-                        ),
-                    ),
-                ))
-            } else {
-                None
-            };
-
-        v_flex()
-            .relative()
-            .child(self.content)
-            .children(gradient_overlay)
-            .child(
-                h_flex()
-                    .id(("expand-button", self.entity_id))
-                    .flex_none()
-                    .cursor_pointer()
-                    .h_5()
-                    .justify_center()
-                    .border_t_1()
-                    .rounded_b_md()
-                    .border_color(border_color)
-                    .bg(cx.theme().colors().editor_background)
-                    .hover(|style| style.bg(cx.theme().colors().element_hover.opacity(0.1)))
-                    .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
-                    .tooltip(Tooltip::text(tooltip_label))
-                    .when_some(self.on_toggle, |this, on_toggle| {
-                        this.on_click({
-                            move |_, window, cx| {
-                                on_toggle(!self.full_height, window, cx);
-                            }
-                        })
-                    }),
-            )
-            .into_any()
-    }
-}
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -36,10 +36,6 @@ impl Tool for WebSearchTool {
        false
    }

-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-
    fn description(&self) -> String {
        "Search the web for information using your query. Use this when you need real-time information, facts, or data that might not be in your training. Results will include snippets and links from relevant web pages.".into()
    }
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -77,16 +77,10 @@ pub enum Model {
    MetaLlama318BInstructV1,
    MetaLlama3170BInstructV1_128k,
    MetaLlama3170BInstructV1,
-    MetaLlama31405BInstructV1,
-    MetaLlama321BInstructV1,
-    MetaLlama323BInstructV1,
    MetaLlama3211BInstructV1,
    MetaLlama3290BInstructV1,
-    MetaLlama3370BInstructV1,
-    #[allow(non_camel_case_types)]
-    MetaLlama4Scout17BInstructV1,
-    #[allow(non_camel_case_types)]
-    MetaLlama4Maverick17BInstructV1,
+    MetaLlama321BInstructV1,
+    MetaLlama323BInstructV1,
    // Mistral models
    MistralMistral7BInstructV0,
    MistralMixtral8x7BInstructV0,
@@ -131,64 +125,6 @@ impl Model {
    }

    pub fn id(&self) -> &str {
-        match self {
-            Model::ClaudeSonnet4 => "claude-4-sonnet",
-            Model::ClaudeSonnet4Thinking => "claude-4-sonnet-thinking",
-            Model::ClaudeOpus4 => "claude-4-opus",
-            Model::ClaudeOpus4Thinking => "claude-4-opus-thinking",
-            Model::Claude3_5SonnetV2 => "claude-3-5-sonnet-v2",
-            Model::Claude3_5Sonnet => "claude-3-5-sonnet",
-            Model::Claude3Opus => "claude-3-opus",
-            Model::Claude3Sonnet => "claude-3-sonnet",
-            Model::Claude3Haiku => "claude-3-haiku",
-            Model::Claude3_5Haiku => "claude-3-5-haiku",
-            Model::Claude3_7Sonnet => "claude-3-7-sonnet",
-            Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking",
-            Model::AmazonNovaLite => "amazon-nova-lite",
-            Model::AmazonNovaMicro => "amazon-nova-micro",
-            Model::AmazonNovaPro => "amazon-nova-pro",
-            Model::AmazonNovaPremier => "amazon-nova-premier",
-            Model::DeepSeekR1 => "deepseek-r1",
-            Model::AI21J2GrandeInstruct => "ai21-j2-grande-instruct",
-            Model::AI21J2JumboInstruct => "ai21-j2-jumbo-instruct",
-            Model::AI21J2Mid => "ai21-j2-mid",
-            Model::AI21J2MidV1 => "ai21-j2-mid-v1",
-            Model::AI21J2Ultra => "ai21-j2-ultra",
-            Model::AI21J2UltraV1_8k => "ai21-j2-ultra-v1-8k",
-            Model::AI21J2UltraV1 => "ai21-j2-ultra-v1",
-            Model::AI21JambaInstructV1 => "ai21-jamba-instruct-v1",
-            Model::AI21Jamba15LargeV1 => "ai21-jamba-1-5-large-v1",
-            Model::AI21Jamba15MiniV1 => "ai21-jamba-1-5-mini-v1",
-            Model::CohereCommandTextV14_4k => "cohere-command-text-v14-4k",
-            Model::CohereCommandRV1 => "cohere-command-r-v1",
-            Model::CohereCommandRPlusV1 => "cohere-command-r-plus-v1",
-            Model::CohereCommandLightTextV14_4k => "cohere-command-light-text-v14-4k",
-            Model::MetaLlama38BInstructV1 => "meta-llama3-8b-instruct-v1",
-            Model::MetaLlama370BInstructV1 => "meta-llama3-70b-instruct-v1",
-            Model::MetaLlama318BInstructV1_128k => "meta-llama3-1-8b-instruct-v1-128k",
-            Model::MetaLlama318BInstructV1 => "meta-llama3-1-8b-instruct-v1",
-            Model::MetaLlama3170BInstructV1_128k => "meta-llama3-1-70b-instruct-v1-128k",
-            Model::MetaLlama3170BInstructV1 => "meta-llama3-1-70b-instruct-v1",
-            Model::MetaLlama31405BInstructV1 => "meta-llama3-1-405b-instruct-v1",
-            Model::MetaLlama321BInstructV1 => "meta-llama3-2-1b-instruct-v1",
-            Model::MetaLlama323BInstructV1 => "meta-llama3-2-3b-instruct-v1",
-            Model::MetaLlama3211BInstructV1 => "meta-llama3-2-11b-instruct-v1",
-            Model::MetaLlama3290BInstructV1 => "meta-llama3-2-90b-instruct-v1",
-            Model::MetaLlama3370BInstructV1 => "meta-llama3-3-70b-instruct-v1",
-            Model::MetaLlama4Scout17BInstructV1 => "meta-llama4-scout-17b-instruct-v1",
-            Model::MetaLlama4Maverick17BInstructV1 => "meta-llama4-maverick-17b-instruct-v1",
-            Model::MistralMistral7BInstructV0 => "mistral-7b-instruct-v0",
-            Model::MistralMixtral8x7BInstructV0 => "mistral-mixtral-8x7b-instruct-v0",
-            Model::MistralMistralLarge2402V1 => "mistral-large-2402-v1",
-            Model::MistralMistralSmall2402V1 => "mistral-small-2402-v1",
-            Model::MistralPixtralLarge2502V1 => "mistral-pixtral-large-2502-v1",
-            Model::PalmyraWriterX4 => "palmyra-writer-x4",
-            Model::PalmyraWriterX5 => "palmyra-writer-x5",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn request_id(&self) -> &str {
        match self {
            Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => {
                "anthropic.claude-sonnet-4-20250514-v1:0"
@@ -209,7 +145,7 @@ impl Model {
            Model::AmazonNovaMicro => "amazon.nova-micro-v1:0",
            Model::AmazonNovaPro => "amazon.nova-pro-v1:0",
            Model::AmazonNovaPremier => "amazon.nova-premier-v1:0",
-            Model::DeepSeekR1 => "deepseek.r1-v1:0",
+            Model::DeepSeekR1 => "us.deepseek.r1-v1:0",
            Model::AI21J2GrandeInstruct => "ai21.j2-grande-instruct",
            Model::AI21J2JumboInstruct => "ai21.j2-jumbo-instruct",
            Model::AI21J2Mid => "ai21.j2-mid",
@@ -226,18 +162,14 @@ impl Model {
            Model::CohereCommandLightTextV14_4k => "cohere.command-light-text-v14:7:4k",
            Model::MetaLlama38BInstructV1 => "meta.llama3-8b-instruct-v1:0",
            Model::MetaLlama370BInstructV1 => "meta.llama3-70b-instruct-v1:0",
-            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0",
+            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0:128k",
            Model::MetaLlama318BInstructV1 => "meta.llama3-1-8b-instruct-v1:0",
-            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0",
+            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0:128k",
            Model::MetaLlama3170BInstructV1 => "meta.llama3-1-70b-instruct-v1:0",
-            Model::MetaLlama31405BInstructV1 => "meta.llama3-1-405b-instruct-v1:0",
            Model::MetaLlama3211BInstructV1 => "meta.llama3-2-11b-instruct-v1:0",
            Model::MetaLlama3290BInstructV1 => "meta.llama3-2-90b-instruct-v1:0",
            Model::MetaLlama321BInstructV1 => "meta.llama3-2-1b-instruct-v1:0",
            Model::MetaLlama323BInstructV1 => "meta.llama3-2-3b-instruct-v1:0",
-            Model::MetaLlama3370BInstructV1 => "meta.llama3-3-70b-instruct-v1:0",
-            Model::MetaLlama4Scout17BInstructV1 => "meta.llama4-scout-17b-instruct-v1:0",
-            Model::MetaLlama4Maverick17BInstructV1 => "meta.llama4-maverick-17b-instruct-v1:0",
            Model::MistralMistral7BInstructV0 => "mistral.mistral-7b-instruct-v0:2",
            Model::MistralMixtral8x7BInstructV0 => "mistral.mixtral-8x7b-instruct-v0:1",
            Model::MistralMistralLarge2402V1 => "mistral.mistral-large-2402-v1:0",
@@ -282,20 +214,16 @@ impl Model {
            Self::CohereCommandRV1 => "Cohere Command R V1",
            Self::CohereCommandRPlusV1 => "Cohere Command R Plus V1",
            Self::CohereCommandLightTextV14_4k => "Cohere Command Light Text V14 4K",
-            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct",
-            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct",
-            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3.1 8B Instruct 128K",
-            Self::MetaLlama318BInstructV1 => "Meta Llama 3.1 8B Instruct",
-            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3.1 70B Instruct 128K",
-            Self::MetaLlama3170BInstructV1 => "Meta Llama 3.1 70B Instruct",
-            Self::MetaLlama31405BInstructV1 => "Meta Llama 3.1 405B Instruct",
-            Self::MetaLlama3211BInstructV1 => "Meta Llama 3.2 11B Instruct",
-            Self::MetaLlama3290BInstructV1 => "Meta Llama 3.2 90B Instruct",
-            Self::MetaLlama321BInstructV1 => "Meta Llama 3.2 1B Instruct",
-            Self::MetaLlama323BInstructV1 => "Meta Llama 3.2 3B Instruct",
-            Self::MetaLlama3370BInstructV1 => "Meta Llama 3.3 70B Instruct",
-            Self::MetaLlama4Scout17BInstructV1 => "Meta Llama 4 Scout 17B Instruct",
-            Self::MetaLlama4Maverick17BInstructV1 => "Meta Llama 4 Maverick 17B Instruct",
+            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct V1",
+            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct V1",
+            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3 1.8B Instruct V1 128K",
+            Self::MetaLlama318BInstructV1 => "Meta Llama 3 1.8B Instruct V1",
+            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3 1 70B Instruct V1 128K",
+            Self::MetaLlama3170BInstructV1 => "Meta Llama 3 1 70B Instruct V1",
+            Self::MetaLlama3211BInstructV1 => "Meta Llama 3 2 11B Instruct V1",
+            Self::MetaLlama3290BInstructV1 => "Meta Llama 3 2 90B Instruct V1",
+            Self::MetaLlama321BInstructV1 => "Meta Llama 3 2 1B Instruct V1",
+            Self::MetaLlama323BInstructV1 => "Meta Llama 3 2 3B Instruct V1",
            Self::MistralMistral7BInstructV0 => "Mistral 7B Instruct V0",
            Self::MistralMixtral8x7BInstructV0 => "Mistral Mixtral 8x7B Instruct V0",
            Self::MistralMistralLarge2402V1 => "Mistral Large 2402 V1",
@@ -317,9 +245,7 @@ impl Model {
            | Self::Claude3_5Haiku
            | Self::Claude3_7Sonnet
            | Self::ClaudeSonnet4
-            | Self::ClaudeOpus4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeOpus4Thinking => 200_000,
+            | Self::ClaudeOpus4 => 200_000,
            Self::AmazonNovaPremier => 1_000_000,
            Self::PalmyraWriterX5 => 1_000_000,
            Self::PalmyraWriterX4 => 128_000,
@@ -428,76 +354,69 @@ impl Model {
            anyhow::bail!("Unsupported Region {region}");
        };

-        let model_id = self.request_id();
+        let model_id = self.id();

        match (self, region_group) {
            // Custom models can't have CRI IDs
-            (Model::Custom { .. }, _) => Ok(self.request_id().into()),
+            (Model::Custom { .. }, _) => Ok(self.id().into()),

            // Models with US Gov only
            (Model::Claude3_5Sonnet, "us-gov") | (Model::Claude3Haiku, "us-gov") => {
                Ok(format!("{}.{}", region_group, model_id))
            }

-            // Available everywhere
-            (Model::AmazonNovaLite | Model::AmazonNovaMicro | Model::AmazonNovaPro, _) => {
+            // Models available only in US
+            (Model::Claude3Opus, "us")
+            | (Model::Claude3_5Haiku, "us")
+            | (Model::Claude3_7Sonnet, "us")
+            | (Model::ClaudeSonnet4, "us")
+            | (Model::ClaudeOpus4, "us")
+            | (Model::ClaudeSonnet4Thinking, "us")
+            | (Model::ClaudeOpus4Thinking, "us")
+            | (Model::Claude3_7SonnetThinking, "us")
+            | (Model::AmazonNovaPremier, "us")
+            | (Model::MistralPixtralLarge2502V1, "us") => {
                Ok(format!("{}.{}", region_group, model_id))
            }

-            // Models in US
-            (
-                Model::AmazonNovaPremier
-                | Model::Claude3_5Haiku
-                | Model::Claude3_5Sonnet
-                | Model::Claude3_5SonnetV2
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::Claude3Haiku
-                | Model::Claude3Opus
-                | Model::Claude3Sonnet
-                | Model::DeepSeekR1
-                | Model::MetaLlama31405BInstructV1
-                | Model::MetaLlama3170BInstructV1_128k
-                | Model::MetaLlama3170BInstructV1
-                | Model::MetaLlama318BInstructV1_128k
-                | Model::MetaLlama318BInstructV1
-                | Model::MetaLlama3211BInstructV1
-                | Model::MetaLlama321BInstructV1
-                | Model::MetaLlama323BInstructV1
-                | Model::MetaLlama3290BInstructV1
-                | Model::MetaLlama3370BInstructV1
-                | Model::MetaLlama4Maverick17BInstructV1
-                | Model::MetaLlama4Scout17BInstructV1
-                | Model::MistralPixtralLarge2502V1
-                | Model::PalmyraWriterX4
-                | Model::PalmyraWriterX5,
-                "us",
-            ) => Ok(format!("{}.{}", region_group, model_id)),
+            // Models available in US, EU, and APAC
+            (Model::Claude3_5SonnetV2, "us")
+            | (Model::Claude3_5SonnetV2, "apac")
+            | (Model::Claude3_5Sonnet, _)
+            | (Model::Claude3Haiku, _)
+            | (Model::Claude3Sonnet, _)
+            | (Model::AmazonNovaLite, _)
+            | (Model::AmazonNovaMicro, _)
+            | (Model::AmazonNovaPro, _) => Ok(format!("{}.{}", region_group, model_id)),

-            // Models available in EU
-            (
-                Model::Claude3_5Sonnet
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::Claude3Haiku
-                | Model::Claude3Sonnet
-                | Model::MetaLlama321BInstructV1
-                | Model::MetaLlama323BInstructV1
-                | Model::MistralPixtralLarge2502V1,
-                "eu",
-            ) => Ok(format!("{}.{}", region_group, model_id)),
+            // Models with limited EU availability
+            (Model::MetaLlama321BInstructV1, "us")
+            | (Model::MetaLlama321BInstructV1, "eu")
+            | (Model::MetaLlama323BInstructV1, "us")
+            | (Model::MetaLlama323BInstructV1, "eu") => {
+                Ok(format!("{}.{}", region_group, model_id))
+            }

-            // Models available in APAC
-            (
-                Model::Claude3_5Sonnet
-                | Model::Claude3_5SonnetV2
-                | Model::Claude3Haiku
-                | Model::Claude3Sonnet,
-                "apac",
-            ) => Ok(format!("{}.{}", region_group, model_id)),
+            // US-only models (all remaining Meta models)
+            (Model::MetaLlama38BInstructV1, "us")
+            | (Model::MetaLlama370BInstructV1, "us")
+            | (Model::MetaLlama318BInstructV1, "us")
+            | (Model::MetaLlama318BInstructV1_128k, "us")
+            | (Model::MetaLlama3170BInstructV1, "us")
+            | (Model::MetaLlama3170BInstructV1_128k, "us")
+            | (Model::MetaLlama3211BInstructV1, "us")
+            | (Model::MetaLlama3290BInstructV1, "us") => {
+                Ok(format!("{}.{}", region_group, model_id))
+            }
+
+            // Writer models only available in the US
+            (Model::PalmyraWriterX4, "us") | (Model::PalmyraWriterX5, "us") => {
+                // They have some goofiness
+                Ok(format!("{}.{}", region_group, model_id))
+            }

            // Any other combination is not supported
-            _ => Ok(self.request_id().into()),
+            _ => Ok(self.id().into()),
        }
    }
 }
@@ -545,10 +464,6 @@ mod tests {
            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-northeast-1")?,
            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
        );
-        assert_eq!(
-            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-southeast-2")?,
-            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
        assert_eq!(
            Model::AmazonNovaLite.cross_region_inference_id("ap-south-1")?,
            "apac.amazon.nova-lite-v1:0"
@@ -575,11 +490,7 @@ mod tests {
        // Test Meta models
        assert_eq!(
            Model::MetaLlama370BInstructV1.cross_region_inference_id("us-east-1")?,
-            "meta.llama3-70b-instruct-v1:0"
-        );
-        assert_eq!(
-            Model::MetaLlama3170BInstructV1.cross_region_inference_id("us-east-1")?,
-            "us.meta.llama3-1-70b-instruct-v1:0"
+            "us.meta.llama3-70b-instruct-v1:0"
        );
        assert_eq!(
            Model::MetaLlama321BInstructV1.cross_region_inference_id("eu-west-1")?,
@@ -652,39 +563,4 @@ mod tests {

        Ok(())
    }
-
-    #[test]
-    fn test_friendly_id_vs_request_id() {
-        // Test that id() returns friendly identifiers
-        assert_eq!(Model::Claude3_5SonnetV2.id(), "claude-3-5-sonnet-v2");
-        assert_eq!(Model::AmazonNovaLite.id(), "amazon-nova-lite");
-        assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
-        assert_eq!(
-            Model::MetaLlama38BInstructV1.id(),
-            "meta-llama3-8b-instruct-v1"
-        );
-
-        // Test that request_id() returns actual backend model IDs
-        assert_eq!(
-            Model::Claude3_5SonnetV2.request_id(),
-            "anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(Model::AmazonNovaLite.request_id(), "amazon.nova-lite-v1:0");
-        assert_eq!(Model::DeepSeekR1.request_id(), "deepseek.r1-v1:0");
-        assert_eq!(
-            Model::MetaLlama38BInstructV1.request_id(),
-            "meta.llama3-8b-instruct-v1:0"
-        );
-
-        // Test thinking models have different friendly IDs but same request IDs
-        assert_eq!(Model::ClaudeSonnet4.id(), "claude-4-sonnet");
-        assert_eq!(
-            Model::ClaudeSonnet4Thinking.id(),
-            "claude-4-sonnet-thinking"
-        );
-        assert_eq!(
-            Model::ClaudeSonnet4.request_id(),
-            Model::ClaudeSonnet4Thinking.request_id()
-        );
-    }
 }
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -35,7 +35,6 @@ pub struct ChannelBuffer {
 pub enum ChannelBufferEvent {
    CollaboratorsChanged,
    Disconnected,
-    Connected,
    BufferEdited,
    ChannelChanged,
 }
@@ -104,17 +103,6 @@ impl ChannelBuffer {
        }
    }

-    pub fn connected(&mut self, cx: &mut Context<Self>) {
-        self.connected = true;
-        if self.subscription.is_none() {
-            let Ok(subscription) = self.client.subscribe_to_entity(self.channel_id.0) else {
-                return;
-            };
-            self.subscription = Some(subscription.set_entity(&cx.entity(), &mut cx.to_async()));
-            cx.emit(ChannelBufferEvent::Connected);
-        }
-    }
-
    pub fn remote_id(&self, cx: &App) -> BufferId {
        self.buffer.read(cx).remote_id()
    }
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -990,7 +990,6 @@ impl ChannelStore {
                                    .log_err();

                                if let Some(operations) = operations {
-                                    channel_buffer.connected(cx);
                                    let client = this.client.clone();
                                    cx.background_spawn(async move {
                                        let operations = operations.await;
@@ -1031,8 +1030,8 @@ impl ChannelStore {

                if let Some(this) = this.upgrade() {
                    this.update(cx, |this, cx| {
-                        for (_, buffer) in &this.opened_buffers {
-                            if let OpenEntityHandle::Open(buffer) = &buffer {
+                        for (_, buffer) in this.opened_buffers.drain() {
+                            if let OpenEntityHandle::Open(buffer) = buffer {
                                if let Some(buffer) = buffer.upgrade() {
                                    buffer.update(cx, |buffer, cx| buffer.disconnect(cx));
                                }
--- a/crates/collab/README.md
+++ b/crates/collab/README.md
@@ -57,7 +57,7 @@ We run two instances of collab:

 Both of these run on the Kubernetes cluster hosted in Digital Ocean.

-Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in GitHub. The best way to do this is:
+Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in Github. The best way to do this is:

 - `./script/deploy-collab staging`
 - `./script/deploy-collab production`
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -219,19 +219,12 @@ struct BillingSubscriptionJson {
    id: BillingSubscriptionId,
    name: String,
    status: StripeSubscriptionStatus,
-    period: Option<BillingSubscriptionPeriodJson>,
    trial_end_at: Option<String>,
    cancel_at: Option<String>,
    /// Whether this subscription can be canceled.
    is_cancelable: bool,
 }

-#[derive(Debug, Serialize)]
-struct BillingSubscriptionPeriodJson {
-    start_at: String,
-    end_at: String,
-}
-
 #[derive(Debug, Serialize)]
 struct ListBillingSubscriptionsResponse {
    subscriptions: Vec<BillingSubscriptionJson>,
@@ -261,15 +254,6 @@ async fn list_billing_subscriptions(
                    None => "Zed LLM Usage".to_string(),
                },
                status: subscription.stripe_subscription_status,
-                period: maybe!({
-                    let start_at = subscription.current_period_start_at()?;
-                    let end_at = subscription.current_period_end_at()?;
-
-                    Some(BillingSubscriptionPeriodJson {
-                        start_at: start_at.to_rfc3339_opts(SecondsFormat::Millis, true),
-                        end_at: end_at.to_rfc3339_opts(SecondsFormat::Millis, true),
-                    })
-                }),
                trial_end_at: if subscription.kind == Some(SubscriptionKind::ZedProTrial) {
                    maybe!({
                        let end_at = subscription.stripe_current_period_end?;
--- a/crates/collab/src/api/extensions.rs
+++ b/crates/collab/src/api/extensions.rs
@@ -66,7 +66,7 @@ async fn get_extensions(
            params.filter.as_deref(),
            provides_filter.as_ref(),
            params.max_schema_version,
-            1_000,
+            500,
        )
        .await?;

--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -64,11 +64,7 @@ impl Database {
                .map_or(String::new(), |parent| parent.path());

            // Find the maximum channel_order among siblings to set the new channel at the end
-            let max_order = if parent_path.is_empty() {
-                0
-            } else {
-                max_order(&parent_path, &tx).await?
-            };
+            let max_order = max_order(&parent_path, &tx).await?;

            log::info!(
                "Creating channel '{}' with parent_path='{}', max_order={}, new_order={}",
@@ -1011,11 +1007,6 @@ impl Database {
        self.transaction(|tx| async move {
            let mut channel = self.get_channel_internal(channel_id, &tx).await?;

-            if channel.is_root() {
-                log::info!("Skipping reorder of root channel {}", channel.id,);
-                return Ok(vec![]);
-            }
-
            log::info!(
                "Reordering channel {} (parent_path: '{}', order: {})",
                channel.id,
--- a/crates/collab/src/db/queries/servers.rs
+++ b/crates/collab/src/db/queries/servers.rs
@@ -66,87 +66,6 @@ impl Database {
        .await
    }

-    /// Delete all channel chat participants from previous servers
-    pub async fn delete_stale_channel_chat_participants(
-        &self,
-        environment: &str,
-        new_server_id: ServerId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            let stale_server_epochs = self
-                .stale_server_ids(environment, new_server_id, &tx)
-                .await?;
-
-            channel_chat_participant::Entity::delete_many()
-                .filter(
-                    channel_chat_participant::Column::ConnectionServerId
-                        .is_in(stale_server_epochs.iter().copied()),
-                )
-                .exec(&*tx)
-                .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn clear_old_worktree_entries(&self, server_id: ServerId) -> Result<()> {
-        self.transaction(|tx| async move {
-            use sea_orm::Statement;
-            use sea_orm::sea_query::{Expr, Query};
-
-            loop {
-                let delete_query = Query::delete()
-                    .from_table(worktree_entry::Entity)
-                    .and_where(
-                        Expr::tuple([
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::ProjectId))
-                                .into(),
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::WorktreeId))
-                                .into(),
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::Id)).into(),
-                        ])
-                        .in_subquery(
-                            Query::select()
-                                .columns([
-                                    (worktree_entry::Entity, worktree_entry::Column::ProjectId),
-                                    (worktree_entry::Entity, worktree_entry::Column::WorktreeId),
-                                    (worktree_entry::Entity, worktree_entry::Column::Id),
-                                ])
-                                .from(worktree_entry::Entity)
-                                .inner_join(
-                                    project::Entity,
-                                    Expr::col((project::Entity, project::Column::Id)).equals((
-                                        worktree_entry::Entity,
-                                        worktree_entry::Column::ProjectId,
-                                    )),
-                                )
-                                .and_where(project::Column::HostConnectionServerId.ne(server_id))
-                                .limit(10000)
-                                .to_owned(),
-                        ),
-                    )
-                    .to_owned();
-
-                let statement = Statement::from_sql_and_values(
-                    tx.get_database_backend(),
-                    delete_query
-                        .to_string(sea_orm::sea_query::PostgresQueryBuilder)
-                        .as_str(),
-                    vec![],
-                );
-
-                let result = tx.execute(statement).await?;
-                if result.rows_affected() == 0 {
-                    break;
-                }
-            }
-
-            Ok(())
-        })
-        .await
-    }
-
    /// Deletes any stale servers in the environment that don't match the `new_server_id`.
    pub async fn delete_stale_servers(
        &self,
@@ -167,7 +86,7 @@ impl Database {
        .await
    }

-    pub async fn stale_server_ids(
+    async fn stale_server_ids(
        &self,
        environment: &str,
        new_server_id: ServerId,
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -172,7 +172,6 @@ impl Drop for TestDb {
    }
 }

-#[track_caller]
 fn assert_channel_tree_matches(actual: Vec<Channel>, expected: Vec<Channel>) {
    let expected_channels = expected.into_iter().collect::<HashSet<_>>();
    let actual_channels = actual.into_iter().collect::<HashSet<_>>();
@@ -187,14 +186,10 @@ fn channel_tree(channels: &[(ChannelId, &[ChannelId], &'static str)]) -> Vec<Cha

    for (id, parent_path, name) in channels {
        let parent_key = parent_path.to_vec();
-        let order = if parent_key.is_empty() {
-            1
-        } else {
-            *order_by_parent
-                .entry(parent_key.clone())
-                .and_modify(|e| *e += 1)
-                .or_insert(1)
-        };
+        let order = *order_by_parent
+            .entry(parent_key.clone())
+            .and_modify(|e| *e += 1)
+            .or_insert(1);

        result.push(Channel {
            id: *id,
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -434,16 +434,6 @@ impl Server {
                tracing::info!("waiting for cleanup timeout");
                timeout.await;
                tracing::info!("cleanup timeout expired, retrieving stale rooms");
-
-                app_state
-                    .db
-                    .delete_stale_channel_chat_participants(
-                        &app_state.config.zed_environment,
-                        server_id,
-                    )
-                    .await
-                    .trace_err();
-
                if let Some((room_ids, channel_ids)) = app_state
                    .db
                    .stale_server_resource_ids(&app_state.config.zed_environment, server_id)
@@ -565,21 +555,6 @@ impl Server {
                    }
                }

-                app_state
-                    .db
-                    .delete_stale_channel_chat_participants(
-                        &app_state.config.zed_environment,
-                        server_id,
-                    )
-                    .await
-                    .trace_err();
-
-                app_state
-                    .db
-                    .clear_old_worktree_entries(server_id)
-                    .await
-                    .trace_err();
-
                app_state
                    .db
                    .delete_stale_servers(&app_state.config.zed_environment, server_id)
--- a/crates/collab/src/stripe_client/real_stripe_client.rs
+++ b/crates/collab/src/stripe_client/real_stripe_client.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;

 use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use stripe::{
    CancellationDetails, CancellationDetailsReason, CheckoutSession, CheckoutSessionMode,
    CheckoutSessionPaymentMethodCollection, CreateCheckoutSession, CreateCheckoutSessionLineItems,
@@ -213,18 +213,9 @@ impl StripeClient for RealStripeClient {
    }

    async fn create_meter_event(&self, params: StripeCreateMeterEventParams<'_>) -> Result<()> {
-        #[derive(Deserialize)]
-        struct StripeMeterEvent {
-            pub identifier: String,
-        }
-
        let identifier = params.identifier;
-        match self
-            .client
-            .post_form::<StripeMeterEvent, _>("/billing/meter_events", params)
-            .await
-        {
-            Ok(_event) => Ok(()),
+        match self.client.post_form("/billing/meter_events", params).await {
+            Ok(event) => Ok(event),
            Err(stripe::StripeError::Stripe(error)) => {
                if error.http_status == 400
                    && error
@@ -237,7 +228,7 @@ impl StripeClient for RealStripeClient {
                    Err(anyhow!(stripe::StripeError::Stripe(error)))
                }
            }
-            Err(error) => Err(anyhow!("failed to create meter event: {error:?}")),
+            Err(error) => Err(anyhow!(error)),
        }
    }

--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -1010,6 +1010,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    workspace_b.update_in(cx_b, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
            pane.close_inactive_items(&Default::default(), window, cx)
+                .unwrap()
                .detach();
        });
    });
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -2624,7 +2624,6 @@ async fn test_git_diff_base_change(
    client_a.fs().set_head_for_repo(
        Path::new("/dir/.git"),
        &[("a.txt".into(), committed_text.clone())],
-        "deadbeef",
    );

    // Create the buffer
@@ -2718,7 +2717,6 @@ async fn test_git_diff_base_change(
    client_a.fs().set_head_for_repo(
        Path::new("/dir/.git"),
        &[("a.txt".into(), new_committed_text.clone())],
-        "deadbeef",
    );

    // Wait for buffer_local_a to receive it
@@ -3008,7 +3006,6 @@ async fn test_git_status_sync(
    client_a.fs().set_head_for_repo(
        path!("/dir/.git").as_ref(),
        &[("b.txt".into(), "B".into()), ("c.txt".into(), "c".into())],
-        "deadbeef",
    );
    client_a.fs().set_index_for_repo(
        path!("/dir/.git").as_ref(),
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -354,10 +354,6 @@ impl ChannelView {
                editor.set_read_only(true);
                cx.notify();
            }),
-            ChannelBufferEvent::Connected => self.editor.update(cx, |editor, cx| {
-                editor.set_read_only(false);
-                cx.notify();
-            }),
            ChannelBufferEvent::ChannelChanged => {
                self.editor.update(cx, |_, cx| {
                    cx.emit(editor::EditorEvent::TitleChanged);
--- a/crates/collab_ui/src/channel_view/link_folding.rs
+++ b/crates/collab_ui/src/channel_view/link_folding.rs
@@ -0,0 +1,455 @@
+//! Link folding support for channel notes.
+//!
+//! This module provides functionality to automatically fold markdown links in channel notes,
+//! displaying only the link text with an underline decoration. When the cursor is positioned
+//! inside a link, the crease is temporarily removed to show the full markdown syntax.
+//!
+//! Example:
+//! - When rendered: [Example](https://example.com) becomes "Example" with underline
+//! - When cursor is inside: Full markdown syntax is shown
+//!
+//! The main components are:
+//! - `parse_markdown_links`: Extracts markdown links from text
+//! - `create_link_creases`: Creates visual creases for links
+//! - `LinkFoldingManager`: Manages dynamic showing/hiding of link creases based on cursor position
+
+use editor::{
+    Anchor, Editor, FoldPlaceholder,
+    display_map::{Crease, CreaseId},
+};
+use gpui::{App, Entity, Window};
+
+use std::{collections::HashMap, ops::Range, sync::Arc};
+use ui::prelude::*;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MarkdownLink {
+    pub text: String,
+    pub url: String,
+    pub range: Range<usize>,
+}
+
+pub fn parse_markdown_links(text: &str) -> Vec<MarkdownLink> {
+    let mut links = Vec::new();
+    let mut chars = text.char_indices();
+
+    while let Some((start, ch)) = chars.next() {
+        if ch == '[' {
+            // Look for the closing bracket
+            let mut bracket_depth = 1;
+            let text_start = start + 1;
+            let mut text_end = None;
+
+            for (i, ch) in chars.by_ref() {
+                match ch {
+                    '[' => bracket_depth += 1,
+                    ']' => {
+                        bracket_depth -= 1;
+                        if bracket_depth == 0 {
+                            text_end = Some(i);
+                            break;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+
+            if let Some(text_end) = text_end {
+                // Check if the next character is '('
+                if let Some((_, '(')) = chars.next() {
+                    // Look for the closing parenthesis
+                    let url_start = text_end + 2;
+                    let mut url_end = None;
+
+                    for (i, ch) in chars.by_ref() {
+                        if ch == ')' {
+                            url_end = Some(i);
+                            break;
+                        }
+                    }
+
+                    if let Some(url_end) = url_end {
+                        links.push(MarkdownLink {
+                            text: text[text_start..text_end].to_string(),
+                            url: text[url_start..url_end].to_string(),
+                            range: start..url_end + 1,
+                        });
+                    }
+                }
+            }
+        }
+    }
+
+    links
+}
+
+pub fn create_link_creases(
+    links: &[MarkdownLink],
+    buffer_snapshot: &editor::MultiBufferSnapshot,
+) -> Vec<Crease<Anchor>> {
+    links
+        .iter()
+        .map(|link| {
+            // Convert byte offsets to Points first
+            let start_point = buffer_snapshot.offset_to_point(link.range.start);
+            let end_point = buffer_snapshot.offset_to_point(link.range.end);
+
+            // Create anchors from points
+            let start = buffer_snapshot.anchor_before(start_point);
+            let end = buffer_snapshot.anchor_after(end_point);
+
+            let link_text = link.text.clone();
+            Crease::simple(
+                start..end,
+                FoldPlaceholder {
+                    render: Arc::new(move |_fold_id, _range, cx| {
+                        div()
+                            .child(link_text.clone())
+                            .text_decoration_1()
+                            .text_decoration_solid()
+                            .text_color(cx.theme().colors().link_text_hover)
+                            .into_any_element()
+                    }),
+                    constrain_width: false,
+                    merge_adjacent: false,
+                    type_tag: None,
+                },
+            )
+        })
+        .collect()
+}
+
+pub struct LinkFoldingManager {
+    editor: Entity<Editor>,
+    folded_links: Vec<MarkdownLink>,
+    link_creases: HashMap<CreaseId, Range<usize>>,
+}
+
+impl LinkFoldingManager {
+    pub fn new(editor: Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
+        let mut manager = Self {
+            editor: editor.clone(),
+            folded_links: Vec::new(),
+            link_creases: HashMap::default(),
+        };
+
+        manager.refresh_links(window, cx);
+        manager
+    }
+
+    pub fn handle_selections_changed(&mut self, window: &mut Window, cx: &mut App) {
+        self.update_link_visibility(window, cx);
+    }
+
+    pub fn handle_edited(&mut self, window: &mut Window, cx: &mut App) {
+        // Re-parse links and update folds
+        // Note: In a production implementation, this could be debounced
+        // to avoid updating on every keystroke
+        self.refresh_links(window, cx);
+    }
+
+    fn refresh_links(&mut self, window: &mut Window, cx: &mut App) {
+        // Remove existing creases
+        if !self.link_creases.is_empty() {
+            self.editor.update(cx, |editor, cx| {
+                let crease_ids: Vec<_> = self.link_creases.keys().copied().collect();
+                editor.remove_creases(crease_ids, cx);
+            });
+            self.link_creases.clear();
+        }
+
+        // Parse new links
+        let buffer_text = self.editor.read(cx).buffer().read(cx).snapshot(cx).text();
+        let links = parse_markdown_links(&buffer_text);
+        self.folded_links = links;
+
+        // Insert creases for all links
+        if !self.folded_links.is_empty() {
+            self.editor.update(cx, |editor, cx| {
+                let buffer = editor.buffer().read(cx).snapshot(cx);
+                let creases = create_link_creases(&self.folded_links, &buffer);
+                let crease_ids = editor.insert_creases(creases.clone(), cx);
+
+                // Store the mapping of crease IDs to link ranges
+                for (crease_id, link) in crease_ids.into_iter().zip(self.folded_links.iter()) {
+                    self.link_creases.insert(crease_id, link.range.clone());
+                }
+
+                // Fold the creases to activate the custom placeholder
+                editor.fold_creases(creases, true, window, cx);
+            });
+        }
+
+        // Update visibility based on cursor position
+        self.update_link_visibility(window, cx);
+    }
+
+    fn update_link_visibility(&mut self, window: &mut Window, cx: &mut App) {
+        if self.folded_links.is_empty() {
+            return;
+        }
+
+        self.editor.update(cx, |editor, cx| {
+            let buffer = editor.buffer().read(cx).snapshot(cx);
+            let selections = editor.selections.all::<usize>(cx);
+
+            // Find which links should be visible (cursor inside or adjacent)
+            // Remove creases where cursor is inside or adjacent to the link
+            let mut creases_to_remove = Vec::new();
+            for (crease_id, link_range) in &self.link_creases {
+                let cursor_near_link = selections.iter().any(|selection| {
+                    let cursor_offset = selection.head();
+                    // Check if cursor is inside the link
+                    if link_range.contains(&cursor_offset) {
+                        return true;
+                    }
+                    // Check if cursor is adjacent (immediately before or after)
+                    cursor_offset == link_range.start || cursor_offset == link_range.end
+                });
+
+                if cursor_near_link {
+                    creases_to_remove.push(*crease_id);
+                }
+            }
+
+            if !creases_to_remove.is_empty() {
+                editor.remove_creases(creases_to_remove.clone(), cx);
+                for crease_id in creases_to_remove {
+                    self.link_creases.remove(&crease_id);
+                }
+            }
+
+            // Re-add creases for links where cursor is not present or adjacent
+            let links_to_recreate: Vec<_> = self
+                .folded_links
+                .iter()
+                .filter(|link| {
+                    !selections.iter().any(|selection| {
+                        let cursor_offset = selection.head();
+                        // Check if cursor is inside or adjacent to the link
+                        link.range.contains(&cursor_offset)
+                            || cursor_offset == link.range.start
+                            || cursor_offset == link.range.end
+                    })
+                })
+                .filter(|link| {
+                    // Only recreate if not already present
+                    !self.link_creases.values().any(|range| range == &link.range)
+                })
+                .cloned()
+                .collect();
+
+            if !links_to_recreate.is_empty() {
+                let creases = create_link_creases(&links_to_recreate, &buffer);
+                let crease_ids = editor.insert_creases(creases.clone(), cx);
+
+                for (crease_id, link) in crease_ids.into_iter().zip(links_to_recreate.iter()) {
+                    self.link_creases.insert(crease_id, link.range.clone());
+                }
+
+                // Fold the creases to activate the custom placeholder
+                editor.fold_creases(creases, true, window, cx);
+            }
+        });
+    }
+
+    /// Checks if a position (in buffer coordinates) is within a folded link
+    /// and returns the link if found
+    pub fn link_at_position(&self, position: usize) -> Option<&MarkdownLink> {
+        // Check if the position falls within any folded link that has an active crease
+        self.folded_links.iter().find(|link| {
+            link.range.contains(&position)
+                && self.link_creases.values().any(|range| range == &link.range)
+        })
+    }
+
+    /// Opens a link URL in the default browser
+    pub fn open_link(&self, url: &str, cx: &mut App) {
+        cx.open_url(url);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[gpui::test]
+    fn test_parse_markdown_links() {
+        let text = "This is a [link](https://example.com) and another [test](https://test.com).";
+        let links = parse_markdown_links(text);
+
+        assert_eq!(links.len(), 2);
+
+        assert_eq!(links[0].text, "link");
+        assert_eq!(links[0].url, "https://example.com");
+        assert_eq!(links[0].range, 10..37);
+
+        assert_eq!(links[1].text, "test");
+        assert_eq!(links[1].url, "https://test.com");
+        assert_eq!(links[1].range, 50..74);
+    }
+
+    #[gpui::test]
+    fn test_parse_nested_brackets() {
+        let text = "A [[nested] link](https://example.com) here.";
+        let links = parse_markdown_links(text);
+
+        assert_eq!(links.len(), 1);
+        assert_eq!(links[0].text, "[nested] link");
+        assert_eq!(links[0].url, "https://example.com");
+    }
+
+    #[gpui::test]
+    fn test_parse_no_links() {
+        let text = "This text has no links.";
+        let links = parse_markdown_links(text);
+
+        assert_eq!(links.len(), 0);
+    }
+
+    #[gpui::test]
+    fn test_parse_incomplete_links() {
+        let text = "This [link has no url] and [this](incomplete";
+        let links = parse_markdown_links(text);
+
+        assert_eq!(links.len(), 0);
+    }
+
+    #[gpui::test]
+    fn test_link_parsing_and_folding() {
+        // Test comprehensive link parsing
+        let text = "Check out [Zed](https://zed.dev) and [GitHub](https://github.com)!";
+        let links = parse_markdown_links(text);
+
+        assert_eq!(links.len(), 2);
+        assert_eq!(links[0].text, "Zed");
+        assert_eq!(links[0].url, "https://zed.dev");
+        assert_eq!(links[0].range, 10..32);
+
+        assert_eq!(links[1].text, "GitHub");
+        assert_eq!(links[1].url, "https://github.com");
+        assert_eq!(links[1].range, 37..65);
+    }
+
+    #[gpui::test]
+    fn test_link_detection_when_typing() {
+        // Test that links are detected as they're typed
+        let text1 = "Check out ";
+        let links1 = parse_markdown_links(text1);
+        assert_eq!(links1.len(), 0, "No links in plain text");
+
+        let text2 = "Check out [";
+        let links2 = parse_markdown_links(text2);
+        assert_eq!(links2.len(), 0, "Incomplete link not detected");
+
+        let text3 = "Check out [Zed]";
+        let links3 = parse_markdown_links(text3);
+        assert_eq!(links3.len(), 0, "Link without URL not detected");
+
+        let text4 = "Check out [Zed](";
+        let links4 = parse_markdown_links(text4);
+        assert_eq!(links4.len(), 0, "Link with incomplete URL not detected");
+
+        let text5 = "Check out [Zed](https://zed.dev)";
+        let links5 = parse_markdown_links(text5);
+        assert_eq!(links5.len(), 1, "Complete link should be detected");
+        assert_eq!(links5[0].text, "Zed");
+        assert_eq!(links5[0].url, "https://zed.dev");
+
+        // Test link detection in middle of text
+        let text6 = "Check out [Zed](https://zed.dev) for coding!";
+        let links6 = parse_markdown_links(text6);
+        assert_eq!(links6.len(), 1, "Link in middle of text should be detected");
+        assert_eq!(links6[0].range, 10..32);
+    }
+
+    #[gpui::test]
+    fn test_link_position_detection() {
+        // Test the logic for determining if a position is within a link
+        let links = vec![
+            MarkdownLink {
+                text: "Zed".to_string(),
+                url: "https://zed.dev".to_string(),
+                range: 10..32,
+            },
+            MarkdownLink {
+                text: "GitHub".to_string(),
+                url: "https://github.com".to_string(),
+                range: 50..78,
+            },
+        ];
+
+        // Test positions inside the first link
+        assert!(links[0].range.contains(&10), "Start of first link");
+        assert!(links[0].range.contains(&20), "Middle of first link");
+        assert!(links[0].range.contains(&31), "Near end of first link");
+
+        // Test positions inside the second link
+        assert!(links[1].range.contains(&50), "Start of second link");
+        assert!(links[1].range.contains(&65), "Middle of second link");
+        assert!(links[1].range.contains(&77), "Near end of second link");
+
+        // Test positions outside any link
+        assert!(!links[0].range.contains(&9), "Before first link");
+        assert!(!links[0].range.contains(&32), "After first link");
+        assert!(!links[1].range.contains(&49), "Before second link");
+        assert!(!links[1].range.contains(&78), "After second link");
+
+        // Test finding a link at a specific position
+        let link_at_20 = links.iter().find(|link| link.range.contains(&20));
+        assert!(link_at_20.is_some());
+        assert_eq!(link_at_20.unwrap().text, "Zed");
+        assert_eq!(link_at_20.unwrap().url, "https://zed.dev");
+
+        let link_at_65 = links.iter().find(|link| link.range.contains(&65));
+        assert!(link_at_65.is_some());
+        assert_eq!(link_at_65.unwrap().text, "GitHub");
+        assert_eq!(link_at_65.unwrap().url, "https://github.com");
+    }
+
+    #[gpui::test]
+    fn test_cursor_adjacent_link_expansion() {
+        // Test the logic for determining if cursor is inside or adjacent to a link
+        let link = MarkdownLink {
+            text: "Example".to_string(),
+            url: "https://example.com".to_string(),
+            range: 10..37,
+        };
+
+        // Helper function to check if cursor should expand the link
+        let should_expand_link = |cursor_pos: usize, link: &MarkdownLink| -> bool {
+            // Link should be expanded if cursor is inside or adjacent
+            link.range.contains(&cursor_pos)
+                || cursor_pos == link.range.start
+                || cursor_pos == link.range.end
+        };
+
+        // Test cursor positions
+        assert!(
+            should_expand_link(10, &link),
+            "Cursor at position 10 (link start) should expand link"
+        );
+        assert!(
+            should_expand_link(37, &link),
+            "Cursor at position 37 (link end) should expand link"
+        );
+        assert!(
+            should_expand_link(20, &link),
+            "Cursor at position 20 (inside link) should expand link"
+        );
+        assert!(
+            !should_expand_link(9, &link),
+            "Cursor at position 9 (before link) should not expand link"
+        );
+        assert!(
+            !should_expand_link(38, &link),
+            "Cursor at position 38 (after link) should not expand link"
+        );
+
+        // Test the edge cases
+        assert_eq!(link.range.start, 10, "Link starts at position 10");
+        assert_eq!(link.range.end, 37, "Link ends at position 37");
+        assert!(link.range.contains(&10), "Range includes start position");
+        assert!(!link.range.contains(&37), "Range excludes end position");
+    }
+}
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -12,7 +12,7 @@ use language::{
    Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry, ToOffset,
    language_settings::SoftWrap,
 };
-use project::{Completion, CompletionResponse, CompletionSource, search::SearchQuery};
+use project::{Completion, CompletionSource, search::SearchQuery};
 use settings::Settings;
 use std::{
    cell::RefCell,
@@ -64,9 +64,9 @@ impl CompletionProvider for MessageEditorCompletionProvider {
        _: editor::CompletionContext,
        _window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<Completion>>>> {
        let Some(handle) = self.0.upgrade() else {
-            return Task::ready(Ok(Vec::new()));
+            return Task::ready(Ok(None));
        };
        handle.update(cx, |message_editor, cx| {
            message_editor.completions(buffer, buffer_position, cx)
@@ -89,7 +89,6 @@ impl CompletionProvider for MessageEditorCompletionProvider {
        _position: language::Anchor,
        text: &str,
        _trigger_in_words: bool,
-        _menu_is_open: bool,
        _cx: &mut Context<Editor>,
    ) -> bool {
        text == "@"
@@ -249,21 +248,22 @@ impl MessageEditor {
        buffer: &Entity<Buffer>,
        end_anchor: Anchor,
        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<Completion>>>> {
        if let Some((start_anchor, query, candidates)) =
            self.collect_mention_candidates(buffer, end_anchor, cx)
        {
            if !candidates.is_empty() {
                return cx.spawn(async move |_, cx| {
-                    let completion_response = Self::resolve_completions_for_candidates(
-                        &cx,
-                        query.as_str(),
-                        &candidates,
-                        start_anchor..end_anchor,
-                        Self::completion_for_mention,
-                    )
-                    .await;
-                    Ok(vec![completion_response])
+                    Ok(Some(
+                        Self::resolve_completions_for_candidates(
+                            &cx,
+                            query.as_str(),
+                            &candidates,
+                            start_anchor..end_anchor,
+                            Self::completion_for_mention,
+                        )
+                        .await,
+                    ))
                });
            }
        }
@@ -273,23 +273,21 @@ impl MessageEditor {
        {
            if !candidates.is_empty() {
                return cx.spawn(async move |_, cx| {
-                    let completion_response = Self::resolve_completions_for_candidates(
-                        &cx,
-                        query.as_str(),
-                        candidates,
-                        start_anchor..end_anchor,
-                        Self::completion_for_emoji,
-                    )
-                    .await;
-                    Ok(vec![completion_response])
+                    Ok(Some(
+                        Self::resolve_completions_for_candidates(
+                            &cx,
+                            query.as_str(),
+                            candidates,
+                            start_anchor..end_anchor,
+                            Self::completion_for_emoji,
+                        )
+                        .await,
+                    ))
                });
            }
        }

-        Task::ready(Ok(vec![CompletionResponse {
-            completions: Vec::new(),
-            is_incomplete: false,
-        }]))
+        Task::ready(Ok(Some(Vec::new())))
    }

    async fn resolve_completions_for_candidates(
@@ -298,19 +296,18 @@ impl MessageEditor {
        candidates: &[StringMatchCandidate],
        range: Range<Anchor>,
        completion_fn: impl Fn(&StringMatch) -> (String, CodeLabel),
-    ) -> CompletionResponse {
-        const LIMIT: usize = 10;
+    ) -> Vec<Completion> {
        let matches = fuzzy::match_strings(
            candidates,
            query,
            true,
-            LIMIT,
+            10,
            &Default::default(),
            cx.background_executor().clone(),
        )
        .await;

-        let completions = matches
+        matches
            .into_iter()
            .map(|mat| {
                let (new_text, label) = completion_fn(&mat);
@@ -325,12 +322,7 @@ impl MessageEditor {
                    source: CompletionSource::Custom,
                }
            })
-            .collect::<Vec<_>>();
-
-        CompletionResponse {
-            is_incomplete: completions.len() >= LIMIT,
-            completions,
-        }
+            .collect()
    }

    fn completion_for_mention(mat: &StringMatch) -> (String, CodeLabel) {
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -448,7 +448,7 @@ impl PickerDelegate for CommandPaletteDelegate {
    }
 }

-pub fn humanize_action_name(name: &str) -> String {
+fn humanize_action_name(name: &str) -> String {
    let capacity = name.len() + name.chars().filter(|c| c.is_uppercase()).count();
    let mut result = String::with_capacity(capacity);
    for char in name.chars() {
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -161,7 +161,7 @@ impl ComponentMetadata {
 }

 /// Implement this trait to define a UI component. This will allow you to
-/// derive `RegisterComponent` on it, in turn allowing you to preview the
+/// derive `RegisterComponent` on it, in tutn allowing you to preview the
 /// contents of the preview fn in `workspace: open component preview`.
 ///
 /// This can be useful for visual debugging and testing, documenting UI
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -581,7 +581,7 @@ async fn stream_completion(
    api_key: String,
    request: Request,
 ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
-    let is_vision_request = request.messages.last().map_or(false, |message| match message {
+    let is_vision_request = request.messages.iter().any(|message| match message {
        ChatMessage::User { content }
        | ChatMessage::Assistant { content, .. }
        | ChatMessage::Tool { content, .. } => {
@@ -736,4 +736,116 @@ mod tests {
        assert_eq!(schema.data[0].id, "gpt-4");
        assert_eq!(schema.data[1].id, "claude-3.7-sonnet");
    }
+
+    #[test]
+    fn test_vision_request_detection() {
+        fn message_contains_image(message: &ChatMessage) -> bool {
+            match message {
+                ChatMessage::User { content }
+                | ChatMessage::Assistant { content, .. }
+                | ChatMessage::Tool { content, .. } => {
+                    matches!(content, ChatMessageContent::Multipart(parts) if
+                        parts.iter().any(|part| matches!(part, ChatMessagePart::Image { .. })))
+                }
+                _ => false,
+            }
+        }
+
+        // Helper function to detect if a request is a vision request
+        fn is_vision_request(request: &Request) -> bool {
+            request.messages.iter().any(message_contains_image)
+        }
+
+        let request_with_image_in_last = Request {
+            intent: true,
+            n: 1,
+            stream: true,
+            temperature: 0.1,
+            model: "claude-3.7-sonnet".to_string(),
+            messages: vec![
+                ChatMessage::User {
+                    content: ChatMessageContent::Plain("Hello".to_string()),
+                },
+                ChatMessage::Assistant {
+                    content: ChatMessageContent::Plain("How can I help?".to_string()),
+                    tool_calls: vec![],
+                },
+                ChatMessage::User {
+                    content: ChatMessageContent::Multipart(vec![
+                        ChatMessagePart::Text {
+                            text: "What's in this image?".to_string(),
+                        },
+                        ChatMessagePart::Image {
+                            image_url: ImageUrl {
+                                url: "data:image/png;base64,abc123".to_string(),
+                            },
+                        },
+                    ]),
+                },
+            ],
+            tools: vec![],
+            tool_choice: None,
+        };
+
+        let request_with_image_in_earlier = Request {
+            intent: true,
+            n: 1,
+            stream: true,
+            temperature: 0.1,
+            model: "claude-3.7-sonnet".to_string(),
+            messages: vec![
+                ChatMessage::User {
+                    content: ChatMessageContent::Plain("Hello".to_string()),
+                },
+                ChatMessage::User {
+                    content: ChatMessageContent::Multipart(vec![
+                        ChatMessagePart::Text {
+                            text: "What's in this image?".to_string(),
+                        },
+                        ChatMessagePart::Image {
+                            image_url: ImageUrl {
+                                url: "data:image/png;base64,abc123".to_string(),
+                            },
+                        },
+                    ]),
+                },
+                ChatMessage::Assistant {
+                    content: ChatMessageContent::Plain("I see a cat in the image.".to_string()),
+                    tool_calls: vec![],
+                },
+                ChatMessage::User {
+                    content: ChatMessageContent::Plain("What color is it?".to_string()),
+                },
+            ],
+            tools: vec![],
+            tool_choice: None,
+        };
+
+        let request_with_no_images = Request {
+            intent: true,
+            n: 1,
+            stream: true,
+            temperature: 0.1,
+            model: "claude-3.7-sonnet".to_string(),
+            messages: vec![
+                ChatMessage::User {
+                    content: ChatMessageContent::Plain("Hello".to_string()),
+                },
+                ChatMessage::Assistant {
+                    content: ChatMessageContent::Plain("How can I help?".to_string()),
+                    tool_calls: vec![],
+                },
+                ChatMessage::User {
+                    content: ChatMessageContent::Plain("Tell me about Rust.".to_string()),
+                },
+            ],
+            tools: vec![],
+            tool_choice: None,
+        };
+
+        assert!(is_vision_request(&request_with_image_in_last));
+        assert!(is_vision_request(&request_with_image_in_earlier));
+
+        assert!(!is_vision_request(&request_with_no_images));
+    }
 }
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -333,6 +333,24 @@ pub async fn download_adapter_from_github(
    Ok(version_path)
 }

+pub async fn fetch_latest_adapter_version_from_github(
+    github_repo: GithubRepo,
+    delegate: &dyn DapDelegate,
+) -> Result<AdapterVersion> {
+    let release = latest_github_release(
+        &format!("{}/{}", github_repo.repo_owner, github_repo.repo_name),
+        false,
+        false,
+        delegate.http_client(),
+    )
+    .await?;
+
+    Ok(AdapterVersion {
+        tag_name: release.tag_name,
+        url: release.zipball_url,
+    })
+}
+
 #[async_trait(?Send)]
 pub trait DebugAdapter: 'static + Send + Sync {
    fn name(&self) -> DebugAdapterName;
@@ -352,19 +370,21 @@ pub trait DebugAdapter: 'static + Send + Sync {
        None
    }

-    /// Extracts the kind (attach/launch) of debug configuration from the given JSON config.
-    /// This method should only return error when the kind cannot be determined for a given configuration;
-    /// in particular, it *should not* validate whether the request as a whole is valid, because that's best left to the debug adapter itself to decide.
-    fn request_kind(
+    fn validate_config(
        &self,
        config: &serde_json::Value,
    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        match config.get("request") {
-            Some(val) if val == "launch" => Ok(StartDebuggingRequestArgumentsRequest::Launch),
-            Some(val) if val == "attach" => Ok(StartDebuggingRequestArgumentsRequest::Attach),
-            _ => Err(anyhow!(
-                "missing or invalid `request` field in config. Expected 'launch' or 'attach'"
-            )),
+        let map = config.as_object().context("Config isn't an object")?;
+
+        let request_variant = map
+            .get("request")
+            .and_then(|val| val.as_str())
+            .context("request argument is not found or invalid")?;
+
+        match request_variant {
+            "launch" => Ok(StartDebuggingRequestArgumentsRequest::Launch),
+            "attach" => Ok(StartDebuggingRequestArgumentsRequest::Attach),
+            _ => Err(anyhow!("request must be either 'launch' or 'attach'")),
        }
    }

@@ -394,7 +414,7 @@ impl DebugAdapter for FakeAdapter {
        serde_json::Value::Null
    }

-    fn request_kind(
+    fn validate_config(
        &self,
        config: &serde_json::Value,
    ) -> Result<StartDebuggingRequestArgumentsRequest> {
@@ -439,7 +459,7 @@ impl DebugAdapter for FakeAdapter {
            envs: HashMap::default(),
            cwd: None,
            request_args: StartDebuggingRequestArguments {
-                request: self.request_kind(&task_definition.config)?,
+                request: self.validate_config(&task_definition.config)?,
                configuration: task_definition.config.clone(),
            },
        })
--- a/crates/dap/src/dap.rs
+++ b/crates/dap/src/dap.rs
@@ -52,7 +52,7 @@ pub fn send_telemetry(scenario: &DebugScenario, location: TelemetrySpawnLocation
        return;
    };
    let kind = adapter
-        .request_kind(&scenario.config)
+        .validate_config(&scenario.config)
        .ok()
        .map(serde_json::to_value)
        .and_then(Result::ok);
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -4,7 +4,7 @@ use dap_types::{
    messages::{Message, Response},
 };
 use futures::{AsyncRead, AsyncReadExt as _, AsyncWrite, FutureExt as _, channel::oneshot, select};
-use gpui::{AppContext as _, AsyncApp, Task};
+use gpui::AsyncApp;
 use settings::Settings as _;
 use smallvec::SmallVec;
 use smol::{
@@ -22,7 +22,7 @@ use std::{
    time::Duration,
 };
 use task::TcpArgumentsTemplate;
-use util::{ConnectionResult, ResultExt as _};
+use util::{ResultExt as _, TryFutureExt};

 use crate::{adapters::DebugAdapterBinary, debugger_settings::DebuggerSettings};

@@ -126,7 +126,7 @@ pub(crate) struct TransportDelegate {
    pending_requests: Requests,
    transport: Transport,
    server_tx: Arc<Mutex<Option<Sender<Message>>>>,
-    _tasks: Vec<Task<()>>,
+    _tasks: Vec<gpui::Task<Option<()>>>,
 }

 impl TransportDelegate {
@@ -141,7 +141,7 @@ impl TransportDelegate {
            log_handlers: Default::default(),
            current_requests: Default::default(),
            pending_requests: Default::default(),
-            _tasks: Vec::new(),
+            _tasks: Default::default(),
        };
        let messages = this.start_handlers(transport_pipes, cx).await?;
        Ok((messages, this))
@@ -166,76 +166,45 @@ impl TransportDelegate {
            None
        };

-        let adapter_log_handler = log_handler.clone();
        cx.update(|cx| {
            if let Some(stdout) = params.stdout.take() {
-                self._tasks.push(cx.background_spawn(async move {
-                    match Self::handle_adapter_log(stdout, adapter_log_handler).await {
-                        ConnectionResult::Timeout => {
-                            log::error!("Timed out when handling debugger log");
-                        }
-                        ConnectionResult::ConnectionReset => {
-                            log::info!("Debugger logs connection closed");
-                        }
-                        ConnectionResult::Result(Ok(())) => {}
-                        ConnectionResult::Result(Err(e)) => {
-                            log::error!("Error handling debugger log: {e}");
-                        }
-                    }
-                }));
+                self._tasks.push(
+                    cx.background_executor()
+                        .spawn(Self::handle_adapter_log(stdout, log_handler.clone()).log_err()),
+                );
            }

-            let pending_requests = self.pending_requests.clone();
-            let output_log_handler = log_handler.clone();
-            self._tasks.push(cx.background_spawn(async move {
-                match Self::handle_output(
-                    params.output,
-                    client_tx,
-                    pending_requests,
-                    output_log_handler,
-                )
-                .await
-                {
-                    Ok(()) => {}
-                    Err(e) => log::error!("Error handling debugger output: {e}"),
-                }
-            }));
+            self._tasks.push(
+                cx.background_executor().spawn(
+                    Self::handle_output(
+                        params.output,
+                        client_tx,
+                        self.pending_requests.clone(),
+                        log_handler.clone(),
+                    )
+                    .log_err(),
+                ),
+            );

            if let Some(stderr) = params.stderr.take() {
-                let log_handlers = self.log_handlers.clone();
-                self._tasks.push(cx.background_spawn(async move {
-                    match Self::handle_error(stderr, log_handlers).await {
-                        ConnectionResult::Timeout => {
-                            log::error!("Timed out reading debugger error stream")
-                        }
-                        ConnectionResult::ConnectionReset => {
-                            log::info!("Debugger closed its error stream")
-                        }
-                        ConnectionResult::Result(Ok(())) => {}
-                        ConnectionResult::Result(Err(e)) => {
-                            log::error!("Error handling debugger error: {e}")
-                        }
-                    }
-                }));
+                self._tasks.push(
+                    cx.background_executor()
+                        .spawn(Self::handle_error(stderr, self.log_handlers.clone()).log_err()),
+                );
            }

-            let current_requests = self.current_requests.clone();
-            let pending_requests = self.pending_requests.clone();
-            let log_handler = log_handler.clone();
-            self._tasks.push(cx.background_spawn(async move {
-                match Self::handle_input(
-                    params.input,
-                    client_rx,
-                    current_requests,
-                    pending_requests,
-                    log_handler,
-                )
-                .await
-                {
-                    Ok(()) => {}
-                    Err(e) => log::error!("Error handling debugger input: {e}"),
-                }
-            }));
+            self._tasks.push(
+                cx.background_executor().spawn(
+                    Self::handle_input(
+                        params.input,
+                        client_rx,
+                        self.current_requests.clone(),
+                        self.pending_requests.clone(),
+                        log_handler.clone(),
+                    )
+                    .log_err(),
+                ),
+            );
        })?;

        {
@@ -266,7 +235,7 @@ impl TransportDelegate {
    async fn handle_adapter_log<Stdout>(
        stdout: Stdout,
        log_handlers: Option<LogHandlers>,
-    ) -> ConnectionResult<()>
+    ) -> Result<()>
    where
        Stdout: AsyncRead + Unpin + Send + 'static,
    {
@@ -276,14 +245,13 @@ impl TransportDelegate {
        let result = loop {
            line.truncate(0);

-            match reader
-                .read_line(&mut line)
-                .await
-                .context("reading adapter log line")
-            {
-                Ok(0) => break ConnectionResult::ConnectionReset,
-                Ok(_) => {}
-                Err(e) => break ConnectionResult::Result(Err(e)),
+            let bytes_read = match reader.read_line(&mut line).await {
+                Ok(bytes_read) => bytes_read,
+                Err(e) => break Err(e.into()),
+            };
+
+            if bytes_read == 0 {
+                anyhow::bail!("Debugger log stream closed");
            }

            if let Some(log_handlers) = log_handlers.as_ref() {
@@ -369,35 +337,35 @@ impl TransportDelegate {
        let mut reader = BufReader::new(server_stdout);

        let result = loop {
-            match Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
-                .await
-            {
-                ConnectionResult::Timeout => anyhow::bail!("Timed out when connecting to debugger"),
-                ConnectionResult::ConnectionReset => {
-                    log::info!("Debugger closed the connection");
-                    return Ok(());
-                }
-                ConnectionResult::Result(Ok(Message::Response(res))) => {
+            let message =
+                Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
+                    .await;
+
+            match message {
+                Ok(Message::Response(res)) => {
                    if let Some(tx) = pending_requests.lock().await.remove(&res.request_seq) {
                        if let Err(e) = tx.send(Self::process_response(res)) {
                            log::trace!("Did not send response `{:?}` for a cancelled", e);
                        }
                    } else {
                        client_tx.send(Message::Response(res)).await?;
-                    }
+                    };
                }
-                ConnectionResult::Result(Ok(message)) => client_tx.send(message).await?,
-                ConnectionResult::Result(Err(e)) => break Err(e),
+                Ok(message) => {
+                    client_tx.send(message).await?;
+                }
+                Err(e) => break Err(e),
            }
        };

        drop(client_tx);
+
        log::debug!("Handle adapter output dropped");

        result
    }

-    async fn handle_error<Stderr>(stderr: Stderr, log_handlers: LogHandlers) -> ConnectionResult<()>
+    async fn handle_error<Stderr>(stderr: Stderr, log_handlers: LogHandlers) -> Result<()>
    where
        Stderr: AsyncRead + Unpin + Send + 'static,
    {
@@ -407,12 +375,8 @@ impl TransportDelegate {
        let mut reader = BufReader::new(stderr);

        let result = loop {
-            match reader
-                .read_line(&mut buffer)
-                .await
-                .context("reading error log line")
-            {
-                Ok(0) => break ConnectionResult::ConnectionReset,
+            match reader.read_line(&mut buffer).await {
+                Ok(0) => anyhow::bail!("debugger error stream closed"),
                Ok(_) => {
                    for (kind, log_handler) in log_handlers.lock().iter_mut() {
                        if matches!(kind, LogKind::Adapter) {
@@ -422,7 +386,7 @@ impl TransportDelegate {

                    buffer.truncate(0);
                }
-                Err(error) => break ConnectionResult::Result(Err(error)),
+                Err(error) => break Err(error.into()),
            }
        };

@@ -456,7 +420,7 @@ impl TransportDelegate {
        reader: &mut BufReader<Stdout>,
        buffer: &mut String,
        log_handlers: Option<&LogHandlers>,
-    ) -> ConnectionResult<Message>
+    ) -> Result<Message>
    where
        Stdout: AsyncRead + Unpin + Send + 'static,
    {
@@ -464,58 +428,48 @@ impl TransportDelegate {
        loop {
            buffer.truncate(0);

-            match reader
+            if reader
                .read_line(buffer)
                .await
-                .with_context(|| "reading a message from server")
+                .with_context(|| "reading a message from server")?
+                == 0
            {
-                Ok(0) => return ConnectionResult::ConnectionReset,
-                Ok(_) => {}
-                Err(e) => return ConnectionResult::Result(Err(e)),
+                anyhow::bail!("debugger reader stream closed, last string output: '{buffer}'");
            };

            if buffer == "\r\n" {
                break;
            }

-            if let Some(("Content-Length", value)) = buffer.trim().split_once(": ") {
-                match value.parse().context("invalid content length") {
-                    Ok(length) => content_length = Some(length),
-                    Err(e) => return ConnectionResult::Result(Err(e)),
+            let parts = buffer.trim().split_once(": ");
+
+            match parts {
+                Some(("Content-Length", value)) => {
+                    content_length = Some(value.parse().context("invalid content length")?);
                }
+                _ => {}
            }
        }

-        let content_length = match content_length.context("missing content length") {
-            Ok(length) => length,
-            Err(e) => return ConnectionResult::Result(Err(e)),
-        };
+        let content_length = content_length.context("missing content length")?;

        let mut content = vec![0; content_length];
-        if let Err(e) = reader
+        reader
            .read_exact(&mut content)
            .await
-            .with_context(|| "reading after a loop")
-        {
-            return ConnectionResult::Result(Err(e));
-        }
+            .with_context(|| "reading after a loop")?;

-        let message_str = match std::str::from_utf8(&content).context("invalid utf8 from server") {
-            Ok(str) => str,
-            Err(e) => return ConnectionResult::Result(Err(e)),
-        };
+        let message = std::str::from_utf8(&content).context("invalid utf8 from server")?;

        if let Some(log_handlers) = log_handlers {
            for (kind, log_handler) in log_handlers.lock().iter_mut() {
                if matches!(kind, LogKind::Rpc) {
-                    log_handler(IoKind::StdOut, message_str);
+                    log_handler(IoKind::StdOut, &message);
                }
            }
        }

-        ConnectionResult::Result(
-            serde_json::from_str::<Message>(message_str).context("deserializing server message"),
-        )
+        Ok(serde_json::from_str::<Message>(message)?)
    }

    pub async fn shutdown(&self) -> Result<()> {
@@ -823,55 +777,73 @@ impl FakeTransport {
        let response_handlers = this.response_handlers.clone();
        let stdout_writer = Arc::new(Mutex::new(stdout_writer));

-        cx.background_spawn(async move {
-            let mut reader = BufReader::new(stdin_reader);
-            let mut buffer = String::new();
+        cx.background_executor()
+            .spawn(async move {
+                let mut reader = BufReader::new(stdin_reader);
+                let mut buffer = String::new();

-            loop {
-                match TransportDelegate::receive_server_message(&mut reader, &mut buffer, None)
-                    .await
-                {
-                    ConnectionResult::Timeout => {
-                        anyhow::bail!("Timed out when connecting to debugger");
-                    }
-                    ConnectionResult::ConnectionReset => {
-                        log::info!("Debugger closed the connection");
-                        break Ok(());
-                    }
-                    ConnectionResult::Result(Err(e)) => break Err(e),
-                    ConnectionResult::Result(Ok(message)) => {
-                        match message {
-                            Message::Request(request) => {
-                                // redirect reverse requests to stdout writer/reader
-                                if request.command == RunInTerminal::COMMAND
-                                    || request.command == StartDebugging::COMMAND
-                                {
-                                    let message =
-                                        serde_json::to_string(&Message::Request(request)).unwrap();
+                loop {
+                    let message =
+                        TransportDelegate::receive_server_message(&mut reader, &mut buffer, None)
+                            .await;

-                                    let mut writer = stdout_writer.lock().await;
-                                    writer
-                                        .write_all(
-                                            TransportDelegate::build_rpc_message(message)
-                                                .as_bytes(),
-                                        )
-                                        .await
-                                        .unwrap();
-                                    writer.flush().await.unwrap();
-                                } else {
-                                    let response = if let Some(handle) =
-                                        request_handlers.lock().get_mut(request.command.as_str())
+                    match message {
+                        Err(error) => {
+                            break anyhow::anyhow!(error);
+                        }
+                        Ok(message) => {
+                            match message {
+                                Message::Request(request) => {
+                                    // redirect reverse requests to stdout writer/reader
+                                    if request.command == RunInTerminal::COMMAND
+                                        || request.command == StartDebugging::COMMAND
                                    {
-                                        handle(request.seq, request.arguments.unwrap_or(json!({})))
-                                    } else {
-                                        panic!("No request handler for {}", request.command);
-                                    };
-                                    let message =
-                                        serde_json::to_string(&Message::Response(response))
+                                        let message =
+                                            serde_json::to_string(&Message::Request(request))
+                                                .unwrap();
+
+                                        let mut writer = stdout_writer.lock().await;
+                                        writer
+                                            .write_all(
+                                                TransportDelegate::build_rpc_message(message)
+                                                    .as_bytes(),
+                                            )
+                                            .await
                                            .unwrap();
+                                        writer.flush().await.unwrap();
+                                    } else {
+                                        let response = if let Some(handle) = request_handlers
+                                            .lock()
+                                            .get_mut(request.command.as_str())
+                                        {
+                                            handle(
+                                                request.seq,
+                                                request.arguments.unwrap_or(json!({})),
+                                            )
+                                        } else {
+                                            panic!("No request handler for {}", request.command);
+                                        };
+                                        let message =
+                                            serde_json::to_string(&Message::Response(response))
+                                                .unwrap();
+
+                                        let mut writer = stdout_writer.lock().await;
+
+                                        writer
+                                            .write_all(
+                                                TransportDelegate::build_rpc_message(message)
+                                                    .as_bytes(),
+                                            )
+                                            .await
+                                            .unwrap();
+                                        writer.flush().await.unwrap();
+                                    }
+                                }
+                                Message::Event(event) => {
+                                    let message =
+                                        serde_json::to_string(&Message::Event(event)).unwrap();

                                    let mut writer = stdout_writer.lock().await;
-
                                    writer
                                        .write_all(
                                            TransportDelegate::build_rpc_message(message)
@@ -881,35 +853,21 @@ impl FakeTransport {
                                        .unwrap();
                                    writer.flush().await.unwrap();
                                }
-                            }
-                            Message::Event(event) => {
-                                let message =
-                                    serde_json::to_string(&Message::Event(event)).unwrap();
-
-                                let mut writer = stdout_writer.lock().await;
-                                writer
-                                    .write_all(
-                                        TransportDelegate::build_rpc_message(message).as_bytes(),
-                                    )
-                                    .await
-                                    .unwrap();
-                                writer.flush().await.unwrap();
-                            }
-                            Message::Response(response) => {
-                                if let Some(handle) =
-                                    response_handlers.lock().get(response.command.as_str())
-                                {
-                                    handle(response);
-                                } else {
-                                    log::error!("No response handler for {}", response.command);
+                                Message::Response(response) => {
+                                    if let Some(handle) =
+                                        response_handlers.lock().get(response.command.as_str())
+                                    {
+                                        handle(response);
+                                    } else {
+                                        log::error!("No response handler for {}", response.command);
+                                    }
                                }
                            }
                        }
                    }
                }
-            }
-        })
-        .detach();
+            })
+            .detach();

        Ok((
            TransportPipe::new(Box::new(stdin_writer), Box::new(stdout_reader), None, None),
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -1,8 +1,11 @@
 use std::{collections::HashMap, path::PathBuf, sync::OnceLock};

-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
-use dap::adapters::{DebugTaskDefinition, latest_github_release};
+use dap::{
+    StartDebuggingRequestArgumentsRequest,
+    adapters::{DebugTaskDefinition, latest_github_release},
+};
 use futures::StreamExt;
 use gpui::AsyncApp;
 use serde_json::Value;
@@ -34,7 +37,7 @@ impl CodeLldbDebugAdapter {
                Value::String(String::from(task_definition.label.as_ref())),
            );

-        let request = self.request_kind(&configuration)?;
+        let request = self.validate_config(&configuration)?;

        Ok(dap::StartDebuggingRequestArguments {
            request,
@@ -86,6 +89,48 @@ impl DebugAdapter for CodeLldbDebugAdapter {
        DebugAdapterName(Self::ADAPTER_NAME.into())
    }

+    fn validate_config(
+        &self,
+        config: &serde_json::Value,
+    ) -> Result<StartDebuggingRequestArgumentsRequest> {
+        let map = config
+            .as_object()
+            .ok_or_else(|| anyhow!("Config isn't an object"))?;
+
+        let request_variant = map
+            .get("request")
+            .and_then(|r| r.as_str())
+            .ok_or_else(|| anyhow!("request field is required and must be a string"))?;
+
+        match request_variant {
+            "launch" => {
+                // For launch, verify that one of the required configs exists
+                if !(map.contains_key("program")
+                    || map.contains_key("targetCreateCommands")
+                    || map.contains_key("cargo"))
+                {
+                    return Err(anyhow!(
+                        "launch request requires either 'program', 'targetCreateCommands', or 'cargo' field"
+                    ));
+                }
+                Ok(StartDebuggingRequestArgumentsRequest::Launch)
+            }
+            "attach" => {
+                // For attach, verify that either pid or program exists
+                if !(map.contains_key("pid") || map.contains_key("program")) {
+                    return Err(anyhow!(
+                        "attach request requires either 'pid' or 'program' field"
+                    ));
+                }
+                Ok(StartDebuggingRequestArgumentsRequest::Attach)
+            }
+            _ => Err(anyhow!(
+                "request must be either 'launch' or 'attach', got '{}'",
+                request_variant
+            )),
+        }
+    }
+
    fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
        let mut configuration = json!({
            "request": match zed_scenario.request {
--- a/crates/dap_adapters/src/gdb.rs
+++ b/crates/dap_adapters/src/gdb.rs
@@ -178,7 +178,7 @@ impl DebugAdapter for GdbDebugAdapter {
        let gdb_path = user_setting_path.unwrap_or(gdb_path?);

        let request_args = StartDebuggingRequestArguments {
-            request: self.request_kind(&config.config)?,
+            request: self.validate_config(&config.config)?,
            configuration: config.config.clone(),
        };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nathan Sobo	d104df955e	WIP	2025-06-04 09:50:06 -07:00
Mikayla Maki	45de5c080a	remove old comment	2025-05-31 22:17:44 -07:00
Mikayla Maki	03bed065e7	Slightly optimize the noop reordering case	2025-05-31 22:15:51 -07:00
Mikayla Maki	a3e7c4e961	Add a test showing that the channels can be in any order	2025-05-31 21:09:45 -07:00
Mikayla Maki	24ccd8268d	Add missing channel moving tests Fix a bug in the channel reordering when moving a channel into another	2025-05-31 20:38:50 -07:00
Mikayla Maki	9168a94c6a	Remove unescessary complexity. Fix a test that wasn't actually testing anything when ordering constraints where removed.	2025-05-31 19:55:15 -07:00
Mikayla Maki	b96463e5bb	remove unescessary channel ordering	2025-05-31 19:31:44 -07:00
Nathan Sobo	0e12e31edc	Fix channel reordering to return only swapped channels The reorder_channel function was returning all sibling channels instead of just the two that were swapped, causing test failures that expected exactly 2 channels to be returned. This change modifies the function to return only the two channels that had their order values swapped, which is more efficient and matches the test expectations.	2025-05-31 15:53:45 -06:00
Nathan Sobo	a8287e4289	Fix CollabPanel channel reordering keybindings The channel reordering keybindings (Cmd/Ctrl+Up/Down) were non-functional because the CollabPanel wasn't properly setting the key context to distinguish between editing and non-editing states. ## Problem The keymaps specified 'CollabPanel && not_editing' as the required context for the reordering actions, but CollabPanel was only setting 'CollabPanel' without the editing state modifier. This meant the keybindings were never matched. ## Solution Added a dispatch_context method to CollabPanel that: - Checks if the channel_name_editor is focused - Adds 'editing' context when renaming/creating channels - Adds 'not_editing' context during normal navigation - Follows the same pattern used by ProjectPanel and OutlinePanel This allows the keybindings to work correctly while preventing conflicts between text editing operations (where arrows move the cursor) and channel navigation operations (where arrows reorder channels).	2025-05-31 14:49:51 -06:00
Nathan Sobo	8019a3925d	Add channel reordering functionality This change introduces the ability for channel administrators to reorder channels within their parent context, providing better organizational control over channel hierarchies. Channels can now be moved up or down relative to their siblings through keyboard shortcuts. ## Problem Previously, channels were displayed in alphabetical order with no way to customize their arrangement. This made it difficult for teams to organize channels in a logical order that reflected their workflow or importance, forcing users to prefix channel names with numbers or special characters as a workaround. ## Solution The implementation adds a persistent `channel_order` field to channels that determines their display order within their parent. Channels with the same parent are sorted by this field rather than alphabetically. ## Technical Implementation Database Schema: - Added `channel_order` INTEGER column to the channels table with a default value of 1 - Created a compound index on `(parent_path, channel_order)` for efficient ordering queries - Migration updates existing channels with deterministic ordering based on their current alphabetical position Core Changes: - Extended the `Channel` struct across the codebase to include the `channel_order` field - Modified `ChannelIndex` sorting logic to use channel_order instead of alphabetical name comparison - Channels now maintain their relative position among siblings RPC Protocol: - Added `ReorderChannel` RPC message with channel_id and direction (Up/Down) - Extended existing Channel proto message to include the channel_order field - Server validates that users have admin permissions before allowing reordering Reordering Logic: - When moving a channel up/down, the server finds the adjacent sibling in that direction - Swaps the `channel_order` values between the two channels - Broadcasts the updated channel list to all affected users - Handles edge cases: channels at boundaries, channels with gaps in ordering User Interface: - Added keyboard shortcuts: - macOS: `Cmd+Up/Down` to move channels - Linux: `Ctrl+Up/Down` to move channels - Added `MoveChannelUp` and `MoveChannelDown` actions to the collab panel - Reordering is only available when a channel is selected (not during editing) Error Handling: The change also improves error handling practices throughout the codebase by ensuring that errors from async operations propagate correctly to the UI layer instead of being silently discarded with `let _ =`. Testing: Comprehensive tests were added to verify: - Basic reordering functionality up and down - Boundary conditions (first/last channels) - Permission checks (non-admins cannot reorder) - Ordering persistence across server restarts - Correct broadcasting of changes to channel members Known Issue: The keybindings are currently non-functional due to missing context setup in CollabPanel. The keymaps expect 'CollabPanel && not_editing' context, but the panel only provides 'CollabPanel'. This will be fixed in a follow-up commit.	2025-05-31 14:45:13 -06:00
				`@@ -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-list-todo-icon lucide-list-todo"><rect x="3" y="5" width="6" height="6" rx="1"/><path d="m3 17 2 2 4-4"/><path d="M13 6h8"/><path d="M13 12h8"/><path d="M13 18h8"/></svg>`