Add GitHub token authentication to HTTP client

Automatically adds GitHub authentication headers when GITHUB_TOKEN environment variable is set.
2025-06-05 20:22:38 +02:00
467 changed files with 12104 additions and 22310 deletions
--- a/.github/ISSUE_TEMPLATE/01_bug_ai.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_ai.yml
@@ -1,4 +1,4 @@
-name: Bug Report (AI)
+name: Bug Report (AI Related)
 description: Zed Agent Panel Bugs
 type: "Bug"
 labels: ["ai"]
@@ -19,14 +19,15 @@ body:
        2.
        3.

-        **Expected Behavior**:
-        **Actual Behavior**:
+        Actual Behavior:
+        Expected Behavior:

        ### Model Provider Details
        - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc)
        - Model Name:
        - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
-        - Other Details (MCPs, other settings, etc):
+        - MCP Servers in-use:
+        - Other Details:
    validations:
      required: true

--- a/.github/ISSUE_TEMPLATE/02_bug_edit_predictions.yml
+++ b/.github/ISSUE_TEMPLATE/02_bug_edit_predictions.yml
@@ -0,0 +1,36 @@
+name: Bug Report (Edit Predictions)
+description: Zed Edit Predictions bugs
+type: "Bug"
+labels: ["ai", "inline completion", "zeta"]
+title: "Edit Predictions: <a short description of the Edit Prediction bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        <!--  Please include the LLM provider and model name you are using -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        Actual Behavior:
+        Expected Behavior:
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/03_bug_git.yml
+++ b/.github/ISSUE_TEMPLATE/03_bug_git.yml
@@ -0,0 +1,35 @@
+name: Bug Report (Git)
+description: Zed Git-Related Bugs
+type: "Bug"
+labels: ["git"]
+title: "Git: <a short description of the Git bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        Actual Behavior:
+        Expected Behavior:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
+++ b/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
@@ -19,8 +19,8 @@ body:
        2.
        3.

-        **Expected Behavior**:
-        **Actual Behavior**:
+        Actual Behavior:
+        Expected Behavior:

    validations:
      required: true
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@@ -18,16 +18,14 @@ body:
          - Issues with insufficient detail may be summarily closed.
        -->

-        DESCRIPTION_HERE
-
        Steps to reproduce:
        1.
        2.
        3.
        4.

-        **Expected Behavior**:
-        **Actual Behavior**:
+        Expected Behavior:
+        Actual Behavior:

        <!-- Before Submitting, did you:
          1. Include settings.json, keymap.json, .editorconfig if relevant?
--- a/.github/actions/build_docs/action.yml
+++ b/.github/actions/build_docs/action.yml
@@ -19,12 +19,6 @@ runs:
      shell: bash -euxo pipefail {0}
      run: ./script/linux

-    - name: Check for broken links
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
-      with:
-        args: --no-progress --exclude '^http' './docs/src/**/*'
-        fail: true
-
    - name: Build book
      shell: bash -euxo pipefail {0}
      run: |
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -183,9 +183,6 @@ jobs:
      - name: Check for todo! and FIXME comments
        run: script/check-todos

-      - name: Check modifier use in keymaps
-        run: script/check-keymaps
-
      - name: Run style checks
        uses: ./.github/actions/check_style

@@ -498,7 +495,6 @@ jobs:
    needs:
      - job_spec
      - style
-      - check_docs
      - migration_checks
      # run_tests: If adding required tests, add them here and to script below.
      - workspace_hack
@@ -516,8 +512,7 @@ jobs:
          # Check dependent jobs...
          RET_CODE=0
          # Always check style
-          [[ "${{ needs.style.result }}"      != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }
-          [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }
+          [[ "${{ needs.style.result }}" != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }

          # Only check test jobs if they were supposed to run
          if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
@@ -741,69 +736,10 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  freebsd:
-    timeout-minutes: 60
-    runs-on: github-8vcpu-ubuntu-2404
-    if: |
-      startsWith(github.ref, 'refs/tags/v')
-      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
-    needs: [linux_tests]
-    name: Build Zed on FreeBSD
-    # env:
-    #   MYTOKEN : ${{ secrets.MYTOKEN }}
-    #   MYTOKEN2: "value2"
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build FreeBSD remote-server
-        id: freebsd-build
-        uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
-        with:
-          # envs: "MYTOKEN MYTOKEN2"
-          usesh: true
-          release: 13.5
-          copyback: true
-          prepare: |
-            pkg install -y \
-              bash curl jq git \
-              rustup-init cmake-core llvm-devel-lite pkgconf protobuf # ibx11 alsa-lib rust-bindgen-cli
-          run: |
-            freebsd-version
-            sysctl hw.model
-            sysctl hw.ncpu
-            sysctl hw.physmem
-            sysctl hw.usermem
-            git config --global --add safe.directory /home/runner/work/zed/zed
-            rustup-init --profile minimal --default-toolchain none -y
-            . "$HOME/.cargo/env"
-            ./script/bundle-freebsd
-            mkdir -p out/
-            mv "target/zed-remote-server-freebsd-x86_64.gz" out/
-            rm -rf target/
-            cargo clean
-
-      - name: Upload Artifact to Workflow - zed-remote-server (run-bundling)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
-        with:
-          name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-freebsd.gz
-          path: out/zed-remote-server-freebsd-x86_64.gz
-
-      - name: Upload Artifacts to release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
-        with:
-          draft: true
-          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
-          files: |
-            out/zed-remote-server-freebsd-x86_64.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
  nix-build:
    name: Build with Nix
    uses: ./.github/workflows/nix.yml
    if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
-    secrets: inherit
    with:
      flake-output: debug
      # excludes the final package to only cache dependencies
@@ -814,12 +750,12 @@ jobs:
    if: |
      startsWith(github.ref, 'refs/tags/v')
      && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
-    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, freebsd]
+    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64]
    runs-on:
      - self-hosted
      - bundle
    steps:
      - name: gh release
-        run: gh release edit $GITHUB_REF_NAME --draft=false
+        run: gh release edit $GITHUB_REF_NAME --draft=true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -30,7 +30,6 @@ jobs:
  noop:
    name: No-op
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'zed-industries'
    steps:
      - name: No-op
        run: echo "Nothing to do"
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -167,54 +167,9 @@ jobs:
      - name: Upload Zed Nightly
        run: script/upload-nightly linux-targz

-  freebsd:
-    timeout-minutes: 60
-    if: github.repository_owner == 'zed-industries'
-    runs-on: github-8vcpu-ubuntu-2404
-    needs: tests
-    env:
-      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
-    name: Build Zed on FreeBSD
-    # env:
-    #   MYTOKEN : ${{ secrets.MYTOKEN }}
-    #   MYTOKEN2: "value2"
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build FreeBSD remote-server
-        id: freebsd-build
-        uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
-        with:
-          # envs: "MYTOKEN MYTOKEN2"
-          usesh: true
-          release: 13.5
-          copyback: true
-          prepare: |
-            pkg install -y \
-              bash curl jq git \
-              rustup-init cmake-core llvm-devel-lite pkgconf protobuf # ibx11 alsa-lib rust-bindgen-cli
-          run: |
-            freebsd-version
-            sysctl hw.model
-            sysctl hw.ncpu
-            sysctl hw.physmem
-            sysctl hw.usermem
-            git config --global --add safe.directory /home/runner/work/zed/zed
-            rustup-init --profile minimal --default-toolchain none -y
-            . "$HOME/.cargo/env"
-            ./script/bundle-freebsd
-            mkdir -p out/
-            mv "target/zed-remote-server-freebsd-x86_64.gz" out/
-            rm -rf target/
-            cargo clean
-
-      - name: Upload Zed Nightly
-        run: script/upload-nightly freebsd
-
  bundle-nix:
    name: Build and cache Nix package
    needs: tests
-    secrets: inherit
    uses: ./.github/workflows/nix.yml

  update-nightly-tag:
--- a/.github/workflows/unit_evals.yml
+++ b/.github/workflows/unit_evals.yml
@@ -19,7 +19,6 @@ env:

 jobs:
  unit_evals:
-    if: github.repository_owner == 'zed-industries'
    timeout-minutes: 60
    name: Run unit evals
    runs-on:
@@ -63,11 +62,11 @@ jobs:

      - name: Run unit evals
        shell: bash -euxo pipefail {0}
-        run: cargo nextest run --workspace --no-fail-fast --features eval --no-capture -E 'test(::eval_)'
+        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 failure message to Slack channel if needed
+      - name: Send the pull request link into the Slack channel
        if: ${{ failure() }}
        uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52
        with:
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -47,7 +47,6 @@
  "remove_trailing_whitespace_on_save": true,
  "ensure_final_newline_on_save": true,
  "file_scan_exclusions": [
-    "crates/assistant_tools/src/evals/fixtures",
    "crates/eval/worktrees/",
    "crates/eval/repos/",
    "**/.git",
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,7 +59,7 @@ dependencies = [
 "assistant_slash_command",
 "assistant_slash_commands",
 "assistant_tool",
- "assistant_tools",
+ "async-watch",
 "audio",
 "buffer_diff",
 "chrono",
@@ -99,7 +99,6 @@ dependencies = [
 "paths",
 "picker",
 "postage",
- "pretty_assertions",
 "project",
 "prompt_store",
 "proto",
@@ -131,7 +130,6 @@ dependencies = [
 "urlencoding",
 "util",
 "uuid",
- "watch",
 "workspace",
 "workspace-hack",
 "zed_actions",
@@ -149,6 +147,7 @@ dependencies = [
 "deepseek",
 "fs",
 "gpui",
+ "indexmap",
 "language_model",
 "lmstudio",
 "log",
@@ -491,6 +490,7 @@ dependencies = [
 "anyhow",
 "futures 0.3.31",
 "gpui",
+ "shlex",
 "smol",
 "tempfile",
 "util",
@@ -631,6 +631,7 @@ name = "assistant_tool"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "async-watch",
 "buffer_diff",
 "clock",
 "collections",
@@ -652,7 +653,6 @@ dependencies = [
 "settings",
 "text",
 "util",
- "watch",
 "workspace",
 "workspace-hack",
 "zlog",
@@ -665,6 +665,7 @@ dependencies = [
 "agent_settings",
 "anyhow",
 "assistant_tool",
+ "async-watch",
 "buffer_diff",
 "chrono",
 "client",
@@ -704,7 +705,6 @@ dependencies = [
 "serde_json",
 "settings",
 "smallvec",
- "smol",
 "streaming_diff",
 "strsim",
 "task",
@@ -716,7 +716,6 @@ dependencies = [
 "ui",
 "unindent",
 "util",
- "watch",
 "web_search",
 "which 6.0.3",
 "workspace",
@@ -1075,6 +1074,15 @@ dependencies = [
 "tungstenite 0.26.2",
 ]

+[[package]]
+name = "async-watch"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a078faf4e27c0c6cc0efb20e5da59dcccc04968ebf2801d8e0b2195124cdcdb2"
+dependencies = [
+ "event-listener 2.5.3",
+]
+
 [[package]]
 name = "async_zip"
 version = "0.0.17"
@@ -2822,11 +2830,9 @@ dependencies = [
 "collections",
 "credentials_provider",
 "feature_flags",
- "fs",
 "futures 0.3.31",
 "gpui",
 "gpui_tokio",
- "hickory-resolver",
 "http_client",
 "http_client_tls",
 "httparse",
@@ -2835,7 +2841,6 @@ dependencies = [
 "paths",
 "postage",
 "rand 0.8.5",
- "regex",
 "release_channel",
 "rpc",
 "rustls-pki-types",
@@ -2982,6 +2987,7 @@ dependencies = [
 "anyhow",
 "assistant_context_editor",
 "assistant_slash_command",
+ "assistant_tool",
 "async-stripe",
 "async-trait",
 "async-tungstenite",
@@ -3163,16 +3169,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "command-fds"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ec1052629a80c28594777d1252efc8a6b005d13f9edfd8c3fc0f44d5b32489a"
-dependencies = [
- "nix 0.30.1",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "command_palette"
 version = "0.1.0"
@@ -3542,20 +3538,6 @@ dependencies = [
 "coreaudio-sys",
 ]

-[[package]]
-name = "coreaudio-rs"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "objc2-audio-toolbox",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "objc2-core-foundation",
-]
-
 [[package]]
 name = "coreaudio-sys"
 version = "0.2.16"
@@ -3591,8 +3573,7 @@ dependencies = [
 [[package]]
 name = "cpal"
 version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
+source = "git+https://github.com/zed-industries/cpal?rev=fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50#fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50"
 dependencies = [
 "alsa",
 "core-foundation-sys",
@@ -3602,7 +3583,7 @@ dependencies = [
 "js-sys",
 "libc",
 "mach2",
- "ndk 0.8.0",
+ "ndk",
 "ndk-context",
 "oboe",
 "wasm-bindgen",
@@ -3611,32 +3592,6 @@ dependencies = [
 "windows 0.54.0",
 ]

-[[package]]
-name = "cpal"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd307f43cc2a697e2d1f8bc7a1d824b5269e052209e28883e5bc04d095aaa3f"
-dependencies = [
- "alsa",
- "coreaudio-rs 0.13.0",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2",
- "ndk 0.9.0",
- "ndk-context",
- "num-derive",
- "num-traits",
- "objc2-audio-toolbox",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
 [[package]]
 name = "cpp_demangle"
 version = "0.4.4"
@@ -4070,7 +4025,6 @@ dependencies = [
 "gpui",
 "http_client",
 "language",
- "libc",
 "log",
 "node_runtime",
 "parking_lot",
@@ -4094,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "dap-types"
 version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=b40956a7f4d1939da67429d941389ee306a3a308#b40956a7f4d1939da67429d941389ee306a3a308"
+source = "git+https://github.com/zed-industries/dap-types?rev=68516de327fa1be15214133a0a2e52a12982ce75#68516de327fa1be15214133a0a2e52a12982ce75"
 dependencies = [
 "schemars",
 "serde",
@@ -4107,7 +4061,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "async-trait",
- "collections",
 "dap",
 "futures 0.3.31",
 "gpui",
@@ -4281,7 +4234,6 @@ dependencies = [
 "futures 0.3.31",
 "fuzzy",
 "gpui",
- "itertools 0.14.0",
 "language",
 "log",
 "menu",
@@ -4739,6 +4691,7 @@ dependencies = [
 "client",
 "clock",
 "collections",
+ "command_palette_hooks",
 "convert_case 0.8.0",
 "ctor",
 "dap",
@@ -4907,18 +4860,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"

-[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "enumflags2"
 version = "0.7.11"
@@ -5072,6 +5013,7 @@ dependencies = [
 "assistant_tool",
 "assistant_tools",
 "async-trait",
+ "async-watch",
 "buffer_diff",
 "chrono",
 "clap",
@@ -5113,7 +5055,6 @@ dependencies = [
 "unindent",
 "util",
 "uuid",
- "watch",
 "workspace-hack",
 "zed_llm_client",
 ]
@@ -6176,7 +6117,6 @@ dependencies = [
 "anyhow",
 "askpass",
 "buffer_diff",
- "call",
 "chrono",
 "collections",
 "command_palette_hooks",
@@ -7497,51 +7437,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"

-[[package]]
-name = "hickory-proto"
-version = "0.24.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna",
- "ipnet",
- "once_cell",
- "rand 0.8.5",
- "thiserror 1.0.69",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "hickory-resolver"
-version = "0.24.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
-dependencies = [
- "cfg-if",
- "futures-util",
- "hickory-proto",
- "ipconfig",
- "lru-cache",
- "once_cell",
- "parking_lot",
- "rand 0.8.5",
- "resolv-conf",
- "smallvec",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "hidden-trait"
 version = "0.1.2"
@@ -8411,18 +8306,6 @@ dependencies = [
 "windows 0.58.0",
 ]

-[[package]]
-name = "ipconfig"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
-dependencies = [
- "socket2",
- "widestring",
- "windows-sys 0.48.0",
- "winreg 0.50.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -8856,6 +8739,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "async-trait",
+ "async-watch",
 "clock",
 "collections",
 "ctor",
@@ -8905,7 +8789,6 @@ dependencies = [
 "unicase",
 "unindent",
 "util",
- "watch",
 "workspace-hack",
 "zlog",
 ]
@@ -9116,6 +8999,7 @@ dependencies = [
 "tree-sitter-yaml",
 "unindent",
 "util",
+ "which 6.0.3",
 "workspace",
 "workspace-hack",
 ]
@@ -9307,12 +9191,6 @@ dependencies = [
 "cc",
 ]

-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linkify"
 version = "0.10.0"
@@ -9439,7 +9317,7 @@ dependencies = [
 "core-foundation 0.10.0",
 "core-video",
 "coreaudio-rs 0.12.1",
- "cpal 0.16.0",
+ "cpal",
 "futures 0.3.31",
 "gpui",
 "gpui_tokio",
@@ -9573,15 +9451,6 @@ dependencies = [
 "hashbrown 0.15.3",
 ]

-[[package]]
-name = "lru-cache"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "lsp"
 version = "0.1.0"
@@ -10218,21 +10087,7 @@ dependencies = [
 "bitflags 2.9.0",
 "jni-sys",
 "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "ndk"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
-dependencies = [
- "bitflags 2.9.0",
- "jni-sys",
- "log",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
 "num_enum",
 "thiserror 1.0.69",
 ]
@@ -10252,15 +10107,6 @@ dependencies = [
 "jni-sys",
 ]

-[[package]]
-name = "ndk-sys"
-version = "0.6.0+11769913"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -10292,18 +10138,6 @@ dependencies = [
 "memoffset",
 ]

-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.9.0",
- "cfg-if",
- "cfg_aliases 0.2.1",
- "libc",
-]
-
 [[package]]
 name = "node_runtime"
 version = "0.1.0"
@@ -10313,6 +10147,7 @@ dependencies = [
 "async-std",
 "async-tar",
 "async-trait",
+ "async-watch",
 "futures 0.3.31",
 "http_client",
 "log",
@@ -10322,7 +10157,6 @@ dependencies = [
 "serde_json",
 "smol",
 "util",
- "watch",
 "which 6.0.3",
 "workspace-hack",
 ]
@@ -10371,7 +10205,6 @@ dependencies = [
 "util",
 "workspace",
 "workspace-hack",
- "zed_actions",
 ]

 [[package]]
@@ -10674,43 +10507,6 @@ dependencies = [
 "objc2-quartz-core",
 ]

-[[package]]
-name = "objc2-audio-toolbox"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cbe18d879e20a4aea544f8befe38bcf52255eb63d3f23eca2842f3319e4c07"
-dependencies = [
- "bitflags 2.9.0",
- "libc",
- "objc2",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "objc2-core-foundation",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-audio"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca44961e888e19313b808f23497073e3f6b3c22bb485056674c8b49f3b025c82"
-dependencies = [
- "dispatch2",
- "objc2",
- "objc2-core-audio-types",
- "objc2-core-foundation",
-]
-
-[[package]]
-name = "objc2-core-audio-types"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f1cc99bb07ad2ddb6527ddf83db6a15271bb036b3eb94b801cd44fdc666ee1"
-dependencies = [
- "bitflags 2.9.0",
- "objc2",
-]
-
 [[package]]
 name = "objc2-core-foundation"
 version = "0.3.1"
@@ -10816,7 +10612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
 dependencies = [
 "jni",
- "ndk 0.8.0",
+ "ndk",
 "ndk-context",
 "num-derive",
 "num-traits",
@@ -12321,6 +12117,7 @@ dependencies = [
 "unindent",
 "url",
 "util",
+ "uuid",
 "which 6.0.3",
 "workspace-hack",
 "worktree",
@@ -13209,6 +13006,7 @@ dependencies = [
 "askpass",
 "assistant_tool",
 "assistant_tools",
+ "async-watch",
 "backtrace",
 "cargo_toml",
 "chrono",
@@ -13255,7 +13053,6 @@ dependencies = [
 "toml 0.8.20",
 "unindent",
 "util",
- "watch",
 "worktree",
 "zlog",
 ]
@@ -13413,7 +13210,6 @@ dependencies = [
 "futures-core",
 "futures-util",
 "h2 0.4.9",
- "hickory-resolver",
 "http 1.3.1",
 "http-body 1.0.1",
 "http-body-util",
@@ -13470,12 +13266,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "resolv-conf"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
-
 [[package]]
 name = "resvg"
 version = "0.45.1"
@@ -13595,7 +13385,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1"
 dependencies = [
- "cpal 0.15.3",
+ "cpal",
 "hound",
 ]

@@ -14607,12 +14397,12 @@ dependencies = [
 "fs",
 "gpui",
 "log",
+ "paths",
 "schemars",
 "serde",
 "settings",
 "theme",
 "ui",
- "util",
 "workspace",
 "workspace-hack",
 ]
@@ -15942,8 +15732,6 @@ dependencies = [
 "task",
 "theme",
 "thiserror 2.0.12",
- "url",
- "urlencoding",
 "util",
 "windows 0.61.1",
 "workspace-hack",
@@ -17340,7 +17128,6 @@ dependencies = [
 "async-fs",
 "async_zip",
 "collections",
- "command-fds",
 "dirs 4.0.0",
 "dunce",
 "futures 0.3.31",
@@ -17351,14 +17138,12 @@ dependencies = [
 "itertools 0.14.0",
 "libc",
 "log",
- "nix 0.29.0",
 "rand 0.8.5",
 "regex",
 "rust-embed",
 "serde",
 "serde_json",
 "serde_json_lenient",
- "shlex",
 "smol",
 "take-until",
 "tempfile",
@@ -18128,19 +17913,6 @@ dependencies = [
 "leb128",
 ]

-[[package]]
-name = "watch"
-version = "0.1.0"
-dependencies = [
- "ctor",
- "futures 0.3.31",
- "gpui",
- "parking_lot",
- "rand 0.8.5",
- "workspace-hack",
- "zlog",
-]
-
 [[package]]
 name = "wayland-backend"
 version = "0.3.8"
@@ -18400,12 +18172,6 @@ dependencies = [
 "wasite",
 ]

-[[package]]
-name = "widestring"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
-
 [[package]]
 name = "wiggle"
 version = "29.0.1"
@@ -19526,7 +19292,6 @@ dependencies = [
 "num-rational",
 "num-traits",
 "objc2",
- "objc2-core-foundation",
 "objc2-foundation",
 "objc2-metal",
 "object",
@@ -19947,7 +19712,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.192.0"
+version = "0.191.0"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -19959,6 +19724,7 @@ dependencies = [
 "assistant_context_editor",
 "assistant_tool",
 "assistant_tools",
+ "async-watch",
 "audio",
 "auto_update",
 "auto_update_ui",
@@ -20075,7 +19841,6 @@ dependencies = [
 "uuid",
 "vim",
 "vim_mode_setting",
- "watch",
 "web_search",
 "web_search_providers",
 "welcome",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,6 @@ members = [
    "crates/util_macros",
    "crates/vim",
    "crates/vim_mode_setting",
-    "crates/watch",
    "crates/web_search",
    "crates/web_search_providers",
    "crates/welcome",
@@ -374,7 +373,6 @@ util = { path = "crates/util" }
 util_macros = { path = "crates/util_macros" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }
-watch = { path = "crates/watch" }
 web_search = { path = "crates/web_search" }
 web_search_providers = { path = "crates/web_search_providers" }
 welcome = { path = "crates/welcome" }
@@ -405,6 +403,7 @@ async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-trait = "0.1"
 async-tungstenite = "0.29.1"
+async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
 aws-credential-types = { version = "1.2.2", features = [
@@ -433,10 +432,9 @@ convert_case = "0.8.0"
 core-foundation = "0.10.0"
 core-foundation-sys = "0.8.6"
 core-video = { version = "0.4.3", features = ["metal"] }
-cpal = "0.16"
 criterion = { version = "0.5", features = ["html_reports"] }
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "b40956a7f4d1939da67429d941389ee306a3a308" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "68516de327fa1be15214133a0a2e52a12982ce75" }
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
@@ -524,7 +522,6 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
    "rustls-tls-native-roots",
    "socks",
    "stream",
-    "hickory-dns",
 ] }
 rsa = "0.9.6"
 runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
@@ -684,7 +681,9 @@ features = [
    "Win32_UI_WindowsAndMessaging",
 ]

+# TODO livekit https://github.com/RustAudio/cpal/pull/891
 [patch.crates-io]
+cpal = { git = "https://github.com/zed-industries/cpal", rev = "fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50" }
 notify = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }
 notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }

@@ -698,8 +697,6 @@ codegen-units = 16
 [profile.dev.package]
 taffy = { opt-level = 3 }
 cranelift-codegen = { opt-level = 3 }
-cranelift-codegen-meta = { opt-level = 3 }
-cranelift-codegen-shared = { opt-level = 3 }
 resvg = { opt-level = 3 }
 rustybuzz = { opt-level = 3 }
 ttf-parser = { opt-level = 3 }
--- a/assets/icons/circle_help.svg
+++ b/assets/icons/circle_help.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-help-icon lucide-circle-help"><circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/><path d="M12 17h.01"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -35,7 +35,7 @@
      "ctrl-shift-f5": "debugger::Restart",
      "f6": "debugger::Pause",
      "f7": "debugger::StepOver",
-      "ctrl-f11": "debugger::StepInto",
+      "cmd-f11": "debugger::StepInto",
      "shift-f11": "debugger::StepOut",
      "f11": "zed::ToggleFullScreen",
      "ctrl-alt-z": "edit_prediction::RateCompletions",
@@ -59,6 +59,7 @@
      "tab": "editor::Tab",
      "shift-tab": "editor::Backtab",
      "ctrl-k": "editor::CutToEndOfLine",
+      // "ctrl-t": "editor::Transpose",
      "ctrl-k ctrl-q": "editor::Rewrap",
      "ctrl-k q": "editor::Rewrap",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
@@ -99,23 +100,27 @@
      "shift-down": "editor::SelectDown",
      "shift-left": "editor::SelectLeft",
      "shift-right": "editor::SelectRight",
-      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
-      "ctrl-shift-right": "editor::SelectToNextWordEnd",
+      "ctrl-shift-left": "editor::SelectToPreviousWordStart", // cursorWordLeftSelect
+      "ctrl-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
      "ctrl-shift-home": "editor::SelectToBeginning",
      "ctrl-shift-end": "editor::SelectToEnd",
      "ctrl-a": "editor::SelectAll",
      "ctrl-l": "editor::SelectLine",
      "ctrl-shift-i": "editor::Format",
      "alt-shift-o": "editor::OrganizeImports",
+      // "cmd-shift-left": ["editor::SelectToBeginningOfLine", {"stop_at_soft_wraps": true, "stop_at_indent": true }],
+      // "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
+      // "cmd-shift-right": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
+      // "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
+      // "alt-v": ["editor::MovePageUp", { "center_cursor": true }],
      "ctrl-alt-space": "editor::ShowCharacterPalette",
      "ctrl-;": "editor::ToggleLineNumbers",
      "ctrl-'": "editor::ToggleSelectedDiffHunks",
      "ctrl-\"": "editor::ExpandAllDiffHunks",
      "ctrl-i": "editor::ShowSignatureHelp",
      "alt-g b": "git::Blame",
-      "alt-g m": "git::OpenModifiedFiles",
      "menu": "editor::OpenContextMenu",
      "shift-f10": "editor::OpenContextMenu",
      "ctrl-shift-e": "editor::ToggleEditPrediction",
@@ -135,6 +140,7 @@
      "find": "buffer_search::Deploy",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": "buffer_search::DeployReplace",
+      // "cmd-e": ["buffer_search::Deploy", { "focus": false }],
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
      "ctrl-alt-e": "editor::SelectEnclosingSymbol",
@@ -147,7 +153,8 @@
    "context": "Editor && mode == full && edit_prediction",
    "bindings": {
      "alt-]": "editor::NextEditPrediction",
-      "alt-[": "editor::PreviousEditPrediction"
+      "alt-[": "editor::PreviousEditPrediction",
+      "alt-right": "editor::AcceptPartialEditPrediction"
    }
  },
  {
@@ -212,6 +219,7 @@
      "ctrl-enter": "assistant::Assist",
      "ctrl-s": "workspace::Save",
      "save": "workspace::Save",
+      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
@@ -237,7 +245,6 @@
      "ctrl-shift-j": "agent::ToggleNavigationMenu",
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl->": "assistant::QuoteSelection",
      "ctrl-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-enter": "agent::ContinueThread",
@@ -261,8 +268,8 @@
  {
    "context": "AgentPanel && prompt_editor",
    "bindings": {
-      "ctrl-n": "agent::NewTextThread",
-      "ctrl-alt-t": "agent::NewThread"
+      "cmd-n": "agent::NewTextThread",
+      "cmd-alt-t": "agent::NewThread"
    }
  },
  {
@@ -655,16 +662,14 @@
    "bindings": {
      "alt-tab": "editor::AcceptEditPrediction",
      "alt-l": "editor::AcceptEditPrediction",
-      "tab": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
+      "tab": "editor::AcceptEditPrediction"
    }
  },
  {
    "context": "Editor && edit_prediction_conflict",
    "bindings": {
      "alt-tab": "editor::AcceptEditPrediction",
-      "alt-l": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
+      "alt-l": "editor::AcceptEditPrediction"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -139,7 +139,6 @@
      "cmd-'": "editor::ToggleSelectedDiffHunks",
      "cmd-\"": "editor::ExpandAllDiffHunks",
      "cmd-alt-g b": "git::Blame",
-      "cmd-alt-g m": "git::OpenModifiedFiles",
      "cmd-i": "editor::ShowSignatureHelp",
      "f9": "editor::ToggleBreakpoint",
      "shift-f9": "editor::EditLogBreakpoint",
@@ -182,7 +181,8 @@
    "use_key_equivalents": true,
    "bindings": {
      "alt-tab": "editor::NextEditPrediction",
-      "alt-shift-tab": "editor::PreviousEditPrediction"
+      "alt-shift-tab": "editor::PreviousEditPrediction",
+      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
    }
  },
  {
@@ -253,6 +253,7 @@
    "bindings": {
      "cmd-enter": "assistant::Assist",
      "cmd-s": "workspace::Save",
+      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
@@ -279,7 +280,6 @@
      "cmd-shift-j": "agent::ToggleNavigationMenu",
      "cmd-shift-i": "agent::ToggleOptionsMenu",
      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "cmd->": "assistant::QuoteSelection",
      "cmd-alt-e": "agent::RemoveAllContext",
      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-shift-enter": "agent::ContinueThread",
@@ -719,16 +719,14 @@
    "context": "Editor && edit_prediction",
    "bindings": {
      "alt-tab": "editor::AcceptEditPrediction",
-      "tab": "editor::AcceptEditPrediction",
-      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
+      "tab": "editor::AcceptEditPrediction"
    }
  },
  {
    "context": "Editor && edit_prediction_conflict",
    "use_key_equivalents": true,
    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
+      "alt-tab": "editor::AcceptEditPrediction"
    }
  },
  {
--- a/assets/keymaps/initial.json
+++ b/assets/keymaps/initial.json
@@ -13,9 +13,9 @@
    }
  },
  {
-    "context": "Editor && vim_mode == insert && !menu",
+    "context": "Editor",
    "bindings": {
-      // "j k": "vim::SwitchToNormalMode"
+      // "j k": ["workspace::SendKeystrokes", "escape"]
    }
  }
 ]
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -38,7 +38,7 @@
      "ctrl-shift-d": "editor::DuplicateSelection",
      "alt-f3": "editor::SelectAllMatches", // find_all_under
      // "ctrl-f3": "", // find_under (cancels any selections)
-      // "ctrl-alt-shift-g": "" // find_under_prev (cancels any selections)
+      // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections)
      "f9": "editor::SortLinesCaseSensitive",
      "ctrl-f9": "editor::SortLinesCaseInsensitive",
      "f12": "editor::GoToDefinition",
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -28,8 +28,7 @@
    "context": "InlineAssistEditor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-shift-backspace": "editor::Cancel",
-      "cmd-enter": "menu::Confirm"
+      "cmd-shift-backspace": "editor::Cancel"
      // "alt-enter": // Quick Question
      // "cmd-shift-enter": // Full File Context
      // "cmd-shift-k": // Toggle input focus (editor <> inline assist)
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -184,8 +184,6 @@
      "z f": "editor::FoldSelectedRanges",
      "z shift-m": "editor::FoldAll",
      "z shift-r": "editor::UnfoldAll",
-      "z l": "vim::ColumnRight",
-      "z h": "vim::ColumnLeft",
      "shift-z shift-q": ["pane::CloseActiveItem", { "save_intent": "skip" }],
      "shift-z shift-z": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
      // Count support
@@ -397,8 +395,6 @@
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
-      ".": "vim::Repeat",
-      "alt-.": "vim::RepeatFind",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
      "] x": "editor::SelectSmallerSyntaxNode",
@@ -425,7 +421,6 @@

      "x": "editor::SelectLine",
      "shift-x": "editor::SelectLine",
-      "%": "editor::SelectAll",
      // Window mode
      "space w h": "workspace::ActivatePaneLeft",
      "space w l": "workspace::ActivatePaneRight",
@@ -455,8 +450,7 @@
      "ctrl-c": "editor::ToggleComments",
      "d": "vim::HelixDelete",
      "c": "vim::Substitute",
-      "shift-c": "editor::AddSelectionBelow",
-      "alt-shift-c": "editor::AddSelectionAbove"
+      "shift-c": "editor::AddSelectionBelow"
    }
  },
  {
@@ -717,7 +711,7 @@
    }
  },
  {
-    "context": "AgentPanel || GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || DebugPanel",
+    "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || DebugPanel",
    "bindings": {
      // window related commands (ctrl-w X)
      "ctrl-w": null,
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -27,11 +27,11 @@ If you are unsure how to fulfill the user's request, gather more information wit
 If appropriate, use tool calls to explore the current project, which contains the following root directories:

 {{#each worktrees}}
- `{{abs_path}}`
+- `{{root_name}}`
 {{/each}}

 - Bias towards not asking the user for help if you can find the answer yourself.
- When providing paths to tools, the path should always start with the name of a project root directory listed above.
+- When providing paths to tools, the path should always begin with a path that starts with a project root directory listed above.
 - Before you read or edit a file, you must first find the full path. DO NOT ever guess a file path!
 {{# if (has_tool 'grep') }}
 - When looking for symbols in the project, prefer the `grep` tool.
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -101,12 +101,9 @@
    // The second option is decimal.
    "unit": "binary"
  },
-  // Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
-  //
-  // 1. Maps to `Alt` on Linux and Windows and to `Option` on MacOS:
-  //    "alt"
-  // 2. Maps `Control` on Linux and Windows and to `Command` on MacOS:
-  //    "cmd_or_ctrl" (alias: "cmd", "ctrl")
+  // The key to use for adding multiple cursors
+  // Currently "alt" or "cmd_or_ctrl"  (also aliased as
+  // "cmd" and "ctrl") are supported.
  "multi_cursor_modifier": "alt",
  // Whether to enable vim modes and key bindings.
  "vim_mode": false,
@@ -217,8 +214,6 @@
  "show_signature_help_after_edits": false,
  // Whether to show code action button at start of buffer line.
  "inline_code_actions": true,
-  // Whether to allow drag and drop text selection in buffer.
-  "drag_and_drop_selection": true,
  // What to do when go to definition yields no results.
  //
  // 1. Do nothing: `none`
@@ -307,8 +302,6 @@
  //    "all"
  // 4. Draw whitespaces at boundaries only:
  //    "boundary"
-  // 5. Draw whitespaces only after non-whitespace characters:
-  //    "trailing"
  // For a whitespace to be on a boundary, any of the following conditions need to be met:
  // - It is a tab
  // - It is adjacent to an edge (start or end)
@@ -447,9 +440,7 @@
    // Whether to show breakpoints in the gutter.
    "breakpoints": true,
    // Whether to show fold buttons in the gutter.
-    "folds": true,
-    // Minimum number of characters to reserve space for in the gutter.
-    "min_line_number_digits": 4
+    "folds": true
  },
  "indent_guides": {
    // Whether to show indent guides in the editor.
@@ -608,9 +599,7 @@
      // 2. Never show indent guides:
      //    "never"
      "show": "always"
-    },
-    // Whether to hide the root entry when only one folder is open in the window.
-    "hide_root": false
+    }
  },
  "outline_panel": {
    // Whether to show the outline panel button in the status bar
@@ -782,6 +771,7 @@
        "tools": {
          "copy_path": true,
          "create_directory": true,
+          "create_file": true,
          "delete_path": true,
          "diagnostics": true,
          "edit_file": true,
@@ -1044,14 +1034,6 @@
    "button": true,
    // Whether to show warnings or not by default.
    "include_warnings": true,
-    // Settings for using LSP pull diagnostics mechanism in Zed.
-    "lsp_pull_diagnostics": {
-      // Whether to pull for diagnostics or not.
-      "enabled": true,
-      // Minimum time to wait before pulling diagnostics from the language server(s).
-      // 0 turns the debounce off.
-      "debounce_ms": 50
-    },
    // Settings for inline diagnostics
    "inline": {
      // Whether to show diagnostics inline or not
@@ -1475,15 +1457,12 @@
      "language_servers": ["erlang-ls", "!elp", "..."]
    },
    "Git Commit": {
-      "allow_rewrap": "anywhere",
-      "soft_wrap": "editor_width",
-      "preferred_line_length": 72
+      "allow_rewrap": "anywhere"
    },
    "Go": {
      "code_actions_on_format": {
        "source.organizeImports": true
-      },
-      "debuggers": ["Delve"]
+      }
    },
    "GraphQL": {
      "prettier": {
@@ -1548,20 +1527,20 @@
    "Plain Text": {
      "allow_rewrap": "anywhere"
    },
-    "Python": {
-      "debuggers": ["Debugpy"]
-    },
    "Ruby": {
      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."]
    },
-    "Rust": {
-      "debuggers": ["CodeLLDB"]
-    },
    "SCSS": {
      "prettier": {
        "allowed": true
      }
    },
+    "SQL": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["prettier-plugin-sql"]
+      }
+    },
    "Starlark": {
      "language_servers": ["starpls", "!buck2-lsp", "..."]
    },
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -1,4 +1,4 @@
-// Project tasks configuration. See https://zed.dev/docs/tasks for documentation.
+// Static tasks configuration.
 //
 // Example:
 [
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -261,11 +261,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#d2a6ffff",
            "font_style": null,
@@ -321,16 +316,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#a9d94bff",
            "font_style": null,
@@ -457,9 +442,9 @@
        "terminal.foreground": "#5c6166ff",
        "terminal.bright_foreground": "#5c6166ff",
        "terminal.dim_foreground": "#fcfcfcff",
-        "terminal.ansi.black": "#5c6166ff",
-        "terminal.ansi.bright_black": "#3b9ee5ff",
-        "terminal.ansi.dim_black": "#9c9fa2ff",
+        "terminal.ansi.black": "#fcfcfcff",
+        "terminal.ansi.bright_black": "#bcbec0ff",
+        "terminal.ansi.dim_black": "#5c6166ff",
        "terminal.ansi.red": "#ef7271ff",
        "terminal.ansi.bright_red": "#febab6ff",
        "terminal.ansi.dim_red": "#833538ff",
@@ -478,9 +463,9 @@
        "terminal.ansi.cyan": "#4dbf99ff",
        "terminal.ansi.bright_cyan": "#ace0cbff",
        "terminal.ansi.dim_cyan": "#2a5f4aff",
-        "terminal.ansi.white": "#fcfcfcff",
-        "terminal.ansi.bright_white": "#fcfcfcff",
-        "terminal.ansi.dim_white": "#bcbec0ff",
+        "terminal.ansi.white": "#5c6166ff",
+        "terminal.ansi.bright_white": "#5c6166ff",
+        "terminal.ansi.dim_white": "#9c9fa2ff",
        "link_text.hover": "#3b9ee5ff",
        "conflict": "#f1ad49ff",
        "conflict.background": "#ffeedaff",
@@ -647,11 +632,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#a37accff",
            "font_style": null,
@@ -707,16 +687,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#86b300ff",
            "font_style": null,
@@ -1033,11 +1003,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#dfbfffff",
            "font_style": null,
@@ -1093,16 +1058,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#d4fe7fff",
            "font_style": null,
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -270,11 +270,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#d3869bff",
            "font_style": null,
@@ -330,16 +325,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#b8bb25ff",
            "font_style": null,
@@ -670,11 +655,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#d3869bff",
            "font_style": null,
@@ -730,16 +710,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#b8bb25ff",
            "font_style": null,
@@ -1070,11 +1040,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#d3869bff",
            "font_style": null,
@@ -1130,16 +1095,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#b8bb25ff",
            "font_style": null,
@@ -1272,9 +1227,9 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#fbf1c7ff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#0b6678ff",
-        "terminal.ansi.dim_black": "#5f5650ff",
+        "terminal.ansi.black": "#fbf1c7ff",
+        "terminal.ansi.bright_black": "#b0a189ff",
+        "terminal.ansi.dim_black": "#282828ff",
        "terminal.ansi.red": "#9d0308ff",
        "terminal.ansi.bright_red": "#db8b7aff",
        "terminal.ansi.dim_red": "#4e1207ff",
@@ -1293,9 +1248,9 @@
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#b0a189ff",
+        "terminal.ansi.white": "#282828ff",
+        "terminal.ansi.bright_white": "#282828ff",
+        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
@@ -1470,11 +1425,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#8f3e71ff",
            "font_style": null,
@@ -1530,16 +1480,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#79740eff",
            "font_style": null,
@@ -1672,9 +1612,9 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#f9f5d7ff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#f9f5d7ff",
+        "terminal.ansi.black": "#f9f5d7ff",
+        "terminal.ansi.bright_black": "#b0a189ff",
+        "terminal.ansi.dim_black": "#282828ff",
        "terminal.ansi.red": "#9d0308ff",
        "terminal.ansi.bright_red": "#db8b7aff",
        "terminal.ansi.dim_red": "#4e1207ff",
@@ -1693,9 +1633,9 @@
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#f9f5d7ff",
-        "terminal.ansi.bright_white": "#f9f5d7ff",
-        "terminal.ansi.dim_white": "#b0a189ff",
+        "terminal.ansi.white": "#282828ff",
+        "terminal.ansi.bright_white": "#282828ff",
+        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
@@ -1870,11 +1810,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#8f3e71ff",
            "font_style": null,
@@ -1930,16 +1865,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#79740eff",
            "font_style": null,
@@ -2072,9 +1997,9 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#f2e5bcff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#f2e5bcff",
+        "terminal.ansi.black": "#f2e5bcff",
+        "terminal.ansi.bright_black": "#b0a189ff",
+        "terminal.ansi.dim_black": "#282828ff",
        "terminal.ansi.red": "#9d0308ff",
        "terminal.ansi.bright_red": "#db8b7aff",
        "terminal.ansi.dim_red": "#4e1207ff",
@@ -2093,9 +2018,9 @@
        "terminal.ansi.cyan": "#437b59ff",
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#f2e5bcff",
-        "terminal.ansi.bright_white": "#f2e5bcff",
-        "terminal.ansi.dim_white": "#b0a189ff",
+        "terminal.ansi.white": "#282828ff",
+        "terminal.ansi.bright_white": "#282828ff",
+        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
@@ -2270,11 +2195,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#8f3e71ff",
            "font_style": null,
@@ -2330,16 +2250,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#79740eff",
            "font_style": null,
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -99,8 +99,6 @@
        "version_control.added": "#27a657ff",
        "version_control.modified": "#d3b020ff",
        "version_control.deleted": "#e06c76ff",
-        "version_control.conflict_marker.ours": "#a1c1811a",
-        "version_control.conflict_marker.theirs": "#74ade81a",
        "conflict": "#dec184ff",
        "conflict.background": "#dec1841a",
        "conflict.border": "#5d4c2fff",
@@ -266,11 +264,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#bf956aff",
            "font_style": null,
@@ -326,16 +319,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#dfc184ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#a1c181ff",
            "font_style": null,
@@ -467,9 +450,9 @@
        "terminal.foreground": "#242529ff",
        "terminal.bright_foreground": "#242529ff",
        "terminal.dim_foreground": "#fafafaff",
-        "terminal.ansi.black": "#242529ff",
-        "terminal.ansi.bright_black": "#242529ff",
-        "terminal.ansi.dim_black": "#97979aff",
+        "terminal.ansi.black": "#fafafaff",
+        "terminal.ansi.bright_black": "#aaaaaaff",
+        "terminal.ansi.dim_black": "#242529ff",
        "terminal.ansi.red": "#d36151ff",
        "terminal.ansi.bright_red": "#f0b0a4ff",
        "terminal.ansi.dim_red": "#6f312aff",
@@ -488,9 +471,9 @@
        "terminal.ansi.cyan": "#3a82b7ff",
        "terminal.ansi.bright_cyan": "#a3bedaff",
        "terminal.ansi.dim_cyan": "#254058ff",
-        "terminal.ansi.white": "#fafafaff",
-        "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#aaaaaaff",
+        "terminal.ansi.white": "#242529ff",
+        "terminal.ansi.bright_white": "#242529ff",
+        "terminal.ansi.dim_white": "#97979aff",
        "link_text.hover": "#5c78e2ff",
        "version_control.added": "#27a657ff",
        "version_control.modified": "#d3b020ff",
@@ -660,11 +643,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "namespace": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "number": {
            "color": "#ad6e25ff",
            "font_style": null,
@@ -720,16 +698,6 @@
            "font_style": null,
            "font_weight": null
          },
-          "selector": {
-            "color": "#669f59ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
          "string": {
            "color": "#649f57ff",
            "font_style": null,
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -7,10 +7,7 @@ use gpui::{
    InteractiveElement as _, ParentElement as _, Render, SharedString, StatefulInteractiveElement,
    Styled, Transformation, Window, actions, percentage,
 };
-use language::{
-    BinaryStatus, LanguageRegistry, LanguageServerId, LanguageServerName,
-    LanguageServerStatusUpdate, ServerHealth,
-};
+use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
 use project::{
    EnvironmentErrorMessage, LanguageServerProgress, LspStoreEvent, Project,
    ProjectEnvironmentEvent,
@@ -19,7 +16,6 @@ use project::{
 use smallvec::SmallVec;
 use std::{
    cmp::Reverse,
-    collections::HashSet,
    fmt::Write,
    path::Path,
    sync::Arc,
@@ -34,9 +30,9 @@ const GIT_OPERATION_DELAY: Duration = Duration::from_millis(0);
 actions!(activity_indicator, [ShowErrorMessage]);

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

@@ -49,8 +45,8 @@ pub struct ActivityIndicator {

 #[derive(Debug)]
 struct ServerStatus {
-    name: LanguageServerName,
-    status: LanguageServerStatusUpdate,
+    name: SharedString,
+    status: BinaryStatus,
 }

 struct PendingWork<'a> {
@@ -149,19 +145,19 @@ impl ActivityIndicator {
        });

        cx.subscribe_in(&this, window, move |_, _, event, window, cx| match event {
-            Event::ShowStatus {
-                server_name,
-                status,
-            } => {
+            Event::ShowError { server_name, error } => {
                let create_buffer = project.update(cx, |project, cx| project.create_buffer(cx));
                let project = project.clone();
-                let status = status.clone();
+                let error = error.clone();
                let server_name = server_name.clone();
                cx.spawn_in(window, async move |workspace, cx| {
                    let buffer = create_buffer.await?;
                    buffer.update(cx, |buffer, cx| {
                        buffer.edit(
-                            [(0..0, format!("Language server {server_name}:\n\n{status}"))],
+                            [(
+                                0..0,
+                                format!("Language server error: {}\n\n{}", server_name, error),
+                            )],
                            None,
                            cx,
                        );
@@ -170,10 +166,7 @@ impl ActivityIndicator {
                    workspace.update_in(cx, |workspace, window, cx| {
                        workspace.add_item_to_active_pane(
                            Box::new(cx.new(|cx| {
-                                let mut editor =
-                                    Editor::for_buffer(buffer, Some(project.clone()), window, cx);
-                                editor.set_read_only(true);
-                                editor
+                                Editor::for_buffer(buffer, Some(project.clone()), window, cx)
                            })),
                            None,
                            true,
@@ -192,34 +185,19 @@ impl ActivityIndicator {
    }

    fn show_error_message(&mut self, _: &ShowErrorMessage, _: &mut Window, cx: &mut Context<Self>) {
-        let mut status_message_shown = false;
-        self.statuses.retain(|status| match &status.status {
-            LanguageServerStatusUpdate::Binary(BinaryStatus::Failed { error })
-                if !status_message_shown =>
-            {
-                cx.emit(Event::ShowStatus {
+        self.statuses.retain(|status| {
+            if let BinaryStatus::Failed { error } = &status.status {
+                cx.emit(Event::ShowError {
                    server_name: status.name.clone(),
-                    status: SharedString::from(error),
+                    error: error.clone(),
                });
-                status_message_shown = true;
                false
+            } else {
+                true
            }
-            LanguageServerStatusUpdate::Health(
-                ServerHealth::Error | ServerHealth::Warning,
-                status_string,
-            ) if !status_message_shown => match status_string {
-                Some(error) => {
-                    cx.emit(Event::ShowStatus {
-                        server_name: status.name.clone(),
-                        status: error.clone(),
-                    });
-                    status_message_shown = true;
-                    false
-                }
-                None => false,
-            },
-            _ => true,
        });
+
+        cx.notify();
    }

    fn dismiss_error_message(
@@ -289,52 +267,48 @@ impl ActivityIndicator {
            });
        }
        // Show any language server has pending activity.
+        let mut pending_work = self.pending_language_server_work(cx);
+        if let Some(PendingWork {
+            progress_token,
+            progress,
+            ..
+        }) = pending_work.next()
        {
-            let mut pending_work = self.pending_language_server_work(cx);
-            if let Some(PendingWork {
-                progress_token,
-                progress,
-                ..
-            }) = pending_work.next()
-            {
-                let mut message = progress
-                    .title
-                    .as_deref()
-                    .unwrap_or(progress_token)
-                    .to_string();
+            let mut message = progress
+                .title
+                .as_deref()
+                .unwrap_or(progress_token)
+                .to_string();

-                if let Some(percentage) = progress.percentage {
-                    write!(&mut message, " ({}%)", percentage).unwrap();
-                }
-
-                if let Some(progress_message) = progress.message.as_ref() {
-                    message.push_str(": ");
-                    message.push_str(progress_message);
-                }
-
-                let additional_work_count = pending_work.count();
-                if additional_work_count > 0 {
-                    write!(&mut message, " + {} more", additional_work_count).unwrap();
-                }
-
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_animation(
-                                "arrow-circle",
-                                Animation::new(Duration::from_secs(2)).repeat(),
-                                |icon, delta| {
-                                    icon.transform(Transformation::rotate(percentage(delta)))
-                                },
-                            )
-                            .into_any_element(),
-                    ),
-                    message,
-                    on_click: Some(Arc::new(Self::toggle_language_server_work_context_menu)),
-                    tooltip_message: None,
-                });
+            if let Some(percentage) = progress.percentage {
+                write!(&mut message, " ({}%)", percentage).unwrap();
            }
+
+            if let Some(progress_message) = progress.message.as_ref() {
+                message.push_str(": ");
+                message.push_str(progress_message);
+            }
+
+            let additional_work_count = pending_work.count();
+            if additional_work_count > 0 {
+                write!(&mut message, " + {} more", additional_work_count).unwrap();
+            }
+
+            return Some(Content {
+                icon: Some(
+                    Icon::new(IconName::ArrowCircle)
+                        .size(IconSize::Small)
+                        .with_animation(
+                            "arrow-circle",
+                            Animation::new(Duration::from_secs(2)).repeat(),
+                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                        )
+                        .into_any_element(),
+                ),
+                message,
+                on_click: Some(Arc::new(Self::toggle_language_server_work_context_menu)),
+                tooltip_message: None,
+            });
        }

        if let Some(session) = self
@@ -395,38 +369,14 @@ impl ActivityIndicator {
        let mut downloading = SmallVec::<[_; 3]>::new();
        let mut checking_for_update = SmallVec::<[_; 3]>::new();
        let mut failed = SmallVec::<[_; 3]>::new();
-        let mut health_messages = SmallVec::<[_; 3]>::new();
-        let mut servers_to_clear_statuses = HashSet::<LanguageServerName>::default();
        for status in &self.statuses {
-            match &status.status {
-                LanguageServerStatusUpdate::Binary(BinaryStatus::CheckingForUpdate) => {
-                    checking_for_update.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Downloading) => {
-                    downloading.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Failed { .. }) => {
-                    failed.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::None) => {}
-                LanguageServerStatusUpdate::Health(health, server_status) => match server_status {
-                    Some(server_status) => {
-                        health_messages.push((status.name.clone(), *health, server_status.clone()));
-                    }
-                    None => {
-                        servers_to_clear_statuses.insert(status.name.clone());
-                    }
-                },
+            match status.status {
+                BinaryStatus::CheckingForUpdate => checking_for_update.push(status.name.clone()),
+                BinaryStatus::Downloading => downloading.push(status.name.clone()),
+                BinaryStatus::Failed { .. } => failed.push(status.name.clone()),
+                BinaryStatus::None => {}
            }
        }
-        self.statuses
-            .retain(|status| !servers_to_clear_statuses.contains(&status.name));
-
-        health_messages.sort_by_key(|(_, health, _)| match health {
-            ServerHealth::Error => 2,
-            ServerHealth::Warning => 1,
-            ServerHealth::Ok => 0,
-        });

        if !downloading.is_empty() {
            return Some(Content {
@@ -507,7 +457,7 @@ impl ActivityIndicator {
                        }),
                ),
                on_click: Some(Arc::new(|this, window, cx| {
-                    this.show_error_message(&ShowErrorMessage, window, cx)
+                    this.show_error_message(&Default::default(), window, cx)
                })),
                tooltip_message: None,
            });
@@ -521,7 +471,7 @@ impl ActivityIndicator {
                        .size(IconSize::Small)
                        .into_any_element(),
                ),
-                message: format!("Formatting failed: {failure}. Click to see logs."),
+                message: format!("Formatting failed: {}. Click to see logs.", failure),
                on_click: Some(Arc::new(|indicator, window, cx| {
                    indicator.project.update(cx, |project, cx| {
                        project.reset_last_formatting_failure(cx);
@@ -532,56 +482,6 @@ impl ActivityIndicator {
            });
        }

-        // Show any health messages for the language servers
-        if let Some((server_name, health, message)) = health_messages.pop() {
-            let health_str = match health {
-                ServerHealth::Ok => format!("({server_name}) "),
-                ServerHealth::Warning => format!("({server_name}) Warning: "),
-                ServerHealth::Error => format!("({server_name}) Error: "),
-            };
-            let single_line_message = message
-                .lines()
-                .filter_map(|line| {
-                    let line = line.trim();
-                    if line.is_empty() { None } else { Some(line) }
-                })
-                .collect::<Vec<_>>()
-                .join(" ");
-            let mut altered_message = single_line_message != message;
-            let truncated_message = truncate_and_trailoff(
-                &single_line_message,
-                MAX_MESSAGE_LEN.saturating_sub(health_str.len()),
-            );
-            altered_message |= truncated_message != single_line_message;
-            let final_message = format!("{health_str}{truncated_message}");
-
-            let tooltip_message = if altered_message {
-                Some(format!("{health_str}{message}"))
-            } else {
-                None
-            };
-
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: final_message,
-                tooltip_message,
-                on_click: Some(Arc::new(move |activity_indicator, window, cx| {
-                    if altered_message {
-                        activity_indicator.show_error_message(&ShowErrorMessage, window, cx)
-                    } else {
-                        activity_indicator
-                            .statuses
-                            .retain(|status| status.name != server_name);
-                        cx.notify();
-                    }
-                })),
-            });
-        }
-
        // Show any application auto-update info.
        if let Some(updater) = &self.auto_updater {
            return match &updater.read(cx).status() {
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -25,6 +25,7 @@ assistant_context_editor.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
+async-watch.workspace = true
 audio.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
@@ -94,7 +95,6 @@ ui_input.workspace = true
 urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
-watch.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
@@ -102,13 +102,11 @@ zed_llm_client.workspace = true
 zstd.workspace = true

 [dev-dependencies]
-assistant_tools.workspace = true
 buffer_diff = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }
 indoc.workspace = true
 language = { workspace = true, "features" = ["test-support"] }
 language_model = { workspace = true, "features" = ["test-support"] }
-pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1144,10 +1144,6 @@ impl ActiveThread {
                    cx,
                );
            }
-            ThreadEvent::ProfileChanged => {
-                self.save_thread(cx);
-                cx.notify();
-            }
        }
    }

@@ -1605,7 +1601,6 @@ impl ActiveThread {

                        this.thread.update(cx, |thread, cx| {
                            thread.advance_prompt_id();
-                            thread.cancel_last_completion(Some(window.window_handle()), cx);
                            thread.send_to_model(
                                model.model,
                                CompletionIntent::UserPrompt,
@@ -1681,10 +1676,7 @@ impl ActiveThread {

        let editor = cx.new(|cx| {
            let mut editor = Editor::new(
-                editor::EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: 4,
-                },
+                editor::EditorMode::AutoHeight { max_lines: 4 },
                buffer,
                None,
                window,
@@ -1792,31 +1784,12 @@ impl ActiveThread {

    fn render_message(&self, ix: usize, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
        let message_id = self.messages[ix];
-        let workspace = self.workspace.clone();
-        let thread = self.thread.read(cx);
-
-        let is_first_message = ix == 0;
-        let is_last_message = ix == self.messages.len() - 1;
-
-        let Some(message) = thread.message(message_id) else {
+        let Some(message) = self.thread.read(cx).message(message_id) else {
            return Empty.into_any();
        };

-        let is_generating = thread.is_generating();
-        let is_generating_stale = thread.is_generation_stale().unwrap_or(false);
-
-        let loading_dots = (is_generating && is_last_message).then(|| {
-            h_flex()
-                .h_8()
-                .my_3()
-                .mx_5()
-                .when(is_generating_stale || message.is_hidden, |this| {
-                    this.child(AnimatedLabel::new("").size(LabelSize::Small))
-                })
-        });
-
        if message.is_hidden {
-            return div().children(loading_dots).into_any();
+            return Empty.into_any();
        }

        let message_creases = message.creases.clone();
@@ -1825,6 +1798,9 @@ impl ActiveThread {
            return Empty.into_any();
        };

+        let workspace = self.workspace.clone();
+        let thread = self.thread.read(cx);
+
        // 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);
@@ -1835,6 +1811,14 @@ impl ActiveThread {

        let tool_uses = thread.tool_uses_for_message(message_id, cx);
        let has_tool_uses = !tool_uses.is_empty();
+        let is_generating = thread.is_generating();
+        let is_generating_stale = thread.is_generation_stale().unwrap_or(false);
+
+        let is_first_message = ix == 0;
+        let is_last_message = ix == self.messages.len() - 1;
+
+        let loading_dots = (is_generating_stale && is_last_message)
+            .then(|| AnimatedLabel::new("").size(LabelSize::Small));

        let editing_message_state = self
            .editing_message
@@ -2250,7 +2234,17 @@ impl ActiveThread {
                parent.child(self.render_rules_item(cx))
            })
            .child(styled_message)
-            .children(loading_dots)
+            .when(is_generating && is_last_message, |this| {
+                this.child(
+                    h_flex()
+                        .h_8()
+                        .mt_2()
+                        .mb_4()
+                        .ml_4()
+                        .py_1p5()
+                        .when_some(loading_dots, |this, loading_dots| this.child(loading_dots)),
+                )
+            })
            .when(show_feedback, move |parent| {
                parent.child(feedback_items).when_some(
                    self.open_feedback_editors.get(&message_id),
@@ -3710,7 +3704,7 @@ mod tests {
    use util::path;
    use workspace::CollaboratorId;

-    use crate::{ContextLoadResult, thread::MessageSegment, thread_store};
+    use crate::{ContextLoadResult, thread_store};

    use super::*;

@@ -3844,114 +3838,6 @@ mod tests {
        });
    }

-    #[gpui::test]
-    async fn test_editing_message_cancels_previous_completion(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: model.clone(),
-                    }),
-                    cx,
-                );
-            });
-        });
-
-        // Track thread events to verify cancellation
-        let cancellation_events = Arc::new(std::sync::Mutex::new(Vec::new()));
-        let new_request_events = Arc::new(std::sync::Mutex::new(Vec::new()));
-
-        let _subscription = cx.update(|_, cx| {
-            let cancellation_events = cancellation_events.clone();
-            let new_request_events = new_request_events.clone();
-            cx.subscribe(
-                &thread,
-                move |_thread, event: &ThreadEvent, _cx| match event {
-                    ThreadEvent::CompletionCanceled => {
-                        cancellation_events.lock().unwrap().push(());
-                    }
-                    ThreadEvent::NewRequest => {
-                        new_request_events.lock().unwrap().push(());
-                    }
-                    _ => {}
-                },
-            )
-        });
-
-        // Insert a user message and start streaming a response
-        let message = thread.update(cx, |thread, cx| {
-            let message_id = thread.insert_user_message(
-                "Hello, how are you?",
-                ContextLoadResult::default(),
-                None,
-                vec![],
-                cx,
-            );
-            thread.advance_prompt_id();
-            thread.send_to_model(
-                model.clone(),
-                CompletionIntent::UserPrompt,
-                cx.active_window(),
-                cx,
-            );
-            thread.message(message_id).cloned().unwrap()
-        });
-
-        cx.run_until_parked();
-
-        // Verify that a completion is in progress
-        assert!(cx.read(|cx| thread.read(cx).is_generating()));
-        assert_eq!(new_request_events.lock().unwrap().len(), 1);
-
-        // Edit the message while the completion is still running
-        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.set_text("What is the weather like?", window, cx);
-            });
-            active_thread.confirm_editing_message(&Default::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Verify that the previous completion was cancelled
-        assert_eq!(cancellation_events.lock().unwrap().len(), 1);
-
-        // Verify that a new request was started after cancellation
-        assert_eq!(new_request_events.lock().unwrap().len(), 2);
-
-        // Verify that the edited message contains the new text
-        let edited_message =
-            thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
-        match &edited_message.segments[0] {
-            MessageSegment::Text(text) => {
-                assert_eq!(text, "What is the weather like?");
-            }
-            _ => panic!("Expected text segment"),
-        }
-    }
-
    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
@@ -3,7 +3,6 @@ mod agent_configuration;
 mod agent_diff;
 mod agent_model_selector;
 mod agent_panel;
-mod agent_profile;
 mod buffer_codegen;
 mod context;
 mod context_picker;
@@ -162,7 +161,7 @@ pub fn init(
    assistant_slash_command::init(cx);
    thread_store::init(cx);
    agent_panel::init(cx);
-    context_server_configuration::init(language_registry, fs.clone(), cx);
+    context_server_configuration::init(language_registry, cx);

    register_slash_commands(cx);
    inline_assistant::init(
--- a/crates/agent/src/agent_configuration.rs
+++ b/crates/agent/src/agent_configuration.rs
@@ -12,7 +12,7 @@ use context_server::ContextServerId;
 use fs::Fs;
 use gpui::{
    Action, Animation, AnimationExt as _, AnyView, App, Entity, EventEmitter, FocusHandle,
-    Focusable, ScrollHandle, Subscription, Transformation, percentage,
+    Focusable, ScrollHandle, Subscription, pulsating_between,
 };
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
@@ -475,6 +475,7 @@ impl AgentConfiguration {
            .get(&context_server_id)
            .copied()
            .unwrap_or_default();
+
        let tools = tools_by_source
            .get(&ToolSource::ContextServer {
                id: context_server_id.0.clone().into(),
@@ -483,23 +484,25 @@ impl AgentConfiguration {
        let tool_count = tools.len();

        let border_color = cx.theme().colors().border.opacity(0.6);
+        let success_color = Color::Success.color(cx);

        let (status_indicator, tooltip_text) = match server_status {
            ContextServerStatus::Starting => (
-                Icon::new(IconName::LoadCircle)
-                    .size(IconSize::XSmall)
-                    .color(Color::Accent)
+                Indicator::dot()
+                    .color(Color::Success)
                    .with_animation(
                        SharedString::from(format!("{}-starting", context_server_id.0.clone(),)),
-                        Animation::new(Duration::from_secs(3)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
+                        Animation::new(Duration::from_secs(2))
+                            .repeat()
+                            .with_easing(pulsating_between(0.4, 1.)),
+                        move |this, delta| this.color(success_color.alpha(delta).into()),
                    )
                    .into_any_element(),
                "Server is starting.",
            ),
            ContextServerStatus::Running => (
                Indicator::dot().color(Color::Success).into_any_element(),
-                "Server is active.",
+                "Server is running.",
            ),
            ContextServerStatus::Error(_) => (
                Indicator::dot().color(Color::Error).into_any_element(),
@@ -523,11 +526,12 @@ impl AgentConfiguration {
                    .p_1()
                    .justify_between()
                    .when(
-                        error.is_some() || are_tools_expanded && tool_count >= 1,
+                        error.is_some() || are_tools_expanded && tool_count > 1,
                        |element| element.border_b_1().border_color(border_color),
                    )
                    .child(
                        h_flex()
+                            .gap_1p5()
                            .child(
                                Disclosure::new(
                                    "tool-list-disclosure",
@@ -547,16 +551,12 @@ impl AgentConfiguration {
                                })),
                            )
                            .child(
-                                h_flex()
-                                    .id(SharedString::from(format!("tooltip-{}", item_id)))
-                                    .h_full()
-                                    .w_3()
-                                    .mx_1()
-                                    .justify_center()
+                                div()
+                                    .id(item_id.clone())
                                    .tooltip(Tooltip::text(tooltip_text))
                                    .child(status_indicator),
                            )
-                            .child(Label::new(item_id).ml_0p5().mr_1p5())
+                            .child(Label::new(context_server_id.0.clone()).ml_0p5())
                            .when(is_running, |this| {
                                this.child(
                                    Label::new(if tool_count == 1 {
--- a/crates/agent/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent/src/agent_configuration/configure_context_server_modal.rs
@@ -89,7 +89,7 @@ impl ConfigureContextServerModal {
                        }),
                        settings_validator,
                        settings_editor: cx.new(|cx| {
-                            let mut editor = Editor::auto_height(1, 16, window, cx);
+                            let mut editor = Editor::auto_height(16, window, cx);
                            editor.set_text(config.default_settings.trim(), window, cx);
                            editor.set_show_gutter(false, cx);
                            editor.set_soft_wrap_mode(
--- a/crates/agent/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/agent_configuration/manage_profiles_modal.rs
@@ -2,21 +2,25 @@ mod profile_modal_header;

 use std::sync::Arc;

-use agent_settings::{AgentProfileId, AgentSettings, builtin_profiles};
+use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, builtin_profiles};
 use assistant_tool::ToolWorkingSet;
+use convert_case::{Case, Casing as _};
 use editor::Editor;
 use fs::Fs;
-use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, prelude::*};
-use settings::Settings as _;
+use gpui::{
+    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, WeakEntity,
+    prelude::*,
+};
+use settings::{Settings as _, update_settings_file};
 use ui::{
    KeyBinding, ListItem, ListItemSpacing, ListSeparator, Navigable, NavigableEntry, prelude::*,
 };
+use util::ResultExt as _;
 use workspace::{ModalView, Workspace};

 use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
 use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
-use crate::agent_profile::AgentProfile;
-use crate::{AgentPanel, ManageProfiles};
+use crate::{AgentPanel, ManageProfiles, ThreadStore};

 use super::tool_picker::ToolPickerMode;

@@ -99,6 +103,7 @@ pub struct NewProfileMode {
 pub struct ManageProfilesModal {
    fs: Arc<dyn Fs>,
    tools: Entity<ToolWorkingSet>,
+    thread_store: WeakEntity<ThreadStore>,
    focus_handle: FocusHandle,
    mode: Mode,
 }
@@ -114,8 +119,9 @@ impl ManageProfilesModal {
                let fs = workspace.app_state().fs.clone();
                let thread_store = panel.read(cx).thread_store();
                let tools = thread_store.read(cx).tools();
+                let thread_store = thread_store.downgrade();
                workspace.toggle_modal(window, cx, |window, cx| {
-                    let mut this = Self::new(fs, tools, window, cx);
+                    let mut this = Self::new(fs, tools, thread_store, window, cx);

                    if let Some(profile_id) = action.customize_tools.clone() {
                        this.configure_builtin_tools(profile_id, window, cx);
@@ -130,6 +136,7 @@ impl ManageProfilesModal {
    pub fn new(
        fs: Arc<dyn Fs>,
        tools: Entity<ToolWorkingSet>,
+        thread_store: WeakEntity<ThreadStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -138,6 +145,7 @@ impl ManageProfilesModal {
        Self {
            fs,
            tools,
+            thread_store,
            focus_handle,
            mode: Mode::choose_profile(window, cx),
        }
@@ -198,6 +206,7 @@ impl ManageProfilesModal {
                ToolPickerMode::McpTools,
                self.fs.clone(),
                self.tools.clone(),
+                self.thread_store.clone(),
                profile_id.clone(),
                profile,
                cx,
@@ -235,6 +244,7 @@ impl ManageProfilesModal {
                ToolPickerMode::BuiltinTools,
                self.fs.clone(),
                self.tools.clone(),
+                self.thread_store.clone(),
                profile_id.clone(),
                profile,
                cx,
@@ -260,10 +270,32 @@ impl ManageProfilesModal {
        match &self.mode {
            Mode::ChooseProfile { .. } => {}
            Mode::NewProfile(mode) => {
-                let name = mode.name_editor.read(cx).text(cx);
+                let settings = AgentSettings::get_global(cx);

-                let profile_id =
-                    AgentProfile::create(name, mode.base_profile_id.clone(), self.fs.clone(), cx);
+                let base_profile = mode
+                    .base_profile_id
+                    .as_ref()
+                    .and_then(|profile_id| settings.profiles.get(profile_id).cloned());
+
+                let name = mode.name_editor.read(cx).text(cx);
+                let profile_id = AgentProfileId(name.to_case(Case::Kebab).into());
+
+                let profile = AgentProfile {
+                    name: name.into(),
+                    tools: base_profile
+                        .as_ref()
+                        .map(|profile| profile.tools.clone())
+                        .unwrap_or_default(),
+                    enable_all_context_servers: base_profile
+                        .as_ref()
+                        .map(|profile| profile.enable_all_context_servers)
+                        .unwrap_or_default(),
+                    context_servers: base_profile
+                        .map(|profile| profile.context_servers)
+                        .unwrap_or_default(),
+                };
+
+                self.create_profile(profile_id.clone(), profile, cx);
                self.view_profile(profile_id, window, cx);
            }
            Mode::ViewProfile(_) => {}
@@ -293,6 +325,19 @@ impl ManageProfilesModal {
            }
        }
    }
+
+    fn create_profile(
+        &self,
+        profile_id: AgentProfileId,
+        profile: AgentProfile,
+        cx: &mut Context<Self>,
+    ) {
+        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
+            move |settings, _cx| {
+                settings.create_profile(profile_id, profile).log_err();
+            }
+        });
+    }
 }

 impl ModalView for ManageProfilesModal {}
@@ -475,13 +520,14 @@ impl ManageProfilesModal {
    ) -> impl IntoElement {
        let settings = AgentSettings::get_global(cx);

+        let profile_id = &settings.default_profile;
        let profile_name = settings
            .profiles
            .get(&mode.profile_id)
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let icon = match mode.profile_id.as_str() {
+        let icon = match profile_id.as_str() {
            "write" => IconName::Pencil,
            "ask" => IconName::MessageBubbles,
            _ => IconName::UserRoundPen,
--- a/crates/agent/src/agent_configuration/tool_picker.rs
+++ b/crates/agent/src/agent_configuration/tool_picker.rs
@@ -1,17 +1,19 @@
 use std::{collections::BTreeMap, sync::Arc};

 use agent_settings::{
-    AgentProfileContent, AgentProfileId, AgentProfileSettings, AgentSettings, AgentSettingsContent,
+    AgentProfile, AgentProfileContent, AgentProfileId, AgentSettings, AgentSettingsContent,
    ContextServerPresetContent,
 };
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use fs::Fs;
 use gpui::{App, Context, DismissEvent, Entity, EventEmitter, Focusable, Task, WeakEntity, Window};
 use picker::{Picker, PickerDelegate};
-use settings::update_settings_file;
+use settings::{Settings as _, update_settings_file};
 use ui::{ListItem, ListItemSpacing, prelude::*};
 use util::ResultExt as _;

+use crate::ThreadStore;
+
 pub struct ToolPicker {
    picker: Entity<Picker<ToolPickerDelegate>>,
 }
@@ -69,10 +71,11 @@ pub enum PickerItem {

 pub struct ToolPickerDelegate {
    tool_picker: WeakEntity<ToolPicker>,
+    thread_store: WeakEntity<ThreadStore>,
    fs: Arc<dyn Fs>,
    items: Arc<Vec<PickerItem>>,
    profile_id: AgentProfileId,
-    profile_settings: AgentProfileSettings,
+    profile: AgentProfile,
    filtered_items: Vec<PickerItem>,
    selected_index: usize,
    mode: ToolPickerMode,
@@ -83,18 +86,20 @@ impl ToolPickerDelegate {
        mode: ToolPickerMode,
        fs: Arc<dyn Fs>,
        tool_set: Entity<ToolWorkingSet>,
+        thread_store: WeakEntity<ThreadStore>,
        profile_id: AgentProfileId,
-        profile_settings: AgentProfileSettings,
+        profile: AgentProfile,
        cx: &mut Context<ToolPicker>,
    ) -> Self {
        let items = Arc::new(Self::resolve_items(mode, &tool_set, cx));

        Self {
            tool_picker: cx.entity().downgrade(),
+            thread_store,
            fs,
            items,
            profile_id,
-            profile_settings,
+            profile,
            filtered_items: Vec::new(),
            selected_index: 0,
            mode,
@@ -244,31 +249,28 @@ impl PickerDelegate for ToolPickerDelegate {
        };

        let is_currently_enabled = if let Some(server_id) = server_id.clone() {
-            let preset = self
-                .profile_settings
-                .context_servers
-                .entry(server_id)
-                .or_default();
+            let preset = self.profile.context_servers.entry(server_id).or_default();
            let is_enabled = *preset.tools.entry(tool_name.clone()).or_default();
            *preset.tools.entry(tool_name.clone()).or_default() = !is_enabled;
            is_enabled
        } else {
-            let is_enabled = *self
-                .profile_settings
-                .tools
-                .entry(tool_name.clone())
-                .or_default();
-            *self
-                .profile_settings
-                .tools
-                .entry(tool_name.clone())
-                .or_default() = !is_enabled;
+            let is_enabled = *self.profile.tools.entry(tool_name.clone()).or_default();
+            *self.profile.tools.entry(tool_name.clone()).or_default() = !is_enabled;
            is_enabled
        };

+        let active_profile_id = &AgentSettings::get_global(cx).default_profile;
+        if active_profile_id == &self.profile_id {
+            self.thread_store
+                .update(cx, |this, cx| {
+                    this.load_profile(self.profile.clone(), cx);
+                })
+                .log_err();
+        }
+
        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
            let profile_id = self.profile_id.clone();
-            let default_profile = self.profile_settings.clone();
+            let default_profile = self.profile.clone();
            let server_id = server_id.clone();
            let tool_name = tool_name.clone();
            move |settings: &mut AgentSettingsContent, _cx| {
@@ -346,18 +348,14 @@ impl PickerDelegate for ToolPickerDelegate {
            ),
            PickerItem::Tool { name, server_id } => {
                let is_enabled = if let Some(server_id) = server_id {
-                    self.profile_settings
+                    self.profile
                        .context_servers
                        .get(server_id.as_ref())
                        .and_then(|preset| preset.tools.get(name))
                        .copied()
-                        .unwrap_or(self.profile_settings.enable_all_context_servers)
+                        .unwrap_or(self.profile.enable_all_context_servers)
                } else {
-                    self.profile_settings
-                        .tools
-                        .get(name)
-                        .copied()
-                        .unwrap_or(false)
+                    self.profile.tools.get(name).copied().unwrap_or(false)
                };

                Some(
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -31,7 +31,7 @@ use util::ResultExt;
 use workspace::{
    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
    Workspace,
-    item::{BreadcrumbText, ItemEvent, SaveOptions, TabContentParams},
+    item::{BreadcrumbText, ItemEvent, TabContentParams},
    searchable::SearchableItemHandle,
 };
 use zed_actions::assistant::ToggleFocus;
@@ -532,12 +532,12 @@ impl Item for AgentDiffPane {

    fn save(
        &mut self,
-        options: SaveOptions,
+        format: bool,
        project: Entity<Project>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
-        self.editor.save(options, project, window, cx)
+        self.editor.save(format, project, window, cx)
    }

    fn save_as(
@@ -1378,8 +1378,7 @@ impl AgentDiff {
            | ThreadEvent::CheckpointChanged
            | ThreadEvent::ToolConfirmationNeeded
            | ThreadEvent::ToolUseLimitReached
-            | ThreadEvent::CancelEditing
-            | ThreadEvent::ProfileChanged => {}
+            | ThreadEvent::CancelEditing => {}
        }
    }

@@ -1513,7 +1512,7 @@ impl AgentDiff {
                    multibuffer.add_diff(diff_handle.clone(), cx);
                });

-                let new_state = if thread.read(cx).is_generating() {
+                let new_state = if thread.read(cx).has_pending_edit_tool_uses() {
                    EditorState::Generating
                } else {
                    EditorState::Reviewing
--- a/crates/agent/src/agent_model_selector.rs
+++ b/crates/agent/src/agent_model_selector.rs
@@ -91,13 +91,12 @@ impl AgentModelSelector {

 impl Render for AgentModelSelector {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let focus_handle = self.focus_handle.clone();
+
        let model = self.selector.read(cx).delegate.active_model(cx);
        let model_name = model
            .map(|model| model.model.name().0)
            .unwrap_or_else(|| SharedString::from("No model selected"));
-
-        let focus_handle = self.focus_handle.clone();
-
        PickerPopoverMenu::new(
            self.selector.clone(),
            Button::new("active-model", model_name)
--- a/crates/agent/src/agent_panel.rs
+++ b/crates/agent/src/agent_panel.rs
@@ -10,9 +10,9 @@ use serde::{Deserialize, Serialize};
 use agent_settings::{AgentDockPosition, AgentSettings, CompletionMode, DefaultView};
 use anyhow::{Result, anyhow};
 use assistant_context_editor::{
-    AgentPanelDelegate, AssistantContext, ContextEditor, ContextEvent, ContextSummary,
-    SlashCommandCompletionProvider, humanize_token_count, make_lsp_adapter_delegate,
-    render_remaining_tokens,
+    AgentPanelDelegate, AssistantContext, ConfigurationError, ContextEditor, ContextEvent,
+    ContextSummary, SlashCommandCompletionProvider, humanize_token_count,
+    make_lsp_adapter_delegate, render_remaining_tokens,
 };
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
@@ -29,8 +29,7 @@ use gpui::{
 };
 use language::LanguageRegistry;
 use language_model::{
-    ConfigurationError, LanguageModelProviderTosView, LanguageModelRegistry, RequestUsage,
-    ZED_CLOUD_PROVIDER_ID,
+    LanguageModelProviderTosView, LanguageModelRegistry, RequestUsage, ZED_CLOUD_PROVIDER_ID,
 };
 use project::{Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
@@ -58,7 +57,7 @@ use zed_llm_client::{CompletionIntent, UsageLimit};
 use crate::active_thread::{self, ActiveThread, ActiveThreadEvent};
 use crate::agent_configuration::{AgentConfiguration, AssistantConfigurationEvent};
 use crate::agent_diff::AgentDiff;
-use crate::history_store::{HistoryEntryId, HistoryStore};
+use crate::history_store::{HistoryStore, RecentEntry};
 use crate::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::thread::{Thread, ThreadError, ThreadId, ThreadSummary, TokenUsageRatio};
 use crate::thread_history::{HistoryEntryElement, ThreadHistory};
@@ -258,7 +257,6 @@ impl ActiveView {

    pub fn prompt_editor(
        context_editor: Entity<ContextEditor>,
-        history_store: Entity<HistoryStore>,
        language_registry: Arc<LanguageRegistry>,
        window: &mut Window,
        cx: &mut App,
@@ -324,19 +322,6 @@ impl ActiveView {
                            editor.set_text(summary, window, cx);
                        })
                    }
-                    ContextEvent::PathChanged { old_path, new_path } => {
-                        history_store.update(cx, |history_store, cx| {
-                            if let Some(old_path) = old_path {
-                                history_store
-                                    .replace_recently_opened_text_thread(old_path, new_path, cx);
-                            } else {
-                                history_store.push_recently_opened_entry(
-                                    HistoryEntryId::Context(new_path.clone()),
-                                    cx,
-                                );
-                            }
-                        });
-                    }
                    _ => {}
                }
            }),
@@ -531,7 +516,8 @@ impl AgentPanel {
            HistoryStore::new(
                thread_store.clone(),
                context_store.clone(),
-                [HistoryEntryId::Thread(thread_id)],
+                [RecentEntry::Thread(thread_id, thread.clone())],
+                window,
                cx,
            )
        });
@@ -558,13 +544,7 @@ impl AgentPanel {
                    editor.insert_default_prompt(window, cx);
                    editor
                });
-                ActiveView::prompt_editor(
-                    context_editor,
-                    history_store.clone(),
-                    language_registry.clone(),
-                    window,
-                    cx,
-                )
+                ActiveView::prompt_editor(context_editor, language_registry.clone(), window, cx)
            }
        };

@@ -601,9 +581,86 @@ impl AgentPanel {
            let panel = weak_panel.clone();
            let assistant_navigation_menu =
                ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
-                    if let Some(panel) = panel.upgrade() {
-                        menu = Self::populate_recently_opened_menu_section(menu, panel, cx);
+                    let recently_opened = panel
+                        .update(cx, |this, cx| {
+                            this.history_store.update(cx, |history_store, cx| {
+                                history_store.recently_opened_entries(cx)
+                            })
+                        })
+                        .unwrap_or_default();
+
+                    if !recently_opened.is_empty() {
+                        menu = menu.header("Recently Opened");
+
+                        for entry in recently_opened.iter() {
+                            if let RecentEntry::Context(context) = entry {
+                                if context.read(cx).path().is_none() {
+                                    log::error!(
+                                        "bug: text thread in recent history list was never saved"
+                                    );
+                                    continue;
+                                }
+                            }
+
+                            let summary = entry.summary(cx);
+
+                            menu = menu.entry_with_end_slot_on_hover(
+                                summary,
+                                None,
+                                {
+                                    let panel = panel.clone();
+                                    let entry = entry.clone();
+                                    move |window, cx| {
+                                        panel
+                                            .update(cx, {
+                                                let entry = entry.clone();
+                                                move |this, cx| match entry {
+                                                    RecentEntry::Thread(_, thread) => {
+                                                        this.open_thread(thread, window, cx)
+                                                    }
+                                                    RecentEntry::Context(context) => {
+                                                        let Some(path) = context.read(cx).path()
+                                                        else {
+                                                            return;
+                                                        };
+                                                        this.open_saved_prompt_editor(
+                                                            path.clone(),
+                                                            window,
+                                                            cx,
+                                                        )
+                                                        .detach_and_log_err(cx)
+                                                    }
+                                                }
+                                            })
+                                            .ok();
+                                    }
+                                },
+                                IconName::Close,
+                                "Close Entry".into(),
+                                {
+                                    let panel = panel.clone();
+                                    let entry = entry.clone();
+                                    move |_window, cx| {
+                                        panel
+                                            .update(cx, |this, cx| {
+                                                this.history_store.update(
+                                                    cx,
+                                                    |history_store, cx| {
+                                                        history_store.remove_recently_opened_entry(
+                                                            &entry, cx,
+                                                        );
+                                                    },
+                                                );
+                                            })
+                                            .ok();
+                                    }
+                                },
+                            );
+                        }
+
+                        menu = menu.separator();
                    }
+
                    menu.action("View All", Box::new(OpenHistory))
                        .end_slot_action(DeleteRecentlyOpenThread.boxed_clone())
                        .fixed_width(px(320.).into())
@@ -841,7 +898,6 @@ impl AgentPanel {
        self.set_active_view(
            ActiveView::prompt_editor(
                context_editor.clone(),
-                self.history_store.clone(),
                self.language_registry.clone(),
                window,
                cx,
@@ -928,13 +984,7 @@ impl AgentPanel {
            )
        });
        self.set_active_view(
-            ActiveView::prompt_editor(
-                editor.clone(),
-                self.history_store.clone(),
-                self.language_registry.clone(),
-                window,
-                cx,
-            ),
+            ActiveView::prompt_editor(editor.clone(), self.language_registry.clone(), window, cx),
            window,
            cx,
        );
@@ -1333,6 +1383,16 @@ impl AgentPanel {
                    }
                }
            }
+            ActiveView::TextThread { context_editor, .. } => {
+                let context = context_editor.read(cx).context();
+                // When switching away from an unsaved text thread, delete its entry.
+                if context.read(cx).path().is_none() {
+                    let context = context.clone();
+                    self.history_store.update(cx, |store, cx| {
+                        store.remove_recently_opened_entry(&RecentEntry::Context(context), cx);
+                    });
+                }
+            }
            _ => {}
        }

@@ -1340,14 +1400,13 @@ impl AgentPanel {
            ActiveView::Thread { thread, .. } => self.history_store.update(cx, |store, cx| {
                if let Some(thread) = thread.upgrade() {
                    let id = thread.read(cx).id().clone();
-                    store.push_recently_opened_entry(HistoryEntryId::Thread(id), cx);
+                    store.push_recently_opened_entry(RecentEntry::Thread(id, thread), cx);
                }
            }),
            ActiveView::TextThread { context_editor, .. } => {
                self.history_store.update(cx, |store, cx| {
-                    if let Some(path) = context_editor.read(cx).context().read(cx).path() {
-                        store.push_recently_opened_entry(HistoryEntryId::Context(path.clone()), cx)
-                    }
+                    let context = context_editor.read(cx).context().clone();
+                    store.push_recently_opened_entry(RecentEntry::Context(context), cx)
                })
            }
            _ => {}
@@ -1366,70 +1425,6 @@ impl AgentPanel {

        self.focus_handle(cx).focus(window);
    }
-
-    fn populate_recently_opened_menu_section(
-        mut menu: ContextMenu,
-        panel: Entity<Self>,
-        cx: &mut Context<ContextMenu>,
-    ) -> ContextMenu {
-        let entries = panel
-            .read(cx)
-            .history_store
-            .read(cx)
-            .recently_opened_entries(cx);
-
-        if entries.is_empty() {
-            return menu;
-        }
-
-        menu = menu.header("Recently Opened");
-
-        for entry in entries {
-            let title = entry.title().clone();
-            let id = entry.id();
-
-            menu = menu.entry_with_end_slot_on_hover(
-                title,
-                None,
-                {
-                    let panel = panel.downgrade();
-                    let id = id.clone();
-                    move |window, cx| {
-                        let id = id.clone();
-                        panel
-                            .update(cx, move |this, cx| match id {
-                                HistoryEntryId::Thread(id) => this
-                                    .open_thread_by_id(&id, window, cx)
-                                    .detach_and_log_err(cx),
-                                HistoryEntryId::Context(path) => this
-                                    .open_saved_prompt_editor(path.clone(), window, cx)
-                                    .detach_and_log_err(cx),
-                            })
-                            .ok();
-                    }
-                },
-                IconName::Close,
-                "Close Entry".into(),
-                {
-                    let panel = panel.downgrade();
-                    let id = id.clone();
-                    move |_window, cx| {
-                        panel
-                            .update(cx, |this, cx| {
-                                this.history_store.update(cx, |history_store, cx| {
-                                    history_store.remove_recently_opened_entry(&id, cx);
-                                });
-                            })
-                            .ok();
-                    }
-                },
-            );
-        }
-
-        menu = menu.separator();
-
-        menu
-    }
 }

 impl Focusable for AgentPanel {
@@ -2354,6 +2349,24 @@ impl AgentPanel {
        self.thread.clone().into_any_element()
    }

+    fn configuration_error(&self, cx: &App) -> Option<ConfigurationError> {
+        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
+            return Some(ConfigurationError::NoProvider);
+        };
+
+        if !model.provider.is_authenticated(cx) {
+            return Some(ConfigurationError::ProviderNotAuthenticated);
+        }
+
+        if model.provider.must_accept_terms(cx) {
+            return Some(ConfigurationError::ProviderPendingTermsAcceptance(
+                model.provider,
+            ));
+        }
+
+        None
+    }
+
    fn render_thread_empty_state(
        &self,
        window: &mut Window,
@@ -2363,9 +2376,7 @@ impl AgentPanel {
            .history_store
            .update(cx, |this, cx| this.recent_entries(6, cx));

-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let configuration_error =
-            model_registry.configuration_error(model_registry.default_model(), cx);
+        let configuration_error = self.configuration_error(cx);
        let no_error = configuration_error.is_none();
        let focus_handle = self.focus_handle(cx);

@@ -2382,7 +2393,11 @@ impl AgentPanel {
                        .justify_center()
                        .items_center()
                        .gap_1()
-                        .child(h_flex().child(Headline::new("Welcome to the Agent Panel")))
+                        .child(
+                            h_flex().child(
+                                Headline::new("Welcome to the Agent Panel")
+                            ),
+                        )
                        .when(no_error, |parent| {
                            parent
                                .child(
@@ -2406,10 +2421,7 @@ impl AgentPanel {
                                            cx,
                                        ))
                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                NewThread::default().boxed_clone(),
-                                                cx,
-                                            )
+                                            window.dispatch_action(NewThread::default().boxed_clone(), cx)
                                        }),
                                )
                                .child(
@@ -2426,10 +2438,7 @@ impl AgentPanel {
                                            cx,
                                        ))
                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                ToggleContextPicker.boxed_clone(),
-                                                cx,
-                                            )
+                                            window.dispatch_action(ToggleContextPicker.boxed_clone(), cx)
                                        }),
                                )
                                .child(
@@ -2446,10 +2455,7 @@ impl AgentPanel {
                                            cx,
                                        ))
                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                ToggleModelSelector.boxed_clone(),
-                                                cx,
-                                            )
+                                            window.dispatch_action(ToggleModelSelector.boxed_clone(), cx)
                                        }),
                                )
                                .child(
@@ -2466,50 +2472,51 @@ impl AgentPanel {
                                            cx,
                                        ))
                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                OpenConfiguration.boxed_clone(),
-                                                cx,
-                                            )
+                                            window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
                                        }),
                                )
                        })
-                        .map(|parent| match configuration_error_ref {
-                            Some(
-                                err @ (ConfigurationError::ModelNotFound
-                                | ConfigurationError::ProviderNotAuthenticated(_)
-                                | ConfigurationError::NoProvider),
-                            ) => parent
-                                .child(h_flex().child(
-                                    Label::new(err.to_string()).color(Color::Muted).mb_2p5(),
-                                ))
-                                .child(
-                                    Button::new("settings", "Configure a Provider")
-                                        .icon(IconName::Settings)
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &OpenConfiguration,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                OpenConfiguration.boxed_clone(),
-                                                cx,
+                        .map(|parent| {
+                            match configuration_error_ref {
+                                Some(ConfigurationError::ProviderNotAuthenticated)
+                                | Some(ConfigurationError::NoProvider) => {
+                                    parent
+                                        .child(
+                                            h_flex().child(
+                                                Label::new("To start using the agent, configure at least one LLM provider.")
+                                                    .color(Color::Muted)
+                                                    .mb_2p5()
                                            )
-                                        }),
-                                ),
-                            Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
-                                parent.children(provider.render_accept_terms(
-                                    LanguageModelProviderTosView::ThreadFreshStart,
-                                    cx,
-                                ))
+                                        )
+                                        .child(
+                                            Button::new("settings", "Configure a Provider")
+                                                .icon(IconName::Settings)
+                                                .icon_position(IconPosition::Start)
+                                                .icon_size(IconSize::Small)
+                                                .icon_color(Color::Muted)
+                                                .full_width()
+                                                .key_binding(KeyBinding::for_action_in(
+                                                    &OpenConfiguration,
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                ))
+                                                .on_click(|_event, window, cx| {
+                                                    window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
+                                                }),
+                                        )
+                                }
+                                Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
+                                    parent.children(
+                                        provider.render_accept_terms(
+                                            LanguageModelProviderTosView::ThreadFreshStart,
+                                            cx,
+                                        ),
+                                    )
+                                }
+                                None => parent,
                            }
-                            None => parent,
-                        }),
+                        })
                )
            })
            .when(!recent_history.is_empty(), |parent| {
@@ -2544,8 +2551,7 @@ impl AgentPanel {
                                            &self.focus_handle(cx),
                                            window,
                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                        ).map(|kb| kb.size(rems_from_px(12.))),
                                    )
                                    .on_click(move |_event, window, cx| {
                                        window.dispatch_action(OpenHistory.boxed_clone(), cx);
@@ -2555,68 +2561,79 @@ impl AgentPanel {
                    .child(
                        v_flex()
                            .gap_1()
-                            .children(recent_history.into_iter().enumerate().map(
-                                |(index, entry)| {
+                            .children(
+                                recent_history.into_iter().enumerate().map(|(index, entry)| {
                                    // TODO: Add keyboard navigation.
-                                    let is_hovered =
-                                        self.hovered_recent_history_item == Some(index);
+                                    let is_hovered = self.hovered_recent_history_item == Some(index);
                                    HistoryEntryElement::new(entry.clone(), cx.entity().downgrade())
                                        .hovered(is_hovered)
-                                        .on_hover(cx.listener(
-                                            move |this, is_hovered, _window, cx| {
-                                                if *is_hovered {
-                                                    this.hovered_recent_history_item = Some(index);
-                                                } else if this.hovered_recent_history_item
-                                                    == Some(index)
-                                                {
-                                                    this.hovered_recent_history_item = None;
-                                                }
-                                                cx.notify();
-                                            },
-                                        ))
+                                        .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
+                                            if *is_hovered {
+                                                this.hovered_recent_history_item = Some(index);
+                                            } else if this.hovered_recent_history_item == Some(index) {
+                                                this.hovered_recent_history_item = None;
+                                            }
+                                            cx.notify();
+                                        }))
                                        .into_any_element()
-                                },
-                            )),
+                                }),
+                            )
                    )
-                    .map(|parent| match configuration_error_ref {
-                        Some(
-                            err @ (ConfigurationError::ModelNotFound
-                            | ConfigurationError::ProviderNotAuthenticated(_)
-                            | ConfigurationError::NoProvider),
-                        ) => parent.child(
-                            Banner::new()
-                                .severity(ui::Severity::Warning)
-                                .child(Label::new(err.to_string()).size(LabelSize::Small))
-                                .action_slot(
-                                    Button::new("settings", "Configure Provider")
-                                        .style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                        .label_size(LabelSize::Small)
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &OpenConfiguration,
-                                                &focus_handle,
-                                                window,
-                                                cx,
+                    .map(|parent| {
+                        match configuration_error_ref {
+                            Some(ConfigurationError::ProviderNotAuthenticated)
+                            | Some(ConfigurationError::NoProvider) => {
+                                parent
+                                    .child(
+                                        Banner::new()
+                                            .severity(ui::Severity::Warning)
+                                            .child(
+                                                Label::new(
+                                                    "Configure at least one LLM provider to start using the panel.",
+                                                )
+                                                .size(LabelSize::Small),
                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(
-                                                OpenConfiguration.boxed_clone(),
-                                                cx,
-                                            )
-                                        }),
-                                ),
-                        ),
-                        Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
-                            parent.child(Banner::new().severity(ui::Severity::Warning).child(
-                                h_flex().w_full().children(provider.render_accept_terms(
-                                    LanguageModelProviderTosView::ThreadtEmptyState,
-                                    cx,
-                                )),
-                            ))
+                                            .action_slot(
+                                                Button::new("settings", "Configure Provider")
+                                                    .style(ButtonStyle::Tinted(ui::TintColor::Warning))
+                                                    .label_size(LabelSize::Small)
+                                                    .key_binding(
+                                                        KeyBinding::for_action_in(
+                                                            &OpenConfiguration,
+                                                            &focus_handle,
+                                                            window,
+                                                            cx,
+                                                        )
+                                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                                    )
+                                                    .on_click(|_event, window, cx| {
+                                                        window.dispatch_action(
+                                                            OpenConfiguration.boxed_clone(),
+                                                            cx,
+                                                        )
+                                                    }),
+                                            ),
+                                    )
+                            }
+                            Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
+                                parent
+                                    .child(
+                                        Banner::new()
+                                            .severity(ui::Severity::Warning)
+                                            .child(
+                                                h_flex()
+                                                    .w_full()
+                                                    .children(
+                                                        provider.render_accept_terms(
+                                                            LanguageModelProviderTosView::ThreadtEmptyState,
+                                                            cx,
+                                                        ),
+                                                    ),
+                                            ),
+                                    )
+                            }
+                            None => parent,
                        }
-                        None => parent,
                    })
            })
    }
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -1,334 +0,0 @@
-use std::sync::Arc;
-
-use agent_settings::{AgentProfileId, AgentProfileSettings, AgentSettings};
-use assistant_tool::{Tool, ToolSource, ToolWorkingSet};
-use collections::IndexMap;
-use convert_case::{Case, Casing};
-use fs::Fs;
-use gpui::{App, Entity};
-use settings::{Settings, update_settings_file};
-use ui::SharedString;
-use util::ResultExt;
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct AgentProfile {
-    id: AgentProfileId,
-    tool_set: Entity<ToolWorkingSet>,
-}
-
-pub type AvailableProfiles = IndexMap<AgentProfileId, SharedString>;
-
-impl AgentProfile {
-    pub fn new(id: AgentProfileId, tool_set: Entity<ToolWorkingSet>) -> Self {
-        Self { id, tool_set }
-    }
-
-    /// Saves a new profile to the settings.
-    pub fn create(
-        name: String,
-        base_profile_id: Option<AgentProfileId>,
-        fs: Arc<dyn Fs>,
-        cx: &App,
-    ) -> AgentProfileId {
-        let id = AgentProfileId(name.to_case(Case::Kebab).into());
-
-        let base_profile =
-            base_profile_id.and_then(|id| AgentSettings::get_global(cx).profiles.get(&id).cloned());
-
-        let profile_settings = AgentProfileSettings {
-            name: name.into(),
-            tools: base_profile
-                .as_ref()
-                .map(|profile| profile.tools.clone())
-                .unwrap_or_default(),
-            enable_all_context_servers: base_profile
-                .as_ref()
-                .map(|profile| profile.enable_all_context_servers)
-                .unwrap_or_default(),
-            context_servers: base_profile
-                .map(|profile| profile.context_servers)
-                .unwrap_or_default(),
-        };
-
-        update_settings_file::<AgentSettings>(fs, cx, {
-            let id = id.clone();
-            move |settings, _cx| {
-                settings.create_profile(id, profile_settings).log_err();
-            }
-        });
-
-        id
-    }
-
-    /// Returns a map of AgentProfileIds to their names
-    pub fn available_profiles(cx: &App) -> AvailableProfiles {
-        let mut profiles = AvailableProfiles::default();
-        for (id, profile) in AgentSettings::get_global(cx).profiles.iter() {
-            profiles.insert(id.clone(), profile.name.clone());
-        }
-        profiles
-    }
-
-    pub fn id(&self) -> &AgentProfileId {
-        &self.id
-    }
-
-    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        let Some(settings) = AgentSettings::get_global(cx).profiles.get(&self.id) else {
-            return Vec::new();
-        };
-
-        self.tool_set
-            .read(cx)
-            .tools(cx)
-            .into_iter()
-            .filter(|tool| Self::is_enabled(settings, tool.source(), tool.name()))
-            .collect()
-    }
-
-    fn is_enabled(settings: &AgentProfileSettings, source: ToolSource, name: String) -> bool {
-        match source {
-            ToolSource::Native => *settings.tools.get(name.as_str()).unwrap_or(&false),
-            ToolSource::ContextServer { id } => {
-                if settings.enable_all_context_servers {
-                    return true;
-                }
-
-                let Some(preset) = settings.context_servers.get(id.as_ref()) else {
-                    return false;
-                };
-                *preset.tools.get(name.as_str()).unwrap_or(&false)
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use agent_settings::ContextServerPreset;
-    use assistant_tool::ToolRegistry;
-    use collections::IndexMap;
-    use gpui::{AppContext, TestAppContext};
-    use http_client::FakeHttpClient;
-    use project::Project;
-    use settings::{Settings, SettingsStore};
-    use ui::SharedString;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_enabled_built_in_tools_for_profile(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let id = AgentProfileId::default();
-        let profile_settings = cx.read(|cx| {
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(&id)
-                .unwrap()
-                .clone()
-        });
-        let tool_set = default_tool_set(cx);
-
-        let profile = AgentProfile::new(id.clone(), tool_set);
-
-        let mut enabled_tools = cx
-            .read(|cx| profile.enabled_tools(cx))
-            .into_iter()
-            .map(|tool| tool.name())
-            .collect::<Vec<_>>();
-        enabled_tools.sort();
-
-        let mut expected_tools = profile_settings
-            .tools
-            .into_iter()
-            .filter_map(|(tool, enabled)| enabled.then_some(tool.to_string()))
-            // Provider dependent
-            .filter(|tool| tool != "web_search")
-            .collect::<Vec<_>>();
-        // Plus all registered MCP tools
-        expected_tools.extend(["enabled_mcp_tool".into(), "disabled_mcp_tool".into()]);
-        expected_tools.sort();
-
-        assert_eq!(enabled_tools, expected_tools);
-    }
-
-    #[gpui::test]
-    async fn test_custom_mcp_settings(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let id = AgentProfileId("custom_mcp".into());
-        let profile_settings = cx.read(|cx| {
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(&id)
-                .unwrap()
-                .clone()
-        });
-        let tool_set = default_tool_set(cx);
-
-        let profile = AgentProfile::new(id.clone(), tool_set);
-
-        let mut enabled_tools = cx
-            .read(|cx| profile.enabled_tools(cx))
-            .into_iter()
-            .map(|tool| tool.name())
-            .collect::<Vec<_>>();
-        enabled_tools.sort();
-
-        let mut expected_tools = profile_settings.context_servers["mcp"]
-            .tools
-            .iter()
-            .filter_map(|(key, enabled)| enabled.then(|| key.to_string()))
-            .collect::<Vec<_>>();
-        expected_tools.sort();
-
-        assert_eq!(enabled_tools, expected_tools);
-    }
-
-    #[gpui::test]
-    async fn test_only_built_in(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let id = AgentProfileId("write_minus_mcp".into());
-        let profile_settings = cx.read(|cx| {
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(&id)
-                .unwrap()
-                .clone()
-        });
-        let tool_set = default_tool_set(cx);
-
-        let profile = AgentProfile::new(id.clone(), tool_set);
-
-        let mut enabled_tools = cx
-            .read(|cx| profile.enabled_tools(cx))
-            .into_iter()
-            .map(|tool| tool.name())
-            .collect::<Vec<_>>();
-        enabled_tools.sort();
-
-        let mut expected_tools = profile_settings
-            .tools
-            .into_iter()
-            .filter_map(|(tool, enabled)| enabled.then_some(tool.to_string()))
-            // Provider dependent
-            .filter(|tool| tool != "web_search")
-            .collect::<Vec<_>>();
-        expected_tools.sort();
-
-        assert_eq!(enabled_tools, expected_tools);
-    }
-
-    fn init_test_settings(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            Project::init_settings(cx);
-            AgentSettings::register(cx);
-            language_model::init_settings(cx);
-            ToolRegistry::default_global(cx);
-            assistant_tools::init(FakeHttpClient::with_404_response(), cx);
-        });
-
-        cx.update(|cx| {
-            let mut agent_settings = AgentSettings::get_global(cx).clone();
-            agent_settings.profiles.insert(
-                AgentProfileId("write_minus_mcp".into()),
-                AgentProfileSettings {
-                    name: "write_minus_mcp".into(),
-                    enable_all_context_servers: false,
-                    ..agent_settings.profiles[&AgentProfileId::default()].clone()
-                },
-            );
-            agent_settings.profiles.insert(
-                AgentProfileId("custom_mcp".into()),
-                AgentProfileSettings {
-                    name: "mcp".into(),
-                    tools: IndexMap::default(),
-                    enable_all_context_servers: false,
-                    context_servers: IndexMap::from_iter([("mcp".into(), context_server_preset())]),
-                },
-            );
-            AgentSettings::override_global(agent_settings, cx);
-        })
-    }
-
-    fn context_server_preset() -> ContextServerPreset {
-        ContextServerPreset {
-            tools: IndexMap::from_iter([
-                ("enabled_mcp_tool".into(), true),
-                ("disabled_mcp_tool".into(), false),
-            ]),
-        }
-    }
-
-    fn default_tool_set(cx: &mut TestAppContext) -> Entity<ToolWorkingSet> {
-        cx.new(|_| {
-            let mut tool_set = ToolWorkingSet::default();
-            tool_set.insert(Arc::new(FakeTool::new("enabled_mcp_tool", "mcp")));
-            tool_set.insert(Arc::new(FakeTool::new("disabled_mcp_tool", "mcp")));
-            tool_set
-        })
-    }
-
-    struct FakeTool {
-        name: String,
-        source: SharedString,
-    }
-
-    impl FakeTool {
-        fn new(name: impl Into<String>, source: impl Into<SharedString>) -> Self {
-            Self {
-                name: name.into(),
-                source: source.into(),
-            }
-        }
-    }
-
-    impl Tool for FakeTool {
-        fn name(&self) -> String {
-            self.name.clone()
-        }
-
-        fn source(&self) -> ToolSource {
-            ToolSource::ContextServer {
-                id: self.source.clone(),
-            }
-        }
-
-        fn description(&self) -> String {
-            unimplemented!()
-        }
-
-        fn icon(&self) -> ui::IconName {
-            unimplemented!()
-        }
-
-        fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-            unimplemented!()
-        }
-
-        fn ui_text(&self, _input: &serde_json::Value) -> String {
-            unimplemented!()
-        }
-
-        fn run(
-            self: Arc<Self>,
-            _input: serde_json::Value,
-            _request: Arc<language_model::LanguageModelRequest>,
-            _project: Entity<Project>,
-            _action_log: Entity<assistant_tool::ActionLog>,
-            _model: Arc<dyn language_model::LanguageModel>,
-            _window: Option<gpui::AnyWindowHandle>,
-            _cx: &mut App,
-        ) -> assistant_tool::ToolResult {
-            unimplemented!()
-        }
-
-        fn may_perform_edits(&self) -> bool {
-            unimplemented!()
-        }
-    }
-}
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -386,10 +386,8 @@ impl CodegenAlternative {
                async { Ok(LanguageModelTextStream::default()) }.boxed_local()
            } else {
                let request = self.build_request(&model, user_prompt, cx)?;
-                cx.spawn(async move |_, cx| {
-                    Ok(model.stream_completion_text(request.await, &cx).await?)
-                })
-                .boxed_local()
+                cx.spawn(async move |_, cx| model.stream_completion_text(request.await, &cx).await)
+                    .boxed_local()
            };
        self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
        Ok(())
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -1,5 +1,7 @@
+use std::cell::RefCell;
 use std::ops::Range;
 use std::path::{Path, PathBuf};
+use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

@@ -765,7 +767,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {

        let snapshot = buffer.read(cx).snapshot();
        let source_range = snapshot.anchor_before(state.source_range.start)
-            ..snapshot.anchor_after(state.source_range.end);
+            ..snapshot.anchor_before(state.source_range.end);

        let thread_store = self.thread_store.clone();
        let text_thread_store = self.text_thread_store.clone();
@@ -910,6 +912,16 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        })
    }

+    fn resolve_completions(
+        &self,
+        _buffer: Entity<Buffer>,
+        _completion_indices: Vec<usize>,
+        _completions: Rc<RefCell<Box<[Completion]>>>,
+        _cx: &mut Context<Editor>,
+    ) -> Task<Result<bool>> {
+        Task::ready(Ok(true))
+    }
+
    fn is_completion_trigger(
        &self,
        buffer: &Entity<language::Buffer>,
@@ -1065,8 +1077,8 @@ mod tests {
    use project::{Project, ProjectPath};
    use serde_json::json;
    use settings::SettingsStore;
-    use std::{ops::Deref, rc::Rc};
-    use util::path;
+    use std::ops::Deref;
+    use util::{path, separator};
    use workspace::{AppState, Item};

    #[test]
@@ -1217,14 +1229,14 @@ mod tests {
        let mut cx = VisualTestContext::from_window(*window.deref(), cx);

        let paths = vec![
-            path!("a/one.txt"),
-            path!("a/two.txt"),
-            path!("a/three.txt"),
-            path!("a/four.txt"),
-            path!("b/five.txt"),
-            path!("b/six.txt"),
-            path!("b/seven.txt"),
-            path!("b/eight.txt"),
+            separator!("a/one.txt"),
+            separator!("a/two.txt"),
+            separator!("a/three.txt"),
+            separator!("a/four.txt"),
+            separator!("b/five.txt"),
+            separator!("b/six.txt"),
+            separator!("b/seven.txt"),
+            separator!("b/eight.txt"),
        ];

        let mut opened_editors = Vec::new();
--- a/crates/agent/src/context_picker/thread_context_picker.rs
+++ b/crates/agent/src/context_picker/thread_context_picker.rs
@@ -282,18 +282,15 @@ pub fn unordered_thread_entries(
    text_thread_store: Entity<TextThreadStore>,
    cx: &App,
 ) -> impl Iterator<Item = (DateTime<Utc>, ThreadContextEntry)> {
-    let threads = thread_store
-        .read(cx)
-        .reverse_chronological_threads()
-        .map(|thread| {
-            (
-                thread.updated_at,
-                ThreadContextEntry::Thread {
-                    id: thread.id.clone(),
-                    title: thread.summary.clone(),
-                },
-            )
-        });
+    let threads = thread_store.read(cx).unordered_threads().map(|thread| {
+        (
+            thread.updated_at,
+            ThreadContextEntry::Thread {
+                id: thread.id.clone(),
+                title: thread.summary.clone(),
+            },
+        )
+    });

    let text_threads = text_thread_store
        .read(cx)
@@ -303,7 +300,7 @@ pub fn unordered_thread_entries(
                context.mtime.to_utc(),
                ThreadContextEntry::Context {
                    path: context.path.clone(),
-                    title: context.title.clone(),
+                    title: context.title.clone().into(),
                },
            )
        });
--- a/crates/agent/src/context_server_configuration.rs
+++ b/crates/agent/src/context_server_configuration.rs
@@ -3,21 +3,16 @@ use std::sync::Arc;
 use anyhow::Context as _;
 use context_server::ContextServerId;
 use extension::{ContextServerConfiguration, ExtensionManifest};
-use fs::Fs;
 use gpui::Task;
 use language::LanguageRegistry;
-use project::{
-    context_server_store::registry::ContextServerDescriptorRegistry,
-    project_settings::ProjectSettings,
-};
-use settings::update_settings_file;
+use project::context_server_store::registry::ContextServerDescriptorRegistry;
 use ui::prelude::*;
 use util::ResultExt;
 use workspace::Workspace;

 use crate::agent_configuration::ConfigureContextServerModal;

-pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx: &mut App) {
+pub(crate) fn init(language_registry: Arc<LanguageRegistry>, cx: &mut App) {
    cx.observe_new(move |_: &mut Workspace, window, cx| {
        let Some(window) = window else {
            return;
@@ -26,7 +21,6 @@ pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx
        if let Some(extension_events) = extension::ExtensionEvents::try_global(cx).as_ref() {
            cx.subscribe_in(extension_events, window, {
                let language_registry = language_registry.clone();
-                let fs = fs.clone();
                move |workspace, _, event, window, cx| match event {
                    extension::Event::ExtensionInstalled(manifest) => {
                        show_configure_mcp_modal(
@@ -37,13 +31,6 @@ pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx
                            cx,
                        );
                    }
-                    extension::Event::ExtensionUninstalled(manifest) => {
-                        remove_context_server_settings(
-                            manifest.context_servers.keys().cloned().collect(),
-                            fs.clone(),
-                            cx,
-                        );
-                    }
                    extension::Event::ConfigureExtensionRequested(manifest) => {
                        if !manifest.context_servers.is_empty() {
                            show_configure_mcp_modal(
@@ -68,18 +55,6 @@ pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx
    .detach();
 }

-fn remove_context_server_settings(
-    context_server_ids: Vec<Arc<str>>,
-    fs: Arc<dyn Fs>,
-    cx: &mut App,
-) {
-    update_settings_file::<ProjectSettings>(fs, cx, move |settings, _| {
-        settings
-            .context_servers
-            .retain(|server_id, _| !context_server_ids.contains(server_id));
-    });
-}
-
 pub enum Configuration {
    NotAvailable(ContextServerId, Option<SharedString>),
    Required(
@@ -96,10 +71,6 @@ fn show_configure_mcp_modal(
    window: &mut Window,
    cx: &mut Context<'_, Workspace>,
 ) {
-    if !window.is_window_active() {
-        return;
-    }
-
    let context_server_store = workspace.project().read(cx).context_server_store();
    let repository: Option<SharedString> = manifest.repository.as_ref().map(|s| s.clone().into());

--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -104,15 +104,7 @@ impl Tool for ContextServerTool {
                    tool_name,
                    arguments
                );
-                let response = protocol
-                    .request::<context_server::types::requests::CallTool>(
-                        context_server::types::CallToolParams {
-                            name: tool_name,
-                            arguments,
-                            meta: None,
-                        },
-                    )
-                    .await?;
+                let response = protocol.run_tool(tool_name, arguments).await?;

                let mut result = String::new();
                for content in response.content {
@@ -123,9 +115,6 @@ impl Tool for ContextServerTool {
                        types::ToolResponseContent::Image { .. } => {
                            log::warn!("Ignoring image content from tool response");
                        }
-                        types::ToolResponseContent::Audio { .. } => {
-                            log::warn!("Ignoring audio content from tool response");
-                        }
                        types::ToolResponseContent::Resource { .. } => {
                            log::warn!("Ignoring resource content from tool response");
                        }
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -1,17 +1,18 @@
 use std::{collections::VecDeque, path::Path, sync::Arc};

-use anyhow::{Context as _, Result};
-use assistant_context_editor::SavedContextMetadata;
+use anyhow::Context as _;
+use assistant_context_editor::{AssistantContext, SavedContextMetadata};
 use chrono::{DateTime, Utc};
-use gpui::{AsyncApp, Entity, SharedString, Task, prelude::*};
-use itertools::Itertools;
-use paths::contexts_dir;
+use futures::future::{TryFutureExt as _, join_all};
+use gpui::{Entity, Task, prelude::*};
 use serde::{Deserialize, Serialize};
+use smol::future::FutureExt;
 use std::time::Duration;
-use ui::App;
+use ui::{App, SharedString, Window};
 use util::ResultExt as _;

 use crate::{
+    Thread,
    thread::ThreadId,
    thread_store::{SerializedThreadMetadata, ThreadStore},
 };
@@ -40,34 +41,52 @@ impl HistoryEntry {
            HistoryEntry::Context(context) => HistoryEntryId::Context(context.path.clone()),
        }
    }
-
-    pub fn title(&self) -> &SharedString {
-        match self {
-            HistoryEntry::Thread(thread) => &thread.summary,
-            HistoryEntry::Context(context) => &context.title,
-        }
-    }
 }

 /// Generic identifier for a history entry.
-#[derive(Clone, PartialEq, Eq, Debug)]
+#[derive(Clone, PartialEq, Eq)]
 pub enum HistoryEntryId {
    Thread(ThreadId),
    Context(Arc<Path>),
 }

+#[derive(Clone, Debug)]
+pub(crate) enum RecentEntry {
+    Thread(ThreadId, Entity<Thread>),
+    Context(Entity<AssistantContext>),
+}
+
+impl PartialEq for RecentEntry {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Self::Thread(l0, _), Self::Thread(r0, _)) => l0 == r0,
+            (Self::Context(l0), Self::Context(r0)) => l0 == r0,
+            _ => false,
+        }
+    }
+}
+
+impl Eq for RecentEntry {}
+
+impl RecentEntry {
+    pub(crate) fn summary(&self, cx: &App) -> SharedString {
+        match self {
+            RecentEntry::Thread(_, thread) => thread.read(cx).summary().or_default(),
+            RecentEntry::Context(context) => context.read(cx).summary().or_default(),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize)]
-enum SerializedRecentOpen {
+enum SerializedRecentEntry {
    Thread(String),
-    ContextName(String),
-    /// Old format which stores the full path
    Context(String),
 }

 pub struct HistoryStore {
    thread_store: Entity<ThreadStore>,
    context_store: Entity<assistant_context_editor::ContextStore>,
-    recently_opened_entries: VecDeque<HistoryEntryId>,
+    recently_opened_entries: VecDeque<RecentEntry>,
    _subscriptions: Vec<gpui::Subscription>,
    _save_recently_opened_entries_task: Task<()>,
 }
@@ -76,7 +95,8 @@ impl HistoryStore {
    pub fn new(
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
-        initial_recent_entries: impl IntoIterator<Item = HistoryEntryId>,
+        initial_recent_entries: impl IntoIterator<Item = RecentEntry>,
+        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
        let subscriptions = vec![
@@ -84,20 +104,68 @@ impl HistoryStore {
            cx.observe(&context_store, |_, _, cx| cx.notify()),
        ];

-        cx.spawn(async move |this, cx| {
-            let entries = Self::load_recently_opened_entries(cx).await.log_err()?;
-            this.update(cx, |this, _| {
-                this.recently_opened_entries
-                    .extend(
-                        entries.into_iter().take(
-                            MAX_RECENTLY_OPENED_ENTRIES
-                                .saturating_sub(this.recently_opened_entries.len()),
-                        ),
-                    );
+        window
+            .spawn(cx, {
+                let thread_store = thread_store.downgrade();
+                let context_store = context_store.downgrade();
+                let this = cx.weak_entity();
+                async move |cx| {
+                    let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
+                    let contents = cx
+                        .background_spawn(async move { std::fs::read_to_string(path) })
+                        .await
+                        .ok()?;
+                    let entries = serde_json::from_str::<Vec<SerializedRecentEntry>>(&contents)
+                        .context("deserializing persisted agent panel navigation history")
+                        .log_err()?
+                        .into_iter()
+                        .take(MAX_RECENTLY_OPENED_ENTRIES)
+                        .map(|serialized| match serialized {
+                            SerializedRecentEntry::Thread(id) => thread_store
+                                .update_in(cx, |thread_store, window, cx| {
+                                    let thread_id = ThreadId::from(id.as_str());
+                                    thread_store
+                                        .open_thread(&thread_id, window, cx)
+                                        .map_ok(|thread| RecentEntry::Thread(thread_id, thread))
+                                        .boxed()
+                                })
+                                .unwrap_or_else(|_| {
+                                    async {
+                                        anyhow::bail!("no thread store");
+                                    }
+                                    .boxed()
+                                }),
+                            SerializedRecentEntry::Context(id) => context_store
+                                .update(cx, |context_store, cx| {
+                                    context_store
+                                        .open_local_context(Path::new(&id).into(), cx)
+                                        .map_ok(RecentEntry::Context)
+                                        .boxed()
+                                })
+                                .unwrap_or_else(|_| {
+                                    async {
+                                        anyhow::bail!("no context store");
+                                    }
+                                    .boxed()
+                                }),
+                        });
+                    let entries = join_all(entries)
+                        .await
+                        .into_iter()
+                        .filter_map(|result| result.log_with_level(log::Level::Debug))
+                        .collect::<VecDeque<_>>();
+
+                    this.update(cx, |this, _| {
+                        this.recently_opened_entries.extend(entries);
+                        this.recently_opened_entries
+                            .truncate(MAX_RECENTLY_OPENED_ENTRIES);
+                    })
+                    .ok();
+
+                    Some(())
+                }
            })
-            .ok()
-        })
-        .detach();
+            .detach();

        Self {
            thread_store,
@@ -116,20 +184,19 @@ impl HistoryStore {
            return history_entries;
        }

-        history_entries.extend(
-            self.thread_store
-                .read(cx)
-                .reverse_chronological_threads()
-                .cloned()
-                .map(HistoryEntry::Thread),
-        );
-        history_entries.extend(
-            self.context_store
-                .read(cx)
-                .unordered_contexts()
-                .cloned()
-                .map(HistoryEntry::Context),
-        );
+        for thread in self
+            .thread_store
+            .update(cx, |this, _cx| this.reverse_chronological_threads())
+        {
+            history_entries.push(HistoryEntry::Thread(thread));
+        }
+
+        for context in self
+            .context_store
+            .update(cx, |this, _cx| this.reverse_chronological_contexts())
+        {
+            history_entries.push(HistoryEntry::Context(context));
+        }

        history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
        history_entries
@@ -139,62 +206,15 @@ impl HistoryStore {
        self.entries(cx).into_iter().take(limit).collect()
    }

-    pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return Vec::new();
-        }
-
-        let thread_entries = self
-            .thread_store
-            .read(cx)
-            .reverse_chronological_threads()
-            .flat_map(|thread| {
-                self.recently_opened_entries
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, entry)| match entry {
-                        HistoryEntryId::Thread(id) if &thread.id == id => {
-                            Some((index, HistoryEntry::Thread(thread.clone())))
-                        }
-                        _ => None,
-                    })
-            });
-
-        let context_entries =
-            self.context_store
-                .read(cx)
-                .unordered_contexts()
-                .flat_map(|context| {
-                    self.recently_opened_entries
-                        .iter()
-                        .enumerate()
-                        .flat_map(|(index, entry)| match entry {
-                            HistoryEntryId::Context(path) if &context.path == path => {
-                                Some((index, HistoryEntry::Context(context.clone())))
-                            }
-                            _ => None,
-                        })
-                });
-
-        thread_entries
-            .chain(context_entries)
-            // optimization to halt iteration early
-            .take(self.recently_opened_entries.len())
-            .sorted_unstable_by_key(|(index, _)| *index)
-            .map(|(_, entry)| entry)
-            .collect()
-    }
-
    fn save_recently_opened_entries(&mut self, cx: &mut Context<Self>) {
        let serialized_entries = self
            .recently_opened_entries
            .iter()
            .filter_map(|entry| match entry {
-                HistoryEntryId::Context(path) => path.file_name().map(|file| {
-                    SerializedRecentOpen::ContextName(file.to_string_lossy().to_string())
-                }),
-                HistoryEntryId::Thread(id) => Some(SerializedRecentOpen::Thread(id.to_string())),
+                RecentEntry::Context(context) => Some(SerializedRecentEntry::Context(
+                    context.read(cx).path()?.to_str()?.to_owned(),
+                )),
+                RecentEntry::Thread(id, _) => Some(SerializedRecentEntry::Thread(id.to_string())),
            })
            .collect::<Vec<_>>();

@@ -213,33 +233,7 @@ impl HistoryStore {
        });
    }

-    fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<Vec<HistoryEntryId>>> {
-        cx.background_spawn(async move {
-            let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
-            let contents = smol::fs::read_to_string(path).await?;
-            let entries = serde_json::from_str::<Vec<SerializedRecentOpen>>(&contents)
-                .context("deserializing persisted agent panel navigation history")?
-                .into_iter()
-                .take(MAX_RECENTLY_OPENED_ENTRIES)
-                .flat_map(|entry| match entry {
-                    SerializedRecentOpen::Thread(id) => {
-                        Some(HistoryEntryId::Thread(id.as_str().into()))
-                    }
-                    SerializedRecentOpen::ContextName(file_name) => Some(HistoryEntryId::Context(
-                        contexts_dir().join(file_name).into(),
-                    )),
-                    SerializedRecentOpen::Context(path) => {
-                        Path::new(&path).file_name().map(|file_name| {
-                            HistoryEntryId::Context(contexts_dir().join(file_name).into())
-                        })
-                    }
-                })
-                .collect::<Vec<_>>();
-            Ok(entries)
-        })
-    }
-
-    pub fn push_recently_opened_entry(&mut self, entry: HistoryEntryId, cx: &mut Context<Self>) {
+    pub fn push_recently_opened_entry(&mut self, entry: RecentEntry, cx: &mut Context<Self>) {
        self.recently_opened_entries
            .retain(|old_entry| old_entry != &entry);
        self.recently_opened_entries.push_front(entry);
@@ -250,33 +244,24 @@ impl HistoryStore {

    pub fn remove_recently_opened_thread(&mut self, id: ThreadId, cx: &mut Context<Self>) {
        self.recently_opened_entries.retain(|entry| match entry {
-            HistoryEntryId::Thread(thread_id) if thread_id == &id => false,
+            RecentEntry::Thread(thread_id, _) if thread_id == &id => false,
            _ => true,
        });
        self.save_recently_opened_entries(cx);
    }

-    pub fn replace_recently_opened_text_thread(
-        &mut self,
-        old_path: &Path,
-        new_path: &Arc<Path>,
-        cx: &mut Context<Self>,
-    ) {
-        for entry in &mut self.recently_opened_entries {
-            match entry {
-                HistoryEntryId::Context(path) if path.as_ref() == old_path => {
-                    *entry = HistoryEntryId::Context(new_path.clone());
-                    break;
-                }
-                _ => {}
-            }
-        }
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn remove_recently_opened_entry(&mut self, entry: &HistoryEntryId, cx: &mut Context<Self>) {
+    pub fn remove_recently_opened_entry(&mut self, entry: &RecentEntry, cx: &mut Context<Self>) {
        self.recently_opened_entries
            .retain(|old_entry| old_entry != entry);
        self.save_recently_opened_entries(cx);
    }
+
+    pub fn recently_opened_entries(&self, _cx: &mut Context<Self>) -> VecDeque<RecentEntry> {
+        #[cfg(debug_assertions)]
+        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
+            return VecDeque::new();
+        }
+
+        self.recently_opened_entries.clone()
+    }
 }
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -24,7 +24,6 @@ use gpui::{
    WeakEntity, Window, point,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::ConfigurationError;
 use language_model::ConfiguredModel;
 use language_model::{LanguageModelRegistry, report_assistant_event};
 use multi_buffer::MultiBufferRow;
@@ -39,7 +38,8 @@ use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
-use util::{RangeExt, ResultExt, maybe};
+use util::RangeExt;
+use util::ResultExt;
 use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
 use zed_actions::agent::OpenConfiguration;

@@ -233,9 +233,10 @@ impl InlineAssistant {
            return;
        };

-        let configuration_error = || {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            model_registry.configuration_error(model_registry.inline_assistant_model(), cx)
+        let is_authenticated = || {
+            LanguageModelRegistry::read_global(cx)
+                .inline_assistant_model()
+                .map_or(false, |model| model.provider.is_authenticated(cx))
        };

        let Some(agent_panel) = workspace.panel::<AgentPanel>(cx) else {
@@ -283,23 +284,20 @@ impl InlineAssistant {
                }
            };

-        if let Some(error) = configuration_error() {
-            if let ConfigurationError::ProviderNotAuthenticated(provider) = error {
-                cx.spawn(async move |_, cx| {
-                    cx.update(|cx| provider.authenticate(cx))?.await?;
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-
-                if configuration_error().is_none() {
-                    handle_assist(window, cx);
-                }
-            } else {
-                cx.spawn_in(window, async move |_, cx| {
+        if is_authenticated() {
+            handle_assist(window, cx);
+        } else {
+            cx.spawn_in(window, async move |_workspace, cx| {
+                let Some(task) = cx.update(|_, cx| {
+                    LanguageModelRegistry::read_global(cx)
+                        .inline_assistant_model()
+                        .map_or(None, |model| Some(model.provider.authenticate(cx)))
+                })?
+                else {
                    let answer = cx
                        .prompt(
                            gpui::PromptLevel::Warning,
-                            &error.to_string(),
+                            "No language model provider configured",
                            None,
                            &["Configure", "Cancel"],
                        )
@@ -313,12 +311,17 @@ impl InlineAssistant {
                            .ok();
                        }
                    }
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
+                    return Ok(());
+                };
+                task.await?;
+
+                anyhow::Ok(())
+            })
+            .detach_and_log_err(cx);
+
+            if is_authenticated() {
+                handle_assist(window, cx);
            }
-        } else {
-            handle_assist(window, cx);
        }
    }

@@ -1008,7 +1011,7 @@ impl InlineAssistant {
                        self.update_editor_highlights(&editor, cx);
                    }
                } else {
-                    entry.get_mut().highlight_updates.send(()).ok();
+                    entry.get().highlight_updates.send(()).ok();
                }
            }

@@ -1168,31 +1171,27 @@ impl InlineAssistant {
                selections.select_anchor_ranges([position..position])
            });

-            let mut scroll_target_range = None;
+            let mut scroll_target_top;
+            let mut scroll_target_bottom;
            if let Some(decorations) = assist.decorations.as_ref() {
-                scroll_target_range = maybe!({
-                    let top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f32;
-                    let bottom = editor.row_for_block(decorations.end_block_id, cx)?.0 as f32;
-                    Some((top, bottom))
-                });
-                if scroll_target_range.is_none() {
-                    log::error!("bug: failed to find blocks for scrolling to inline assist");
-                }
-            }
-            let scroll_target_range = scroll_target_range.unwrap_or_else(|| {
+                scroll_target_top = editor
+                    .row_for_block(decorations.prompt_block_id, cx)
+                    .unwrap()
+                    .0 as f32;
+                scroll_target_bottom = editor
+                    .row_for_block(decorations.end_block_id, cx)
+                    .unwrap()
+                    .0 as f32;
+            } else {
                let snapshot = editor.snapshot(window, cx);
                let start_row = assist
                    .range
                    .start
                    .to_display_point(&snapshot.display_snapshot)
                    .row();
-                let top = start_row.0 as f32;
-                let bottom = top + 1.0;
-                (top, bottom)
-            });
-            let mut scroll_target_top = scroll_target_range.0;
-            let mut scroll_target_bottom = scroll_target_range.1;
-
+                scroll_target_top = start_row.0 as f32;
+                scroll_target_bottom = scroll_target_top + 1.;
+            }
            scroll_target_top -= editor.vertical_scroll_margin() as f32;
            scroll_target_bottom += editor.vertical_scroll_margin() as f32;

@@ -1332,7 +1331,7 @@ impl InlineAssistant {
                editor.clear_gutter_highlights::<GutterPendingRange>(cx);
            } else {
                editor.highlight_gutter::<GutterPendingRange>(
-                    gutter_pending_ranges,
+                    &gutter_pending_ranges,
                    |cx| cx.theme().status().info_background,
                    cx,
                )
@@ -1343,7 +1342,7 @@ impl InlineAssistant {
                editor.clear_gutter_highlights::<GutterTransformedRange>(cx);
            } else {
                editor.highlight_gutter::<GutterTransformedRange>(
-                    gutter_transformed_ranges,
+                    &gutter_transformed_ranges,
                    |cx| cx.theme().status().info,
                    cx,
                )
@@ -1520,7 +1519,7 @@ impl InlineAssistant {
 struct EditorInlineAssists {
    assist_ids: Vec<InlineAssistId>,
    scroll_lock: Option<InlineAssistScrollLock>,
-    highlight_updates: watch::Sender<()>,
+    highlight_updates: async_watch::Sender<()>,
    _update_highlights: Task<Result<()>>,
    _subscriptions: Vec<gpui::Subscription>,
 }
@@ -1532,7 +1531,7 @@ struct InlineAssistScrollLock {

 impl EditorInlineAssists {
    fn new(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
-        let (highlight_updates_tx, mut highlight_updates_rx) = watch::channel(());
+        let (highlight_updates_tx, mut highlight_updates_rx) = async_watch::channel(());
        Self {
            assist_ids: Vec::new(),
            scroll_lock: None,
@@ -1690,7 +1689,7 @@ impl InlineAssist {
                        if let Some(editor) = editor.upgrade() {
                            InlineAssistant::update_global(cx, |this, cx| {
                                if let Some(editor_assists) =
-                                    this.assists_by_editor.get_mut(&editor.downgrade())
+                                    this.assists_by_editor.get(&editor.downgrade())
                                {
                                    editor_assists.highlight_updates.send(()).ok();
                                }
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -261,7 +261,7 @@ impl<T: 'static> PromptEditor<T> {

        let focus = self.editor.focus_handle(cx).contains_focused(window, cx);
        self.editor = cx.new(|cx| {
-            let mut editor = Editor::auto_height(1, Self::MAX_LINES as usize, window, cx);
+            let mut editor = Editor::auto_height(Self::MAX_LINES as usize, window, cx);
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
            editor.set_placeholder_text("Add a prompt…", cx);
            editor.set_text(prompt, window, cx);
@@ -872,7 +872,6 @@ impl PromptEditor<BufferCodegen> {
        let prompt_editor = cx.new(|cx| {
            let mut editor = Editor::new(
                EditorMode::AutoHeight {
-                    min_lines: 1,
                    max_lines: Self::MAX_LINES as usize,
                },
                prompt_buffer,
@@ -1051,7 +1050,6 @@ impl PromptEditor<TerminalCodegen> {
        let prompt_editor = cx.new(|cx| {
            let mut editor = Editor::new(
                EditorMode::AutoHeight {
-                    min_lines: 1,
                    max_lines: Self::MAX_LINES as usize,
                },
                prompt_buffer,
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -39,7 +39,7 @@ use proto::Plan;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
-use ui::{Callout, Disclosure, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{Disclosure, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
 use util::{ResultExt as _, maybe};
 use workspace::{CollaboratorId, Workspace};
 use zed_llm_client::CompletionIntent;
@@ -79,7 +79,6 @@ pub struct MessageEditor {
    _subscriptions: Vec<Subscription>,
 }

-const MIN_EDITOR_LINES: usize = 4;
 const MAX_EDITOR_LINES: usize = 8;

 pub(crate) fn create_editor(
@@ -103,7 +102,6 @@ pub(crate) fn create_editor(
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let mut editor = Editor::new(
            editor::EditorMode::AutoHeight {
-                min_lines: MIN_EDITOR_LINES,
                max_lines: MAX_EDITOR_LINES,
            },
            buffer,
@@ -177,7 +175,8 @@ impl MessageEditor {
            )
        });

-        let incompatible_tools = cx.new(|cx| IncompatibleToolsState::new(thread.clone(), cx));
+        let incompatible_tools =
+            cx.new(|cx| IncompatibleToolsState::new(thread.read(cx).tools().clone(), cx));

        let subscriptions = vec![
            cx.subscribe_in(&context_strip, window, Self::handle_context_strip_event),
@@ -205,8 +204,15 @@ impl MessageEditor {
            )
        });

-        let profile_selector =
-            cx.new(|cx| ProfileSelector::new(fs, thread.clone(), editor.focus_handle(cx), cx));
+        let profile_selector = cx.new(|cx| {
+            ProfileSelector::new(
+                fs,
+                thread.clone(),
+                thread_store,
+                editor.focus_handle(cx),
+                cx,
+            )
+        });

        Self {
            editor: editor.clone(),
@@ -255,7 +261,6 @@ impl MessageEditor {
                })
            } else {
                editor.set_mode(EditorMode::AutoHeight {
-                    min_lines: MIN_EDITOR_LINES,
                    max_lines: MAX_EDITOR_LINES,
                })
            }
@@ -431,6 +436,10 @@ impl MessageEditor {
    }

    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();
@@ -505,7 +514,7 @@ impl MessageEditor {
        cx.notify();
    }

-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+    fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();
        if !model?.model.supports_max_mode() {
@@ -640,87 +649,96 @@ impl MessageEditor {
            .border_color(cx.theme().colors().border)
            .child(
                h_flex()
+                    .items_start()
                    .justify_between()
                    .child(self.context_strip.clone())
-                    .when(focus_handle.is_focused(window), |this| {
-                        this.child(
-                            IconButton::new("toggle-height", expand_icon)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |window, cx| {
-                                        let expand_label = if is_editor_expanded {
-                                            "Minimize Message Editor".to_string()
-                                        } else {
-                                            "Expand Message Editor".to_string()
-                                        };
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .when(focus_handle.is_focused(window), |this| {
+                                this.child(
+                                    IconButton::new("toggle-height", expand_icon)
+                                        .icon_size(IconSize::XSmall)
+                                        .icon_color(Color::Muted)
+                                        .tooltip({
+                                            let focus_handle = focus_handle.clone();
+                                            move |window, cx| {
+                                                let expand_label = if is_editor_expanded {
+                                                    "Minimize Message Editor".to_string()
+                                                } else {
+                                                    "Expand Message Editor".to_string()
+                                                };

-                                        Tooltip::for_action_in(
-                                            expand_label,
-                                            &ExpandMessageEditor,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                    }
-                                })
-                                .on_click(cx.listener(|_, _, window, cx| {
-                                    window.dispatch_action(Box::new(ExpandMessageEditor), cx);
-                                })),
-                        )
-                    }),
+                                                Tooltip::for_action_in(
+                                                    expand_label,
+                                                    &ExpandMessageEditor,
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                )
+                                            }
+                                        })
+                                        .on_click(cx.listener(|_, _, window, cx| {
+                                            window
+                                                .dispatch_action(Box::new(ExpandMessageEditor), cx);
+                                        })),
+                                )
+                            }),
+                    ),
            )
            .child(
                v_flex()
                    .size_full()
-                    .gap_1()
+                    .gap_4()
                    .when(is_editor_expanded, |this| {
                        this.h(vh(0.8, window)).justify_between()
                    })
-                    .child({
-                        let settings = ThemeSettings::get_global(cx);
-                        let font_size = TextSize::Small
-                            .rems(cx)
-                            .to_pixels(settings.agent_font_size(cx));
-                        let line_height = settings.buffer_line_height.value() * font_size;
+                    .child(
+                        v_flex()
+                            .min_h_16()
+                            .when(is_editor_expanded, |this| this.h_full())
+                            .child({
+                                let settings = ThemeSettings::get_global(cx);
+                                let font_size = TextSize::Small
+                                    .rems(cx)
+                                    .to_pixels(settings.agent_font_size(cx));
+                                let line_height = settings.buffer_line_height.value() * font_size;

-                        let text_style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.buffer_font.family.clone(),
-                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                            font_features: settings.buffer_font.features.clone(),
-                            font_size: font_size.into(),
-                            line_height: line_height.into(),
-                            ..Default::default()
-                        };
+                                let text_style = TextStyle {
+                                    color: cx.theme().colors().text,
+                                    font_family: settings.buffer_font.family.clone(),
+                                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                                    font_features: settings.buffer_font.features.clone(),
+                                    font_size: font_size.into(),
+                                    line_height: line_height.into(),
+                                    ..Default::default()
+                                };

-                        EditorElement::new(
-                            &self.editor,
-                            EditorStyle {
-                                background: editor_bg_color,
-                                local_player: cx.theme().players().local(),
-                                text: text_style,
-                                syntax: cx.theme().syntax().clone(),
-                                ..Default::default()
-                            },
-                        )
-                        .into_any()
-                    })
+                                EditorElement::new(
+                                    &self.editor,
+                                    EditorStyle {
+                                        background: editor_bg_color,
+                                        local_player: cx.theme().players().local(),
+                                        text: text_style,
+                                        syntax: cx.theme().syntax().clone(),
+                                        ..Default::default()
+                                    },
+                                )
+                                .into_any()
+                            }),
+                    )
                    .child(
                        h_flex()
                            .flex_none()
-                            .flex_wrap()
                            .justify_between()
                            .child(
                                h_flex()
                                    .child(self.render_follow_toggle(cx))
-                                    .children(self.render_burn_mode_toggle(cx)),
+                                    .children(self.render_max_mode_toggle(cx)),
                            )
                            .child(
                                h_flex()
                                    .gap_1()
-                                    .flex_wrap()
                                    .when(!incompatible_tools.is_empty(), |this| {
                                        this.child(
                                            IconButton::new(
@@ -1173,7 +1191,6 @@ impl MessageEditor {
            .map_or(false, |model| {
                model.provider.id().0 == ZED_CLOUD_PROVIDER_ID
            });
-
        if !is_using_zed_provider {
            return None;
        }
@@ -1228,6 +1245,14 @@ impl MessageEditor {
        token_usage_ratio: TokenUsageRatio,
        cx: &mut Context<Self>,
    ) -> Option<Div> {
+        let title = if token_usage_ratio == TokenUsageRatio::Exceeded {
+            "Thread reached the token limit"
+        } else {
+            "Thread reaching the token limit soon"
+        };
+
+        let message = "Start a new thread from a summary to continue the conversation.";
+
        let icon = if token_usage_ratio == TokenUsageRatio::Exceeded {
            Icon::new(IconName::X)
                .color(Color::Error)
@@ -1238,43 +1263,19 @@ impl MessageEditor {
                .size(IconSize::XSmall)
        };

-        let title = if token_usage_ratio == TokenUsageRatio::Exceeded {
-            "Thread reached the token limit"
-        } else {
-            "Thread reaching the token limit soon"
-        };
-
        Some(
            div()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .child(
-                    Callout::new()
-                        .line_height(line_height)
-                        .icon(icon)
-                        .title(title)
-                        .description(
-                            "To continue, start a new thread from a summary or turn burn mode on.",
-                        )
-                        .primary_action(
-                            Button::new("start-new-thread", "Start New Thread")
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    let from_thread_id = Some(this.thread.read(cx).id().clone());
-                                    window.dispatch_action(
-                                        Box::new(NewThread { from_thread_id }),
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .secondary_action(
-                            IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
-                                .icon_size(IconSize::XSmall)
-                                .on_click(cx.listener(|this, _event, window, cx| {
-                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                                })),
-                        ),
-                ),
+                .child(ui::Callout::multi_line(
+                    title,
+                    message,
+                    icon,
+                    "Start New Thread",
+                    Box::new(cx.listener(|this, _, window, cx| {
+                        let from_thread_id = Some(this.thread.read(cx).id().clone());
+                        window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);
+                    })),
+                ))
+                .line_height(line_height),
        )
    }

@@ -1471,8 +1472,6 @@ impl Render for MessageEditor {
                total_token_usage.ratio()
            });

-        let burn_mode_enabled = thread.completion_mode() == CompletionMode::Burn;
-
        let action_log = self.thread.read(cx).action_log();
        let changed_buffers = action_log.read(cx).changed_buffers(cx);

@@ -1489,7 +1488,7 @@ impl Render for MessageEditor {

                if usage_callout.is_some() {
                    usage_callout
-                } else if token_usage_ratio != TokenUsageRatio::Normal && !burn_mode_enabled {
+                } else if token_usage_ratio != TokenUsageRatio::Normal {
                    self.render_token_limit_callout(line_height, token_usage_ratio, cx)
                } else {
                    None
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -1,24 +1,26 @@
 use std::sync::Arc;

-use agent_settings::{AgentDockPosition, AgentProfileId, AgentSettings, builtin_profiles};
+use agent_settings::{
+    AgentDockPosition, AgentProfile, AgentProfileId, AgentSettings, GroupedAgentProfiles,
+    builtin_profiles,
+};
 use fs::Fs;
-use gpui::{Action, Empty, Entity, FocusHandle, Subscription, prelude::*};
+use gpui::{Action, Empty, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
 use language_model::LanguageModelRegistry;
 use settings::{Settings as _, SettingsStore, update_settings_file};
 use ui::{
    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, Tooltip,
    prelude::*,
 };
+use util::ResultExt as _;

-use crate::{
-    ManageProfiles, Thread, ToggleProfileSelector,
-    agent_profile::{AgentProfile, AvailableProfiles},
-};
+use crate::{ManageProfiles, Thread, ThreadStore, ToggleProfileSelector};

 pub struct ProfileSelector {
-    profiles: AvailableProfiles,
+    profiles: GroupedAgentProfiles,
    fs: Arc<dyn Fs>,
    thread: Entity<Thread>,
+    thread_store: WeakEntity<ThreadStore>,
    menu_handle: PopoverMenuHandle<ContextMenu>,
    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
@@ -28,6 +30,7 @@ impl ProfileSelector {
    pub fn new(
        fs: Arc<dyn Fs>,
        thread: Entity<Thread>,
+        thread_store: WeakEntity<ThreadStore>,
        focus_handle: FocusHandle,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -36,9 +39,10 @@ impl ProfileSelector {
        });

        Self {
-            profiles: AgentProfile::available_profiles(cx),
+            profiles: GroupedAgentProfiles::from_settings(AgentSettings::get_global(cx)),
            fs,
            thread,
+            thread_store,
            menu_handle: PopoverMenuHandle::default(),
            focus_handle,
            _subscriptions: vec![settings_subscription],
@@ -50,7 +54,7 @@ impl ProfileSelector {
    }

    fn refresh_profiles(&mut self, cx: &mut Context<Self>) {
-        self.profiles = AgentProfile::available_profiles(cx);
+        self.profiles = GroupedAgentProfiles::from_settings(AgentSettings::get_global(cx));
    }

    fn build_context_menu(
@@ -60,30 +64,21 @@ impl ProfileSelector {
    ) -> Entity<ContextMenu> {
        ContextMenu::build(window, cx, |mut menu, _window, cx| {
            let settings = AgentSettings::get_global(cx);
-
-            let mut found_non_builtin = false;
-            for (profile_id, profile_name) in self.profiles.iter() {
-                if !builtin_profiles::is_builtin(profile_id) {
-                    found_non_builtin = true;
-                    continue;
-                }
+            for (profile_id, profile) in self.profiles.builtin.iter() {
                menu = menu.item(self.menu_entry_for_profile(
                    profile_id.clone(),
-                    profile_name,
+                    profile,
                    settings,
                    cx,
                ));
            }

-            if found_non_builtin {
+            if !self.profiles.custom.is_empty() {
                menu = menu.separator().header("Custom Profiles");
-                for (profile_id, profile_name) in self.profiles.iter() {
-                    if builtin_profiles::is_builtin(profile_id) {
-                        continue;
-                    }
+                for (profile_id, profile) in self.profiles.custom.iter() {
                    menu = menu.item(self.menu_entry_for_profile(
                        profile_id.clone(),
-                        profile_name,
+                        profile,
                        settings,
                        cx,
                    ));
@@ -104,20 +99,19 @@ impl ProfileSelector {
    fn menu_entry_for_profile(
        &self,
        profile_id: AgentProfileId,
-        profile_name: &SharedString,
+        profile: &AgentProfile,
        settings: &AgentSettings,
-        cx: &App,
+        _cx: &App,
    ) -> ContextMenuEntry {
-        let documentation = match profile_name.to_lowercase().as_str() {
+        let documentation = match profile.name.to_lowercase().as_str() {
            builtin_profiles::WRITE => Some("Get help to write anything."),
            builtin_profiles::ASK => Some("Chat about your codebase."),
            builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
            _ => None,
        };
-        let thread_profile_id = self.thread.read(cx).profile().id();

-        let entry = ContextMenuEntry::new(profile_name.clone())
-            .toggleable(IconPosition::End, &profile_id == thread_profile_id);
+        let entry = ContextMenuEntry::new(profile.name.clone())
+            .toggleable(IconPosition::End, profile_id == settings.default_profile);

        let entry = if let Some(doc_text) = documentation {
            entry.documentation_aside(documentation_side(settings.dock), move |_| {
@@ -129,7 +123,7 @@ impl ProfileSelector {

        entry.handler({
            let fs = self.fs.clone();
-            let thread = self.thread.clone();
+            let thread_store = self.thread_store.clone();
            let profile_id = profile_id.clone();
            move |_window, cx| {
                update_settings_file::<AgentSettings>(fs.clone(), cx, {
@@ -139,9 +133,11 @@ impl ProfileSelector {
                    }
                });

-                thread.update(cx, |this, cx| {
-                    this.set_profile(profile_id.clone(), cx);
-                });
+                thread_store
+                    .update(cx, |this, cx| {
+                        this.load_profile_by_id(profile_id.clone(), cx);
+                    })
+                    .log_err();
            }
        })
    }
@@ -150,7 +146,7 @@ impl ProfileSelector {
 impl Render for ProfileSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AgentSettings::get_global(cx);
-        let profile_id = self.thread.read(cx).profile().id();
+        let profile_id = &settings.default_profile;
        let profile = settings.profiles.get(profile_id);

        let selected_profile = profile
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -4,7 +4,7 @@ use std::ops::Range;
 use std::sync::Arc;
 use std::time::Instant;

-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
+use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
@@ -41,7 +41,6 @@ use uuid::Uuid;
 use zed_llm_client::{CompletionIntent, CompletionRequestStatus};

 use crate::ThreadStore;
-use crate::agent_profile::AgentProfile;
 use crate::context::{AgentContext, AgentContextHandle, ContextLoadResult, LoadedContext};
 use crate::thread_store::{
    SerializedCrease, SerializedLanguageModel, SerializedMessage, SerializedMessageSegment,
@@ -195,20 +194,20 @@ impl MessageSegment {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProjectSnapshot {
    pub worktree_snapshots: Vec<WorktreeSnapshot>,
    pub unsaved_buffer_paths: Vec<String>,
    pub timestamp: DateTime<Utc>,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WorktreeSnapshot {
    pub worktree_path: String,
    pub git_state: Option<GitState>,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct GitState {
    pub remote_url: Option<String>,
    pub head_sha: Option<String>,
@@ -247,7 +246,7 @@ impl LastRestoreCheckpoint {
    }
 }

-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub enum DetailedSummaryState {
    #[default]
    NotGenerated,
@@ -361,7 +360,6 @@ pub struct Thread {
    >,
    remaining_turns: u32,
    configured_model: Option<ConfiguredModel>,
-    profile: AgentProfile,
 }

 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -391,7 +389,7 @@ impl ThreadSummary {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExceededWindowError {
    /// Model used when last message exceeded context window
    model_id: LanguageModelId,
@@ -409,7 +407,6 @@ impl Thread {
    ) -> Self {
        let (detailed_summary_tx, detailed_summary_rx) = postage::watch::channel();
        let configured_model = LanguageModelRegistry::read_global(cx).default_model();
-        let profile_id = AgentSettings::get_global(cx).default_profile.clone();

        Self {
            id: ThreadId::new(),
@@ -452,7 +449,6 @@ impl Thread {
            request_callback: None,
            remaining_turns: u32::MAX,
            configured_model,
-            profile: AgentProfile::new(profile_id, tools),
        }
    }

@@ -499,9 +495,6 @@ impl Thread {
        let completion_mode = serialized
            .completion_mode
            .unwrap_or_else(|| AgentSettings::get_global(cx).preferred_completion_mode);
-        let profile_id = serialized
-            .profile
-            .unwrap_or_else(|| AgentSettings::get_global(cx).default_profile.clone());

        Self {
            id,
@@ -561,7 +554,7 @@ impl Thread {
            pending_checkpoint: None,
            project: project.clone(),
            prompt_builder,
-            tools: tools.clone(),
+            tools,
            tool_use,
            action_log: cx.new(|_| ActionLog::new(project)),
            initial_project_snapshot: Task::ready(serialized.initial_project_snapshot).shared(),
@@ -577,7 +570,6 @@ impl Thread {
            request_callback: None,
            remaining_turns: u32::MAX,
            configured_model,
-            profile: AgentProfile::new(profile_id, tools),
        }
    }

@@ -593,17 +585,6 @@ impl Thread {
        &self.id
    }

-    pub fn profile(&self) -> &AgentProfile {
-        &self.profile
-    }
-
-    pub fn set_profile(&mut self, id: AgentProfileId, cx: &mut Context<Self>) {
-        if &id != self.profile.id() {
-            self.profile = AgentProfile::new(id, self.tools.clone());
-            cx.emit(ThreadEvent::ProfileChanged);
-        }
-    }
-
    pub fn is_empty(&self) -> bool {
        self.messages.is_empty()
    }
@@ -938,7 +919,8 @@ impl Thread {
        model: Arc<dyn LanguageModel>,
    ) -> Vec<LanguageModelRequestTool> {
        if model.supports_tools() {
-            self.profile
+            self.tools()
+                .read(cx)
                .enabled_tools(cx)
                .into_iter()
                .filter_map(|tool| {
@@ -1198,7 +1180,6 @@ impl Thread {
                    }),
                completion_mode: Some(this.completion_mode),
                tool_use_limit_reached: this.tool_use_limit_reached,
-                profile: Some(this.profile.id().clone()),
            })
        })
    }
@@ -1563,9 +1544,6 @@ impl Thread {
                            Err(LanguageModelCompletionError::Other(error)) => {
                                return Err(error);
                            }
-                            Err(err @ LanguageModelCompletionError::RateLimit(..)) => {
-                                return Err(err.into());
-                            }
                        };

                        match event {
@@ -2143,7 +2121,7 @@ impl Thread {
        window: Option<AnyWindowHandle>,
        cx: &mut Context<Thread>,
    ) {
-        let available_tools = self.profile.enabled_tools(cx);
+        let available_tools = self.tools.read(cx).enabled_tools(cx);

        let tool_list = available_tools
            .iter()
@@ -2235,15 +2213,19 @@ impl Thread {
    ) -> Task<()> {
        let tool_name: Arc<str> = tool.name().into();

-        let tool_result = tool.run(
-            input,
-            request,
-            self.project.clone(),
-            self.action_log.clone(),
-            model,
-            window,
-            cx,
-        );
+        let tool_result = if self.tools.read(cx).is_disabled(&tool.source(), &tool_name) {
+            Task::ready(Err(anyhow!("tool is disabled: {tool_name}"))).into()
+        } else {
+            tool.run(
+                input,
+                request,
+                self.project.clone(),
+                self.action_log.clone(),
+                model,
+                window,
+                cx,
+            )
+        };

        // Store the card separately if it exists
        if let Some(card) = tool_result.card.clone() {
@@ -2362,7 +2344,8 @@ impl Thread {
        let client = self.project.read(cx).client();

        let enabled_tool_names: Vec<String> = self
-            .profile
+            .tools()
+            .read(cx)
            .enabled_tools(cx)
            .iter()
            .map(|tool| tool.name())
@@ -2875,7 +2858,6 @@ pub enum ThreadEvent {
    ToolUseLimitReached,
    CancelEditing,
    CompletionCanceled,
-    ProfileChanged,
 }

 impl EventEmitter<ThreadEvent> for Thread {}
@@ -2890,7 +2872,7 @@ struct PendingCompletion {
 mod tests {
    use super::*;
    use crate::{ThreadStore, context::load_context, context_store::ContextStore, thread_store};
-    use agent_settings::{AgentProfileId, AgentSettings, LanguageModelParameters};
+    use agent_settings::{AgentSettings, LanguageModelParameters};
    use assistant_tool::ToolRegistry;
    use editor::EditorSettings;
    use gpui::TestAppContext;
@@ -3303,71 +3285,6 @@ fn main() {{
        );
    }

-    #[gpui::test]
-    async fn test_storing_profile_setting_per_thread(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(
-            cx,
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let (_workspace, thread_store, thread, _context_store, _model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        // Check that we are starting with the default profile
-        let profile = cx.read(|cx| thread.read(cx).profile.clone());
-        let tool_set = cx.read(|cx| thread_store.read(cx).tools());
-        assert_eq!(
-            profile,
-            AgentProfile::new(AgentProfileId::default(), tool_set)
-        );
-    }
-
-    #[gpui::test]
-    async fn test_serializing_thread_profile(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(
-            cx,
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let (_workspace, thread_store, thread, _context_store, _model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        // Profile gets serialized with default values
-        let serialized = thread
-            .update(cx, |thread, cx| thread.serialize(cx))
-            .await
-            .unwrap();
-
-        assert_eq!(serialized.profile, Some(AgentProfileId::default()));
-
-        let deserialized = cx.update(|cx| {
-            thread.update(cx, |thread, cx| {
-                Thread::deserialize(
-                    thread.id.clone(),
-                    serialized,
-                    thread.project.clone(),
-                    thread.tools.clone(),
-                    thread.prompt_builder.clone(),
-                    thread.project_context.clone(),
-                    None,
-                    cx,
-                )
-            })
-        });
-        let tool_set = cx.read(|cx| thread_store.read(cx).tools());
-
-        assert_eq!(
-            deserialized.profile,
-            AgentProfile::new(AgentProfileId::default(), tool_set)
-        );
-    }
-
    #[gpui::test]
    async fn test_temperature_setting(cx: &mut TestAppContext) {
        init_test_settings(cx);
--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -594,11 +594,10 @@ impl Render for ThreadHistory {
                    view.pr_5()
                        .child(
                            uniform_list(
+                                cx.entity().clone(),
                                "thread-history",
                                self.list_item_count(),
-                                cx.processor(|this, range: Range<usize>, window, cx| {
-                                    this.list_items(range, window, cx)
-                                }),
+                                Self::list_items,
                            )
                            .p_1()
                            .track_scroll(self.scroll_handle.clone())
@@ -672,7 +671,7 @@ impl RenderOnce for HistoryEntryElement {
            ),
            HistoryEntry::Context(context) => (
                context.path.to_string_lossy().to_string(),
-                context.title.clone(),
+                context.title.clone().into(),
                context.mtime.timestamp(),
            ),
        };
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -3,9 +3,9 @@ use std::path::{Path, PathBuf};
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};

-use agent_settings::{AgentProfileId, CompletionMode};
+use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ToolId, ToolWorkingSet};
+use assistant_tool::{ToolId, ToolSource, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
 use context_server::ContextServerId;
@@ -25,6 +25,7 @@ use prompt_store::{
    UserRulesContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
+use settings::{Settings as _, SettingsStore};
 use ui::Window;
 use util::ResultExt as _;

@@ -89,7 +90,7 @@ pub fn init(cx: &mut App) {
 pub struct SharedProjectContext(Rc<RefCell<Option<ProjectContext>>>);

 impl SharedProjectContext {
-    pub fn borrow(&self) -> Ref<'_, Option<ProjectContext>> {
+    pub fn borrow(&self) -> Ref<Option<ProjectContext>> {
        self.0.borrow()
    }
 }
@@ -146,7 +147,12 @@ impl ThreadStore {
        prompt_store: Option<Entity<PromptStore>>,
        cx: &mut Context<Self>,
    ) -> (Self, oneshot::Receiver<()>) {
-        let mut subscriptions = vec![cx.subscribe(&project, Self::handle_project_event)];
+        let mut subscriptions = vec![
+            cx.observe_global::<SettingsStore>(move |this: &mut Self, cx| {
+                this.load_default_profile(cx);
+            }),
+            cx.subscribe(&project, Self::handle_project_event),
+        ];

        if let Some(prompt_store) = prompt_store.as_ref() {
            subscriptions.push(cx.subscribe(
@@ -194,6 +200,7 @@ impl ThreadStore {
            _reload_system_prompt_task: reload_system_prompt_task,
            _subscriptions: subscriptions,
        };
+        this.load_default_profile(cx);
        this.register_context_server_handlers(cx);
        this.reload(cx).detach_and_log_err(cx);
        (this, ready_rx)
@@ -305,19 +312,17 @@ impl ThreadStore {
        project: Entity<Project>,
        cx: &mut App,
    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
-        let tree = worktree.read(cx);
-        let root_name = tree.root_name().into();
-        let abs_path = tree.abs_path();
-
-        let mut context = WorktreeContext {
-            root_name,
-            abs_path,
-            rules_file: None,
-        };
+        let root_name = worktree.read(cx).root_name().into();

        let rules_task = Self::load_worktree_rules_file(worktree, project, cx);
        let Some(rules_task) = rules_task else {
-            return Task::ready((context, None));
+            return Task::ready((
+                WorktreeContext {
+                    root_name,
+                    rules_file: None,
+                },
+                None,
+            ));
        };

        cx.spawn(async move |_| {
@@ -330,8 +335,11 @@ impl ThreadStore {
                    }),
                ),
            };
-            context.rules_file = rules_file;
-            (context, rules_file_error)
+            let worktree_info = WorktreeContext {
+                root_name,
+                rules_file,
+            };
+            (worktree_info, rules_file_error)
        })
    }

@@ -340,12 +348,12 @@ impl ThreadStore {
        project: Entity<Project>,
        cx: &mut App,
    ) -> Option<Task<Result<RulesFileContext>>> {
-        let worktree = worktree.read(cx);
-        let worktree_id = worktree.id();
+        let worktree_ref = worktree.read(cx);
+        let worktree_id = worktree_ref.id();
        let selected_rules_file = RULES_FILE_NAMES
            .into_iter()
            .filter_map(|name| {
-                worktree
+                worktree_ref
                    .entry_for_path(name)
                    .filter(|entry| entry.is_file())
                    .map(|entry| entry.path.clone())
@@ -392,11 +400,16 @@ impl ThreadStore {
        self.threads.len()
    }

-    pub fn reverse_chronological_threads(&self) -> impl Iterator<Item = &SerializedThreadMetadata> {
-        // ordering is from "ORDER BY" in `list_threads`
+    pub fn unordered_threads(&self) -> impl Iterator<Item = &SerializedThreadMetadata> {
        self.threads.iter()
    }

+    pub fn reverse_chronological_threads(&self) -> Vec<SerializedThreadMetadata> {
+        let mut threads = self.threads.iter().cloned().collect::<Vec<_>>();
+        threads.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.updated_at));
+        threads
+    }
+
    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
        cx.new(|cx| {
            Thread::new(
@@ -507,17 +520,94 @@ impl ThreadStore {
        })
    }

-    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
-        let context_server_store = self.project.read(cx).context_server_store();
-        cx.subscribe(&context_server_store, Self::handle_context_server_event)
-            .detach();
+    fn load_default_profile(&self, cx: &mut Context<Self>) {
+        let assistant_settings = AgentSettings::get_global(cx);

-        // Check for any servers that were already running before the handler was registered
-        for server in context_server_store.read(cx).running_servers() {
-            self.load_context_server_tools(server.id(), context_server_store.clone(), cx);
+        self.load_profile_by_id(assistant_settings.default_profile.clone(), cx);
+    }
+
+    pub fn load_profile_by_id(&self, profile_id: AgentProfileId, cx: &mut Context<Self>) {
+        let assistant_settings = AgentSettings::get_global(cx);
+
+        if let Some(profile) = assistant_settings.profiles.get(&profile_id) {
+            self.load_profile(profile.clone(), cx);
        }
    }

+    pub fn load_profile(&self, profile: AgentProfile, cx: &mut Context<Self>) {
+        self.tools.update(cx, |tools, cx| {
+            tools.disable_all_tools(cx);
+            tools.enable(
+                ToolSource::Native,
+                &profile
+                    .tools
+                    .into_iter()
+                    .filter_map(|(tool, enabled)| enabled.then(|| tool))
+                    .collect::<Vec<_>>(),
+                cx,
+            );
+        });
+
+        if profile.enable_all_context_servers {
+            for context_server_id in self
+                .project
+                .read(cx)
+                .context_server_store()
+                .read(cx)
+                .all_server_ids()
+            {
+                self.tools.update(cx, |tools, cx| {
+                    tools.enable_source(
+                        ToolSource::ContextServer {
+                            id: context_server_id.0.into(),
+                        },
+                        cx,
+                    );
+                });
+            }
+            // Enable all the tools from all context servers, but disable the ones that are explicitly disabled
+            for (context_server_id, preset) in profile.context_servers {
+                self.tools.update(cx, |tools, cx| {
+                    tools.disable(
+                        ToolSource::ContextServer {
+                            id: context_server_id.into(),
+                        },
+                        &preset
+                            .tools
+                            .into_iter()
+                            .filter_map(|(tool, enabled)| (!enabled).then(|| tool))
+                            .collect::<Vec<_>>(),
+                        cx,
+                    )
+                })
+            }
+        } else {
+            for (context_server_id, preset) in profile.context_servers {
+                self.tools.update(cx, |tools, cx| {
+                    tools.enable(
+                        ToolSource::ContextServer {
+                            id: context_server_id.into(),
+                        },
+                        &preset
+                            .tools
+                            .into_iter()
+                            .filter_map(|(tool, enabled)| enabled.then(|| tool))
+                            .collect::<Vec<_>>(),
+                        cx,
+                    )
+                })
+            }
+        }
+    }
+
+    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
+        cx.subscribe(
+            &self.project.read(cx).context_server_store(),
+            Self::handle_context_server_event,
+        )
+        .detach();
+    }
+
    fn handle_context_server_event(
        &mut self,
        context_server_store: Entity<ContextServerStore>,
@@ -528,71 +618,71 @@ impl ThreadStore {
        match event {
            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
                match status {
-                    ContextServerStatus::Starting => {}
                    ContextServerStatus::Running => {
-                        self.load_context_server_tools(server_id.clone(), context_server_store, cx);
+                        if let Some(server) =
+                            context_server_store.read(cx).get_running_server(server_id)
+                        {
+                            let context_server_manager = context_server_store.clone();
+                            cx.spawn({
+                                let server = server.clone();
+                                let server_id = server_id.clone();
+                                async move |this, cx| {
+                                    let Some(protocol) = server.client() else {
+                                        return;
+                                    };
+
+                                    if protocol.capable(context_server::protocol::ServerCapability::Tools) {
+                                        if let Some(tools) = protocol.list_tools().await.log_err() {
+                                            let tool_ids = tool_working_set
+                                                .update(cx, |tool_working_set, _| {
+                                                    tools
+                                                        .tools
+                                                        .into_iter()
+                                                        .map(|tool| {
+                                                            log::info!(
+                                                                "registering context server tool: {:?}",
+                                                                tool.name
+                                                            );
+                                                            tool_working_set.insert(Arc::new(
+                                                                ContextServerTool::new(
+                                                                    context_server_manager.clone(),
+                                                                    server.id(),
+                                                                    tool,
+                                                                ),
+                                                            ))
+                                                        })
+                                                        .collect::<Vec<_>>()
+                                                })
+                                                .log_err();
+
+                                            if let Some(tool_ids) = tool_ids {
+                                                this.update(cx, |this, cx| {
+                                                    this.context_server_tool_ids
+                                                        .insert(server_id, tool_ids);
+                                                    this.load_default_profile(cx);
+                                                })
+                                                .log_err();
+                                            }
+                                        }
+                                    }
+                                }
+                            })
+                            .detach();
+                        }
                    }
                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
                        if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
                            tool_working_set.update(cx, |tool_working_set, _| {
                                tool_working_set.remove(&tool_ids);
                            });
+                            self.load_default_profile(cx);
                        }
                    }
+                    _ => {}
                }
            }
        }
    }
-
-    fn load_context_server_tools(
-        &self,
-        server_id: ContextServerId,
-        context_server_store: Entity<ContextServerStore>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(server) = context_server_store.read(cx).get_running_server(&server_id) else {
-            return;
-        };
-        let tool_working_set = self.tools.clone();
-        cx.spawn(async move |this, cx| {
-            let Some(protocol) = server.client() else {
-                return;
-            };
-
-            if protocol.capable(context_server::protocol::ServerCapability::Tools) {
-                if let Some(response) = protocol
-                    .request::<context_server::types::requests::ListTools>(())
-                    .await
-                    .log_err()
-                {
-                    let tool_ids = tool_working_set
-                        .update(cx, |tool_working_set, _| {
-                            response
-                                .tools
-                                .into_iter()
-                                .map(|tool| {
-                                    log::info!("registering context server tool: {:?}", tool.name);
-                                    tool_working_set.insert(Arc::new(ContextServerTool::new(
-                                        context_server_store.clone(),
-                                        server.id(),
-                                        tool,
-                                    )))
-                                })
-                                .collect::<Vec<_>>()
-                        })
-                        .log_err();
-
-                    if let Some(tool_ids) = tool_ids {
-                        this.update(cx, |this, _| {
-                            this.context_server_tool_ids.insert(server_id, tool_ids);
-                        })
-                        .log_err();
-                    }
-                }
-            }
-        })
-        .detach();
-    }
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -602,7 +692,7 @@ pub struct SerializedThreadMetadata {
    pub updated_at: DateTime<Utc>,
 }

-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct SerializedThread {
    pub version: String,
    pub summary: SharedString,
@@ -624,11 +714,9 @@ pub struct SerializedThread {
    pub completion_mode: Option<CompletionMode>,
    #[serde(default)]
    pub tool_use_limit_reached: bool,
-    #[serde(default)]
-    pub profile: Option<AgentProfileId>,
 }

-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct SerializedLanguageModel {
    pub provider: String,
    pub model: String,
@@ -689,15 +777,11 @@ impl SerializedThreadV0_1_0 {
            messages.push(message);
        }

-        SerializedThread {
-            messages,
-            version: SerializedThread::VERSION.to_string(),
-            ..self.0
-        }
+        SerializedThread { messages, ..self.0 }
    }
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct SerializedMessage {
    pub id: MessageId,
    pub role: Role,
@@ -715,7 +799,7 @@ pub struct SerializedMessage {
    pub is_hidden: bool,
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum SerializedMessageSegment {
    #[serde(rename = "text")]
@@ -733,14 +817,14 @@ pub enum SerializedMessageSegment {
    },
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct SerializedToolUse {
    pub id: LanguageModelToolUseId,
    pub name: SharedString,
    pub input: serde_json::Value,
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct SerializedToolResult {
    pub tool_use_id: LanguageModelToolUseId,
    pub is_error: bool,
@@ -772,7 +856,6 @@ impl LegacySerializedThread {
            model: None,
            completion_mode: None,
            tool_use_limit_reached: false,
-            profile: None,
        }
    }
 }
@@ -803,7 +886,7 @@ impl LegacySerializedMessage {
    }
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct SerializedCrease {
    pub start: usize,
    pub end: usize,
@@ -922,7 +1005,7 @@ impl ThreadsDatabase {

            fn bytes_encode(
                item: &Self::EItem,
-            ) -> Result<std::borrow::Cow<'_, [u8]>, heed::BoxedError> {
+            ) -> Result<std::borrow::Cow<[u8]>, heed::BoxedError> {
                serde_json::to_vec(&item.0)
                    .map(std::borrow::Cow::Owned)
                    .map_err(Into::into)
@@ -1060,181 +1143,3 @@ impl ThreadsDatabase {
        })
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::thread::{DetailedSummaryState, MessageId};
-    use chrono::Utc;
-    use language_model::{Role, TokenUsage};
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_legacy_serialized_thread_upgrade() {
-        let updated_at = Utc::now();
-        let legacy_thread = LegacySerializedThread {
-            summary: "Test conversation".into(),
-            updated_at,
-            messages: vec![LegacySerializedMessage {
-                id: MessageId(1),
-                role: Role::User,
-                text: "Hello, world!".to_string(),
-                tool_uses: vec![],
-                tool_results: vec![],
-            }],
-            initial_project_snapshot: None,
-        };
-
-        let upgraded = legacy_thread.upgrade();
-
-        assert_eq!(
-            upgraded,
-            SerializedThread {
-                summary: "Test conversation".into(),
-                updated_at,
-                messages: vec![SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Hello, world!".to_string()
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false
-                }],
-                version: SerializedThread::VERSION.to_string(),
-                initial_project_snapshot: None,
-                cumulative_token_usage: TokenUsage::default(),
-                request_token_usage: vec![],
-                detailed_summary_state: DetailedSummaryState::default(),
-                exceeded_window_error: None,
-                model: None,
-                completion_mode: None,
-                tool_use_limit_reached: false,
-                profile: None
-            }
-        )
-    }
-
-    #[test]
-    fn test_serialized_threadv0_1_0_upgrade() {
-        let updated_at = Utc::now();
-        let thread_v0_1_0 = SerializedThreadV0_1_0(SerializedThread {
-            summary: "Test conversation".into(),
-            updated_at,
-            messages: vec![
-                SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Use tool_1".to_string(),
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-                SerializedMessage {
-                    id: MessageId(2),
-                    role: Role::Assistant,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "I want to use a tool".to_string(),
-                    }],
-                    tool_uses: vec![SerializedToolUse {
-                        id: "abc".into(),
-                        name: "tool_1".into(),
-                        input: serde_json::Value::Null,
-                    }],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-                SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Here is the tool result".to_string(),
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![SerializedToolResult {
-                        tool_use_id: "abc".into(),
-                        is_error: false,
-                        content: LanguageModelToolResultContent::Text("abcdef".into()),
-                        output: Some(serde_json::Value::Null),
-                    }],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-            ],
-            version: SerializedThreadV0_1_0::VERSION.to_string(),
-            initial_project_snapshot: None,
-            cumulative_token_usage: TokenUsage::default(),
-            request_token_usage: vec![],
-            detailed_summary_state: DetailedSummaryState::default(),
-            exceeded_window_error: None,
-            model: None,
-            completion_mode: None,
-            tool_use_limit_reached: false,
-            profile: None,
-        });
-        let upgraded = thread_v0_1_0.upgrade();
-
-        assert_eq!(
-            upgraded,
-            SerializedThread {
-                summary: "Test conversation".into(),
-                updated_at,
-                messages: vec![
-                    SerializedMessage {
-                        id: MessageId(1),
-                        role: Role::User,
-                        segments: vec![SerializedMessageSegment::Text {
-                            text: "Use tool_1".to_string()
-                        }],
-                        tool_uses: vec![],
-                        tool_results: vec![],
-                        context: "".to_string(),
-                        creases: vec![],
-                        is_hidden: false
-                    },
-                    SerializedMessage {
-                        id: MessageId(2),
-                        role: Role::Assistant,
-                        segments: vec![SerializedMessageSegment::Text {
-                            text: "I want to use a tool".to_string(),
-                        }],
-                        tool_uses: vec![SerializedToolUse {
-                            id: "abc".into(),
-                            name: "tool_1".into(),
-                            input: serde_json::Value::Null,
-                        }],
-                        tool_results: vec![SerializedToolResult {
-                            tool_use_id: "abc".into(),
-                            is_error: false,
-                            content: LanguageModelToolResultContent::Text("abcdef".into()),
-                            output: Some(serde_json::Value::Null),
-                        }],
-                        context: "".to_string(),
-                        creases: vec![],
-                        is_hidden: false,
-                    },
-                ],
-                version: SerializedThread::VERSION.to_string(),
-                initial_project_snapshot: None,
-                cumulative_token_usage: TokenUsage::default(),
-                request_token_usage: vec![],
-                detailed_summary_state: DetailedSummaryState::default(),
-                exceeded_window_error: None,
-                model: None,
-                completion_mode: None,
-                tool_use_limit_reached: false,
-                profile: None
-            }
-        )
-    }
-}
--- a/crates/agent/src/tool_compatibility.rs
+++ b/crates/agent/src/tool_compatibility.rs
@@ -1,33 +1,30 @@
 use std::sync::Arc;

-use assistant_tool::{Tool, ToolSource};
+use assistant_tool::{Tool, ToolSource, ToolWorkingSet, ToolWorkingSetEvent};
 use collections::HashMap;
 use gpui::{App, Context, Entity, IntoElement, Render, Subscription, Window};
 use language_model::{LanguageModel, LanguageModelToolSchemaFormat};
 use ui::prelude::*;

-use crate::{Thread, ThreadEvent};
-
 pub struct IncompatibleToolsState {
    cache: HashMap<LanguageModelToolSchemaFormat, Vec<Arc<dyn Tool>>>,
-    thread: Entity<Thread>,
-    _thread_subscription: Subscription,
+    tool_working_set: Entity<ToolWorkingSet>,
+    _tool_working_set_subscription: Subscription,
 }

 impl IncompatibleToolsState {
-    pub fn new(thread: Entity<Thread>, cx: &mut Context<Self>) -> Self {
+    pub fn new(tool_working_set: Entity<ToolWorkingSet>, cx: &mut Context<Self>) -> Self {
        let _tool_working_set_subscription =
-            cx.subscribe(&thread, |this, _, event, _| match event {
-                ThreadEvent::ProfileChanged => {
+            cx.subscribe(&tool_working_set, |this, _, event, _| match event {
+                ToolWorkingSetEvent::EnabledToolsChanged => {
                    this.cache.clear();
                }
-                _ => {}
            });

        Self {
            cache: HashMap::default(),
-            thread,
-            _thread_subscription: _tool_working_set_subscription,
+            tool_working_set,
+            _tool_working_set_subscription,
        }
    }

@@ -39,9 +36,8 @@ impl IncompatibleToolsState {
        self.cache
            .entry(model.tool_input_format())
            .or_insert_with(|| {
-                self.thread
+                self.tool_working_set
                    .read(cx)
-                    .profile()
                    .enabled_tools(cx)
                    .iter()
                    .filter(|tool| tool.input_schema(model.tool_input_format()).is_err())
--- a/crates/agent/src/ui/preview/usage_callouts.rs
+++ b/crates/agent/src/ui/preview/usage_callouts.rs
@@ -2,7 +2,7 @@ use client::zed_urls;
 use component::{empty_example, example_group_with_title, single_example};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use language_model::RequestUsage;
-use ui::{Callout, prelude::*};
+use ui::{Callout, Color, Icon, IconName, IconSize, prelude::*};
 use zed_llm_client::{Plan, UsageLimit};

 #[derive(IntoElement, RegisterComponent)]
@@ -91,23 +91,16 @@ impl RenderOnce for UsageCallout {
                .size(IconSize::XSmall)
        };

-        div()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                Callout::new()
-                    .icon(icon)
-                    .title(title)
-                    .description(message)
-                    .primary_action(
-                        Button::new("upgrade", button_text)
-                            .label_size(LabelSize::Small)
-                            .on_click(move |_, _, cx| {
-                                cx.open_url(&url);
-                            }),
-                    ),
-            )
-            .into_any_element()
+        Callout::multi_line(
+            title,
+            message,
+            icon,
+            button_text,
+            Box::new(move |_, _, cx| {
+                cx.open_url(&url);
+            }),
+        )
+        .into_any_element()
    }
 }

@@ -196,8 +189,10 @@ impl Component for UsageCallout {
        );

        Some(
-            v_flex()
+            div()
                .p_4()
+                .flex()
+                .flex_col()
                .gap_4()
                .child(free_examples)
                .child(trial_examples)
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -16,6 +16,7 @@ anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
 collections.workspace = true
 gpui.workspace = true
+indexmap.workspace = true
 language_model.workspace = true
 lmstudio = { workspace = true, features = ["schemars"] }
 log.workspace = true
--- a/crates/agent_settings/src/agent_profile.rs
+++ b/crates/agent_settings/src/agent_profile.rs
@@ -17,6 +17,29 @@ pub mod builtin_profiles {
    }
 }

+#[derive(Default)]
+pub struct GroupedAgentProfiles {
+    pub builtin: IndexMap<AgentProfileId, AgentProfile>,
+    pub custom: IndexMap<AgentProfileId, AgentProfile>,
+}
+
+impl GroupedAgentProfiles {
+    pub fn from_settings(settings: &crate::AgentSettings) -> Self {
+        let mut builtin = IndexMap::default();
+        let mut custom = IndexMap::default();
+
+        for (profile_id, profile) in settings.profiles.clone() {
+            if builtin_profiles::is_builtin(&profile_id) {
+                builtin.insert(profile_id, profile);
+            } else {
+                custom.insert(profile_id, profile);
+            }
+        }
+
+        Self { builtin, custom }
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct AgentProfileId(pub Arc<str>);

@@ -40,7 +63,7 @@ impl Default for AgentProfileId {

 /// A profile for the Zed Agent that controls its behavior.
 #[derive(Debug, Clone)]
-pub struct AgentProfileSettings {
+pub struct AgentProfile {
    /// The name of the profile.
    pub name: SharedString,
    pub tools: IndexMap<Arc<str>, bool>,
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -102,7 +102,7 @@ pub struct AgentSettings {
    pub using_outdated_settings_version: bool,
    pub default_profile: AgentProfileId,
    pub default_view: DefaultView,
-    pub profiles: IndexMap<AgentProfileId, AgentProfileSettings>,
+    pub profiles: IndexMap<AgentProfileId, AgentProfile>,
    pub always_allow_tool_actions: bool,
    pub notify_when_agent_waiting: NotifyWhenAgentWaiting,
    pub play_sound_when_agent_done: bool,
@@ -531,7 +531,7 @@ impl AgentSettingsContent {
    pub fn create_profile(
        &mut self,
        profile_id: AgentProfileId,
-        profile_settings: AgentProfileSettings,
+        profile: AgentProfile,
    ) -> Result<()> {
        self.v2_setting(|settings| {
            let profiles = settings.profiles.get_or_insert_default();
@@ -542,10 +542,10 @@ impl AgentSettingsContent {
            profiles.insert(
                profile_id,
                AgentProfileContent {
-                    name: profile_settings.name.into(),
-                    tools: profile_settings.tools,
-                    enable_all_context_servers: Some(profile_settings.enable_all_context_servers),
-                    context_servers: profile_settings
+                    name: profile.name.into(),
+                    tools: profile.tools,
+                    enable_all_context_servers: Some(profile.enable_all_context_servers),
+                    context_servers: profile
                        .context_servers
                        .into_iter()
                        .map(|(server_id, preset)| {
@@ -910,7 +910,7 @@ impl Settings for AgentSettings {
                    .extend(profiles.into_iter().map(|(id, profile)| {
                        (
                            id,
-                            AgentProfileSettings {
+                            AgentProfile {
                                name: profile.name.into(),
                                tools: profile.tools,
                                enable_all_context_servers: profile
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,5 +1,4 @@
 use std::str::FromStr;
-use std::time::Duration;

 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
@@ -33,6 +32,15 @@ pub enum AnthropicModelMode {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
+    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
+    Claude3_5Sonnet,
+    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
+    Claude3_7Sonnet,
+    #[serde(
+        rename = "claude-3-7-sonnet-thinking",
+        alias = "claude-3-7-sonnet-thinking-latest"
+    )]
+    Claude3_7SonnetThinking,
    #[serde(rename = "claude-opus-4", alias = "claude-opus-4-latest")]
    ClaudeOpus4,
    #[serde(
@@ -48,15 +56,6 @@ pub enum Model {
        alias = "claude-sonnet-4-thinking-latest"
    )]
    ClaudeSonnet4Thinking,
-    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
-    Claude3_7Sonnet,
-    #[serde(
-        rename = "claude-3-7-sonnet-thinking",
-        alias = "claude-3-7-sonnet-thinking-latest"
-    )]
-    Claude3_7SonnetThinking,
-    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
-    Claude3_5Sonnet,
    #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
    Claude3_5Haiku,
    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
@@ -90,66 +89,46 @@ impl Model {
    }

    pub fn from_id(id: &str) -> Result<Self> {
-        if id.starts_with("claude-opus-4-thinking") {
-            return Ok(Self::ClaudeOpus4Thinking);
-        }
-
-        if id.starts_with("claude-opus-4") {
-            return Ok(Self::ClaudeOpus4);
-        }
-
-        if id.starts_with("claude-sonnet-4-thinking") {
-            return Ok(Self::ClaudeSonnet4Thinking);
-        }
-
-        if id.starts_with("claude-sonnet-4") {
-            return Ok(Self::ClaudeSonnet4);
-        }
-
-        if id.starts_with("claude-3-7-sonnet-thinking") {
-            return Ok(Self::Claude3_7SonnetThinking);
-        }
-
-        if id.starts_with("claude-3-7-sonnet") {
-            return Ok(Self::Claude3_7Sonnet);
-        }
-
        if id.starts_with("claude-3-5-sonnet") {
-            return Ok(Self::Claude3_5Sonnet);
+            Ok(Self::Claude3_5Sonnet)
+        } else if id.starts_with("claude-3-7-sonnet-thinking") {
+            Ok(Self::Claude3_7SonnetThinking)
+        } else if id.starts_with("claude-3-7-sonnet") {
+            Ok(Self::Claude3_7Sonnet)
+        } else if id.starts_with("claude-3-5-haiku") {
+            Ok(Self::Claude3_5Haiku)
+        } else if id.starts_with("claude-3-opus") {
+            Ok(Self::Claude3Opus)
+        } else if id.starts_with("claude-3-sonnet") {
+            Ok(Self::Claude3Sonnet)
+        } else if id.starts_with("claude-3-haiku") {
+            Ok(Self::Claude3Haiku)
+        } else if id.starts_with("claude-opus-4-thinking") {
+            Ok(Self::ClaudeOpus4Thinking)
+        } else if id.starts_with("claude-opus-4") {
+            Ok(Self::ClaudeOpus4)
+        } else if id.starts_with("claude-sonnet-4-thinking") {
+            Ok(Self::ClaudeSonnet4Thinking)
+        } else if id.starts_with("claude-sonnet-4") {
+            Ok(Self::ClaudeSonnet4)
+        } else {
+            anyhow::bail!("invalid model id {id}");
        }
-
-        if id.starts_with("claude-3-5-haiku") {
-            return Ok(Self::Claude3_5Haiku);
-        }
-
-        if id.starts_with("claude-3-opus") {
-            return Ok(Self::Claude3Opus);
-        }
-
-        if id.starts_with("claude-3-sonnet") {
-            return Ok(Self::Claude3Sonnet);
-        }
-
-        if id.starts_with("claude-3-haiku") {
-            return Ok(Self::Claude3Haiku);
-        }
-
-        Err(anyhow!("invalid model ID: {id}"))
    }

    pub fn id(&self) -> &str {
        match self {
-            Self::ClaudeOpus4 => "claude-opus-4-latest",
-            Self::ClaudeOpus4Thinking => "claude-opus-4-thinking-latest",
-            Self::ClaudeSonnet4 => "claude-sonnet-4-latest",
-            Self::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking-latest",
-            Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Self::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
-            Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking-latest",
-            Self::Claude3_5Haiku => "claude-3-5-haiku-latest",
-            Self::Claude3Opus => "claude-3-opus-latest",
-            Self::Claude3Sonnet => "claude-3-sonnet-20240229",
-            Self::Claude3Haiku => "claude-3-haiku-20240307",
+            Model::ClaudeOpus4 => "claude-opus-4-latest",
+            Model::ClaudeOpus4Thinking => "claude-opus-4-thinking-latest",
+            Model::ClaudeSonnet4 => "claude-sonnet-4-latest",
+            Model::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking-latest",
+            Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
+            Model::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
+            Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking-latest",
+            Model::Claude3_5Haiku => "claude-3-5-haiku-latest",
+            Model::Claude3Opus => "claude-3-opus-latest",
+            Model::Claude3Sonnet => "claude-3-sonnet-20240229",
+            Model::Claude3Haiku => "claude-3-haiku-20240307",
            Self::Custom { name, .. } => name,
        }
    }
@@ -157,24 +136,24 @@ impl Model {
    /// The id of the model that should be used for making API requests
    pub fn request_id(&self) -> &str {
        match self {
-            Self::ClaudeOpus4 | Self::ClaudeOpus4Thinking => "claude-opus-4-20250514",
-            Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => "claude-sonnet-4-20250514",
-            Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-latest",
-            Self::Claude3_5Haiku => "claude-3-5-haiku-latest",
-            Self::Claude3Opus => "claude-3-opus-latest",
-            Self::Claude3Sonnet => "claude-3-sonnet-20240229",
-            Self::Claude3Haiku => "claude-3-haiku-20240307",
+            Model::ClaudeOpus4 | Model::ClaudeOpus4Thinking => "claude-opus-4-20250514",
+            Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => "claude-sonnet-4-20250514",
+            Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
+            Model::Claude3_7Sonnet | Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-latest",
+            Model::Claude3_5Haiku => "claude-3-5-haiku-latest",
+            Model::Claude3Opus => "claude-3-opus-latest",
+            Model::Claude3Sonnet => "claude-3-sonnet-20240229",
+            Model::Claude3Haiku => "claude-3-haiku-20240307",
            Self::Custom { name, .. } => name,
        }
    }

    pub fn display_name(&self) -> &str {
        match self {
-            Self::ClaudeOpus4 => "Claude Opus 4",
-            Self::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
-            Self::ClaudeSonnet4 => "Claude Sonnet 4",
-            Self::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
+            Model::ClaudeOpus4 => "Claude Opus 4",
+            Model::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
+            Model::ClaudeSonnet4 => "Claude Sonnet 4",
+            Model::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
            Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
@@ -230,15 +209,15 @@ impl Model {

    pub fn max_output_tokens(&self) -> u32 {
        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::Claude3_5Sonnet
+            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 4_096,
+            Self::Claude3_5Sonnet
            | Self::Claude3_7Sonnet
            | Self::Claude3_7SonnetThinking
-            | Self::Claude3_5Haiku => 8_192,
-            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 4_096,
+            | Self::Claude3_5Haiku
+            | Self::ClaudeOpus4
+            | Self::ClaudeOpus4Thinking
+            | Self::ClaudeSonnet4
+            | Self::ClaudeSonnet4Thinking => 8_192,
            Self::Custom {
                max_output_tokens, ..
            } => max_output_tokens.unwrap_or(4_096),
@@ -267,17 +246,17 @@ impl Model {

    pub fn mode(&self) -> AnthropicModelMode {
        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeSonnet4
-            | Self::Claude3_5Sonnet
+            Self::Claude3_5Sonnet
            | Self::Claude3_7Sonnet
            | Self::Claude3_5Haiku
+            | Self::ClaudeOpus4
+            | Self::ClaudeSonnet4
            | Self::Claude3Opus
            | Self::Claude3Sonnet
            | Self::Claude3Haiku => AnthropicModelMode::Default,
-            Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4Thinking
-            | Self::Claude3_7SonnetThinking => AnthropicModelMode::Thinking {
+            Self::Claude3_7SonnetThinking
+            | Self::ClaudeOpus4Thinking
+            | Self::ClaudeSonnet4Thinking => AnthropicModelMode::Thinking {
                budget_tokens: Some(4_096),
            },
            Self::Custom { mode, .. } => mode.clone(),
@@ -288,7 +267,7 @@ impl Model {

    pub fn beta_headers(&self) -> String {
        let mut headers = Self::DEFAULT_BETA_HEADERS
-            .iter()
+            .into_iter()
            .map(|header| header.to_string())
            .collect::<Vec<_>>();

@@ -427,7 +406,6 @@ impl RateLimit {
 /// <https://docs.anthropic.com/en/api/rate-limits#response-headers>
 #[derive(Debug)]
 pub struct RateLimitInfo {
-    pub retry_after: Option<Duration>,
    pub requests: Option<RateLimit>,
    pub tokens: Option<RateLimit>,
    pub input_tokens: Option<RateLimit>,
@@ -439,11 +417,10 @@ impl RateLimitInfo {
        // Check if any rate limit headers exist
        let has_rate_limit_headers = headers
            .keys()
-            .any(|k| k == "retry-after" || k.as_str().starts_with("anthropic-ratelimit-"));
+            .any(|k| k.as_str().starts_with("anthropic-ratelimit-"));

        if !has_rate_limit_headers {
            return Self {
-                retry_after: None,
                requests: None,
                tokens: None,
                input_tokens: None,
@@ -452,11 +429,6 @@ impl RateLimitInfo {
        }

        Self {
-            retry_after: headers
-                .get("retry-after")
-                .and_then(|v| v.to_str().ok())
-                .and_then(|v| v.parse::<u64>().ok())
-                .map(Duration::from_secs),
            requests: RateLimit::from_headers("requests", headers).ok(),
            tokens: RateLimit::from_headers("tokens", headers).ok(),
            input_tokens: RateLimit::from_headers("input-tokens", headers).ok(),
@@ -509,8 +481,8 @@ pub async fn stream_completion_with_rate_limit_info(
        .send(request)
        .await
        .context("failed to send request to Anthropic")?;
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
    if response.status().is_success() {
+        let rate_limits = RateLimitInfo::from_headers(response.headers());
        let reader = BufReader::new(response.into_body());
        let stream = reader
            .lines()
@@ -528,8 +500,6 @@ pub async fn stream_completion_with_rate_limit_info(
            })
            .boxed();
        Ok((stream, Some(rate_limits)))
-    } else if let Some(retry_after) = rate_limits.retry_after {
-        Err(AnthropicError::RateLimit(retry_after))
    } else {
        let mut body = Vec::new();
        response
@@ -799,8 +769,6 @@ pub struct MessageDelta {

 #[derive(Error, Debug)]
 pub enum AnthropicError {
-    #[error("rate limit exceeded, retry after {0:?}")]
-    RateLimit(Duration),
    #[error("an error occurred while interacting with the Anthropic API: {error_type}: {message}", error_type = .0.error_type, message = .0.message)]
    ApiError(ApiError),
    #[error("{0}")]
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -15,6 +15,7 @@ path = "src/askpass.rs"
 anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
+shlex.workspace = true
 smol.workspace = true
 tempfile.workspace = true
 util.workspace = true
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -16,8 +16,6 @@ use smol::fs;
 use smol::{fs::unix::PermissionsExt as _, net::unix::UnixListener};
 #[cfg(unix)]
 use util::ResultExt as _;
-#[cfg(unix)]
-use util::get_shell_safe_zed_path;

 #[derive(PartialEq, Eq)]
 pub enum AskPassResult {
@@ -162,6 +160,38 @@ impl AskPassSession {
    }
 }

+#[cfg(unix)]
+fn get_shell_safe_zed_path() -> anyhow::Result<String> {
+    let zed_path = std::env::current_exe()
+        .context("Failed to determine current executable path for use in askpass")?
+        .to_string_lossy()
+        // see https://github.com/rust-lang/rust/issues/69343
+        .trim_end_matches(" (deleted)")
+        .to_string();
+
+    // NOTE: this was previously enabled, however, it caused errors when it shouldn't have
+    //       (see https://github.com/zed-industries/zed/issues/29819)
+    //       The zed path failing to execute within the askpass script results in very vague ssh
+    //       authentication failed errors, so this was done to try and surface a better error
+    //
+    // use std::os::unix::fs::MetadataExt;
+    // let metadata = std::fs::metadata(&zed_path)
+    //     .context("Failed to check metadata of Zed executable path for use in askpass")?;
+    // let is_executable = metadata.is_file() && metadata.mode() & 0o111 != 0;
+    // anyhow::ensure!(
+    //     is_executable,
+    //     "Failed to verify Zed executable path for use in askpass"
+    // );
+
+    // As of writing, this can only be fail if the path contains a null byte, which shouldn't be possible
+    // but shlex has annotated the error as #[non_exhaustive] so we can't make it a compile error if other
+    // errors are introduced in the future :(
+    let zed_path_escaped = shlex::try_quote(&zed_path)
+        .context("Failed to shell-escape Zed executable path for use in askpass")?;
+
+    return Ok(zed_path_escaped.to_string());
+}
+
 /// The main function for when Zed is running in netcat mode for use in askpass.
 /// Called from both the remote server binary and the zed binary in their respective main functions.
 #[cfg(unix)]
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -11,7 +11,7 @@ use assistant_slash_commands::FileCommandMetadata;
 use client::{self, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::{HashMap, HashSet};
-use fs::{Fs, RenameOptions};
+use fs::{Fs, RemoveOptions};
 use futures::{FutureExt, StreamExt, future::Shared};
 use gpui::{
    App, AppContext as _, Context, Entity, EventEmitter, RenderImage, SharedString, Subscription,
@@ -452,10 +452,6 @@ pub enum ContextEvent {
    MessagesEdited,
    SummaryChanged,
    SummaryGenerated,
-    PathChanged {
-        old_path: Option<Arc<Path>>,
-        new_path: Arc<Path>,
-    },
    StreamedCompletion,
    StartedThoughtProcess(Range<language::Anchor>),
    EndedThoughtProcess(language::Anchor),
@@ -2898,34 +2894,22 @@ impl AssistantContext {
                }

                fs.create_dir(contexts_dir().as_ref()).await?;
-
-                // rename before write ensures that only one file exists
-                if let Some(old_path) = old_path.as_ref() {
+                fs.atomic_write(new_path.clone(), serde_json::to_string(&context).unwrap())
+                    .await?;
+                if let Some(old_path) = old_path {
                    if new_path.as_path() != old_path.as_ref() {
-                        fs.rename(
+                        fs.remove_file(
                            &old_path,
-                            &new_path,
-                            RenameOptions {
-                                overwrite: true,
-                                ignore_if_exists: true,
+                            RemoveOptions {
+                                recursive: false,
+                                ignore_if_not_exists: true,
                            },
                        )
                        .await?;
                    }
                }

-                // update path before write in case it fails
-                this.update(cx, {
-                    let new_path: Arc<Path> = new_path.clone().into();
-                    move |this, cx| {
-                        this.path = Some(new_path.clone());
-                        cx.emit(ContextEvent::PathChanged { old_path, new_path });
-                    }
-                })
-                .ok();
-
-                fs.atomic_write(new_path, serde_json::to_string(&context).unwrap())
-                    .await?;
+                this.update(cx, |this, _| this.path = Some(new_path.into()))?;
            }

            Ok(())
@@ -3293,7 +3277,7 @@ impl SavedContextV0_1_0 {

 #[derive(Debug, Clone)]
 pub struct SavedContextMetadata {
-    pub title: SharedString,
+    pub title: String,
    pub path: Arc<Path>,
    pub mtime: chrono::DateTime<chrono::Local>,
 }
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -39,7 +39,7 @@ use language::{
    language_settings::{SoftWrap, all_language_settings},
 };
 use language_model::{
-    ConfigurationError, LanguageModelImage, LanguageModelProviderTosView, LanguageModelRegistry,
+    LanguageModelImage, LanguageModelProvider, LanguageModelProviderTosView, LanguageModelRegistry,
    Role,
 };
 use multi_buffer::MultiBufferRow;
@@ -580,7 +580,6 @@ impl ContextEditor {
                });
            }
            ContextEvent::SummaryGenerated => {}
-            ContextEvent::PathChanged { .. } => {}
            ContextEvent::StartedThoughtProcess(range) => {
                let creases = self.insert_thought_process_output_sections(
                    [(
@@ -1887,8 +1886,6 @@ impl ContextEditor {
        // value to not show the nudge.
        let nudge = Some(false);

-        let model_registry = LanguageModelRegistry::read_global(cx);
-
        if nudge.map_or(false, |value| value) {
            Some(
                h_flex()
@@ -1937,9 +1934,14 @@ impl ContextEditor {
                    )
                    .into_any_element(),
            )
-        } else if let Some(configuration_error) =
-            model_registry.configuration_error(model_registry.default_model(), cx)
-        {
+        } else if let Some(configuration_error) = configuration_error(cx) {
+            let label = match configuration_error {
+                ConfigurationError::NoProvider => "No LLM provider selected.",
+                ConfigurationError::ProviderNotAuthenticated => "LLM provider is not configured.",
+                ConfigurationError::ProviderPendingTermsAcceptance(_) => {
+                    "LLM provider requires accepting the Terms of Service."
+                }
+            };
            Some(
                h_flex()
                    .px_3()
@@ -1956,7 +1958,7 @@ impl ContextEditor {
                                    .size(IconSize::Small)
                                    .color(Color::Warning),
                            )
-                            .child(Label::new(configuration_error.to_string())),
+                            .child(Label::new(label)),
                    )
                    .child(
                        Button::new("open-configuration", "Configure Providers")
@@ -2031,19 +2033,14 @@ impl ContextEditor {
    /// Will return false if the selected provided has a configuration error or
    /// if the user has not accepted the terms of service for this provider.
    fn sending_disabled(&self, cx: &mut Context<'_, ContextEditor>) -> bool {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let Some(configuration_error) =
-            model_registry.configuration_error(model_registry.default_model(), cx)
-        else {
-            return false;
-        };
+        let model = LanguageModelRegistry::read_global(cx).default_model();

-        match configuration_error {
-            ConfigurationError::NoProvider
-            | ConfigurationError::ModelNotFound
-            | ConfigurationError::ProviderNotAuthenticated(_) => true,
-            ConfigurationError::ProviderPendingTermsAcceptance(_) => self.show_accept_terms,
-        }
+        let has_configuration_error = configuration_error(cx).is_some();
+        let needs_to_accept_terms = self.show_accept_terms
+            && model
+                .as_ref()
+                .map_or(false, |model| model.provider.must_accept_terms(cx));
+        has_configuration_error || needs_to_accept_terms
    }

    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
@@ -3182,6 +3179,33 @@ fn size_for_image(data: &RenderImage, max_size: Size<Pixels>) -> Size<Pixels> {
    }
 }

+pub enum ConfigurationError {
+    NoProvider,
+    ProviderNotAuthenticated,
+    ProviderPendingTermsAcceptance(Arc<dyn LanguageModelProvider>),
+}
+
+fn configuration_error(cx: &App) -> Option<ConfigurationError> {
+    let model = LanguageModelRegistry::read_global(cx).default_model();
+    let is_authenticated = model
+        .as_ref()
+        .map_or(false, |model| model.provider.is_authenticated(cx));
+
+    if model.is_some() && is_authenticated {
+        return None;
+    }
+
+    if model.is_none() {
+        return Some(ConfigurationError::NoProvider);
+    }
+
+    if !is_authenticated {
+        return Some(ConfigurationError::ProviderNotAuthenticated);
+    }
+
+    None
+}
+
 pub fn humanize_token_count(count: usize) -> String {
    match count {
        0..=999 => count.to_string(),
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -347,6 +347,12 @@ impl ContextStore {
        self.contexts_metadata.iter()
    }

+    pub fn reverse_chronological_contexts(&self) -> Vec<SavedContextMetadata> {
+        let mut contexts = self.contexts_metadata.iter().cloned().collect::<Vec<_>>();
+        contexts.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.mtime));
+        contexts
+    }
+
    pub fn create(&mut self, cx: &mut Context<Self>) -> Entity<AssistantContext> {
        let context = cx.new(|cx| {
            AssistantContext::local(
@@ -612,16 +618,6 @@ impl ContextStore {
            ContextEvent::SummaryChanged => {
                self.advertise_contexts(cx);
            }
-            ContextEvent::PathChanged { old_path, new_path } => {
-                if let Some(old_path) = old_path.as_ref() {
-                    for metadata in &mut self.contexts_metadata {
-                        if &metadata.path == old_path {
-                            metadata.path = new_path.clone();
-                            break;
-                        }
-                    }
-                }
-            }
            ContextEvent::Operation(operation) => {
                let context_id = context.read(cx).id().to_proto();
                let operation = operation.to_proto();
@@ -796,7 +792,7 @@ impl ContextStore {
                        .next()
                    {
                        contexts.push(SavedContextMetadata {
-                            title: title.to_string().into(),
+                            title: title.to_string(),
                            path: path.into(),
                            mtime: metadata.mtime.timestamp_for_user().into(),
                        });
@@ -813,37 +809,74 @@ impl ContextStore {
    }

    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
-        let context_server_store = self.project.read(cx).context_server_store();
-        cx.subscribe(&context_server_store, Self::handle_context_server_event)
-            .detach();
-
-        // Check for any servers that were already running before the handler was registered
-        for server in context_server_store.read(cx).running_servers() {
-            self.load_context_server_slash_commands(server.id(), context_server_store.clone(), cx);
-        }
+        cx.subscribe(
+            &self.project.read(cx).context_server_store(),
+            Self::handle_context_server_event,
+        )
+        .detach();
    }

    fn handle_context_server_event(
        &mut self,
-        context_server_store: Entity<ContextServerStore>,
+        context_server_manager: Entity<ContextServerStore>,
        event: &project::context_server_store::Event,
        cx: &mut Context<Self>,
    ) {
+        let slash_command_working_set = self.slash_commands.clone();
        match event {
            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
                match status {
                    ContextServerStatus::Running => {
-                        self.load_context_server_slash_commands(
-                            server_id.clone(),
-                            context_server_store.clone(),
-                            cx,
-                        );
+                        if let Some(server) = context_server_manager
+                            .read(cx)
+                            .get_running_server(server_id)
+                        {
+                            let context_server_manager = context_server_manager.clone();
+                            cx.spawn({
+                                let server = server.clone();
+                                let server_id = server_id.clone();
+                                async move |this, cx| {
+                                    let Some(protocol) = server.client() else {
+                                        return;
+                                    };
+
+                                    if protocol.capable(context_server::protocol::ServerCapability::Prompts) {
+                                        if let Some(prompts) = protocol.list_prompts().await.log_err() {
+                                            let slash_command_ids = prompts
+                                                .into_iter()
+                                                .filter(assistant_slash_commands::acceptable_prompt)
+                                                .map(|prompt| {
+                                                    log::info!(
+                                                        "registering context server command: {:?}",
+                                                        prompt.name
+                                                    );
+                                                    slash_command_working_set.insert(Arc::new(
+                                                        assistant_slash_commands::ContextServerSlashCommand::new(
+                                                            context_server_manager.clone(),
+                                                            server.id(),
+                                                            prompt,
+                                                        ),
+                                                    ))
+                                                })
+                                                .collect::<Vec<_>>();
+
+                                            this.update( cx, |this, _cx| {
+                                                this.context_server_slash_command_ids
+                                                    .insert(server_id.clone(), slash_command_ids);
+                                            })
+                                            .log_err();
+                                        }
+                                    }
+                                }
+                            })
+                            .detach();
+                        }
                    }
                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
                        if let Some(slash_command_ids) =
                            self.context_server_slash_command_ids.remove(server_id)
                        {
-                            self.slash_commands.remove(&slash_command_ids);
+                            slash_command_working_set.remove(&slash_command_ids);
                        }
                    }
                    _ => {}
@@ -851,52 +884,4 @@ impl ContextStore {
            }
        }
    }
-
-    fn load_context_server_slash_commands(
-        &self,
-        server_id: ContextServerId,
-        context_server_store: Entity<ContextServerStore>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(server) = context_server_store.read(cx).get_running_server(&server_id) else {
-            return;
-        };
-        let slash_command_working_set = self.slash_commands.clone();
-        cx.spawn(async move |this, cx| {
-            let Some(protocol) = server.client() else {
-                return;
-            };
-
-            if protocol.capable(context_server::protocol::ServerCapability::Prompts) {
-                if let Some(response) = protocol
-                    .request::<context_server::types::requests::PromptsList>(())
-                    .await
-                    .log_err()
-                {
-                    let slash_command_ids = response
-                        .prompts
-                        .into_iter()
-                        .filter(assistant_slash_commands::acceptable_prompt)
-                        .map(|prompt| {
-                            log::info!("registering context server command: {:?}", prompt.name);
-                            slash_command_working_set.insert(Arc::new(
-                                assistant_slash_commands::ContextServerSlashCommand::new(
-                                    context_server_store.clone(),
-                                    server.id(),
-                                    prompt,
-                                ),
-                            ))
-                        })
-                        .collect::<Vec<_>>();
-
-                    this.update(cx, |this, _cx| {
-                        this.context_server_slash_command_ids
-                            .insert(server_id.clone(), slash_command_ids);
-                    })
-                    .log_err();
-                }
-            }
-        })
-        .detach();
-    }
 }
--- a/crates/assistant_context_editor/src/language_model_selector.rs
+++ b/crates/assistant_context_editor/src/language_model_selector.rs
@@ -682,12 +682,11 @@ mod tests {
            _: &AsyncApp,
        ) -> BoxFuture<
            'static,
-            Result<
+            http_client::Result<
                BoxStream<
                    'static,
-                    Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
+                    http_client::Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
                >,
-                LanguageModelCompletionError,
            >,
        > {
            unimplemented!()
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -10,7 +10,9 @@ use parking_lot::Mutex;
 use project::{CompletionIntent, CompletionSource, lsp_store::CompletionDocumentation};
 use rope::Point;
 use std::{
+    cell::RefCell,
    ops::Range,
+    rc::Rc,
    sync::{
        Arc,
        atomic::{AtomicBool, Ordering::SeqCst},
@@ -238,14 +240,13 @@ impl SlashCommandCompletionProvider {

                Ok(vec![project::CompletionResponse {
                    completions,
-                    // TODO: Could have slash commands indicate whether their completions are incomplete.
-                    is_incomplete: true,
+                    is_incomplete: false,
                }])
            })
        } else {
            Task::ready(Ok(vec![project::CompletionResponse {
                completions: Vec::new(),
-                is_incomplete: true,
+                is_incomplete: false,
            }]))
        }
    }
@@ -274,17 +275,17 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                    position.row,
                    call.arguments.last().map_or(call.name.end, |arg| arg.end) as u32,
                );
-                let command_range = buffer.anchor_before(command_range_start)
+                let command_range = buffer.anchor_after(command_range_start)
                    ..buffer.anchor_after(command_range_end);

                let name = line[call.name.clone()].to_string();
                let (arguments, last_argument_range) = if let Some(argument) = call.arguments.last()
                {
                    let last_arg_start =
-                        buffer.anchor_before(Point::new(position.row, argument.start as u32));
+                        buffer.anchor_after(Point::new(position.row, argument.start as u32));
                    let first_arg_start = call.arguments.first().expect("we have the last element");
-                    let first_arg_start = buffer
-                        .anchor_before(Point::new(position.row, first_arg_start.start as u32));
+                    let first_arg_start =
+                        buffer.anchor_after(Point::new(position.row, first_arg_start.start as u32));
                    let arguments = call
                        .arguments
                        .into_iter()
@@ -297,7 +298,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                    )
                } else {
                    let start =
-                        buffer.anchor_before(Point::new(position.row, call.name.start as u32));
+                        buffer.anchor_after(Point::new(position.row, call.name.start as u32));
                    (None, start..buffer_position)
                };

@@ -325,6 +326,16 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        }
    }

+    fn resolve_completions(
+        &self,
+        _: Entity<Buffer>,
+        _: Vec<usize>,
+        _: Rc<RefCell<Box<[project::Completion]>>>,
+        _: &mut Context<Editor>,
+    ) -> Task<Result<bool>> {
+        Task::ready(Ok(true))
+    }
+
    fn is_completion_trigger(
        &self,
        buffer: &Entity<Buffer>,
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -86,26 +86,20 @@ impl SlashCommand for ContextServerSlashCommand {
            cx.foreground_executor().spawn(async move {
                let protocol = server.client().context("Context server not initialized")?;

-                let response = protocol
-                    .request::<context_server::types::requests::CompletionComplete>(
-                        context_server::types::CompletionCompleteParams {
-                            reference: context_server::types::CompletionReference::Prompt(
-                                context_server::types::PromptReference {
-                                    ty: context_server::types::PromptReferenceType::Prompt,
-                                    name: prompt_name,
-                                },
-                            ),
-                            argument: context_server::types::CompletionArgument {
-                                name: arg_name,
-                                value: arg_value,
+                let completion_result = protocol
+                    .completion(
+                        context_server::types::CompletionReference::Prompt(
+                            context_server::types::PromptReference {
+                                r#type: context_server::types::PromptReferenceType::Prompt,
+                                name: prompt_name,
                            },
-                            meta: None,
-                        },
+                        ),
+                        arg_name,
+                        arg_value,
                    )
                    .await?;

-                let completions = response
-                    .completion
+                let completions = completion_result
                    .values
                    .into_iter()
                    .map(|value| ArgumentCompletion {
@@ -144,18 +138,10 @@ impl SlashCommand for ContextServerSlashCommand {
        if let Some(server) = store.get_running_server(&server_id) {
            cx.foreground_executor().spawn(async move {
                let protocol = server.client().context("Context server not initialized")?;
-                let response = protocol
-                    .request::<context_server::types::requests::PromptsGet>(
-                        context_server::types::PromptsGetParams {
-                            name: prompt_name.clone(),
-                            arguments: Some(prompt_args),
-                            meta: None,
-                        },
-                    )
-                    .await?;
+                let result = protocol.run_prompt(&prompt_name, prompt_args).await?;

                anyhow::ensure!(
-                    response
+                    result
                        .messages
                        .iter()
                        .all(|msg| matches!(msg.role, context_server::types::Role::User)),
@@ -163,7 +149,7 @@ impl SlashCommand for ContextServerSlashCommand {
                );

                // Extract text from user messages into a single prompt string
-                let mut prompt = response
+                let mut prompt = result
                    .messages
                    .into_iter()
                    .filter_map(|msg| match msg.content {
@@ -181,7 +167,7 @@ impl SlashCommand for ContextServerSlashCommand {
                        range: 0..(prompt.len()),
                        icon: IconName::ZedAssistant,
                        label: SharedString::from(
-                            response
+                            result
                                .description
                                .unwrap_or(format!("Result from {}", prompt_name)),
                        ),
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -582,7 +582,7 @@ mod test {
    use serde_json::json;
    use settings::SettingsStore;
    use smol::stream::StreamExt;
-    use util::path;
+    use util::{path, separator};

    use super::collect_files;

@@ -627,7 +627,7 @@ mod test {
            .await
            .unwrap();

-        assert!(result_1.text.starts_with(path!("root/dir")));
+        assert!(result_1.text.starts_with(separator!("root/dir")));
        // 4 files + 2 directories
        assert_eq!(result_1.sections.len(), 6);

@@ -643,7 +643,7 @@ mod test {
            cx.update(|cx| collect_files(project.clone(), &["root/dir*".to_string()], cx).boxed());
        let result = SlashCommandOutput::from_event_stream(result).await.unwrap();

-        assert!(result.text.starts_with(path!("root/dir")));
+        assert!(result.text.starts_with(separator!("root/dir")));
        // 5 files + 2 directories
        assert_eq!(result.sections.len(), 7);

@@ -691,20 +691,24 @@ mod test {
            .unwrap();

        // Sanity check
-        assert!(result.text.starts_with(path!("zed/assets/themes\n")));
+        assert!(result.text.starts_with(separator!("zed/assets/themes\n")));
        assert_eq!(result.sections.len(), 7);

        // Ensure that full file paths are included in the real output
        assert!(
            result
                .text
-                .contains(path!("zed/assets/themes/andromeda/LICENSE"))
+                .contains(separator!("zed/assets/themes/andromeda/LICENSE"))
        );
-        assert!(result.text.contains(path!("zed/assets/themes/ayu/LICENSE")));
        assert!(
            result
                .text
-                .contains(path!("zed/assets/themes/summercamp/LICENSE"))
+                .contains(separator!("zed/assets/themes/ayu/LICENSE"))
+        );
+        assert!(
+            result
+                .text
+                .contains(separator!("zed/assets/themes/summercamp/LICENSE"))
        );

        assert_eq!(result.sections[5].label, "summercamp");
@@ -712,17 +716,17 @@ mod test {
        // Ensure that things are in descending order, with properly relativized paths
        assert_eq!(
            result.sections[0].label,
-            path!("zed/assets/themes/andromeda/LICENSE")
+            separator!("zed/assets/themes/andromeda/LICENSE")
        );
        assert_eq!(result.sections[1].label, "andromeda");
        assert_eq!(
            result.sections[2].label,
-            path!("zed/assets/themes/ayu/LICENSE")
+            separator!("zed/assets/themes/ayu/LICENSE")
        );
        assert_eq!(result.sections[3].label, "ayu");
        assert_eq!(
            result.sections[4].label,
-            path!("zed/assets/themes/summercamp/LICENSE")
+            separator!("zed/assets/themes/summercamp/LICENSE")
        );

        // Ensure that the project lasts until after the last await
@@ -763,28 +767,31 @@ mod test {
            .await
            .unwrap();

-        assert!(result.text.starts_with(path!("zed/assets/themes\n")));
-        assert_eq!(result.sections[0].label, path!("zed/assets/themes/LICENSE"));
+        assert!(result.text.starts_with(separator!("zed/assets/themes\n")));
+        assert_eq!(
+            result.sections[0].label,
+            separator!("zed/assets/themes/LICENSE")
+        );
        assert_eq!(
            result.sections[1].label,
-            path!("zed/assets/themes/summercamp/LICENSE")
+            separator!("zed/assets/themes/summercamp/LICENSE")
        );
        assert_eq!(
            result.sections[2].label,
-            path!("zed/assets/themes/summercamp/subdir/LICENSE")
+            separator!("zed/assets/themes/summercamp/subdir/LICENSE")
        );
        assert_eq!(
            result.sections[3].label,
-            path!("zed/assets/themes/summercamp/subdir/subsubdir/LICENSE")
+            separator!("zed/assets/themes/summercamp/subdir/subsubdir/LICENSE")
        );
        assert_eq!(result.sections[4].label, "subsubdir");
        assert_eq!(result.sections[5].label, "subdir");
        assert_eq!(result.sections[6].label, "summercamp");
-        assert_eq!(result.sections[7].label, path!("zed/assets/themes"));
+        assert_eq!(result.sections[7].label, separator!("zed/assets/themes"));

        assert_eq!(
            result.text,
-            path!(
+            separator!(
                "zed/assets/themes\n```zed/assets/themes/LICENSE\n1\n```\n\nsummercamp\n```zed/assets/themes/summercamp/LICENSE\n1\n```\n\nsubdir\n```zed/assets/themes/summercamp/subdir/LICENSE\n1\n```\n\nsubsubdir\n```zed/assets/themes/summercamp/subdir/subsubdir/LICENSE\n3\n```\n\n"
            )
        );
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/assistant_tool.rs"

 [dependencies]
 anyhow.workspace = true
+async-watch.workspace = true
 buffer_diff.workspace = true
 clock.workspace = true
 collections.workspace = true
@@ -29,7 +30,6 @@ serde.workspace = true
 serde_json.workspace = true
 text.workspace = true
 util.workspace = true
-watch.workspace = true
 workspace.workspace = true
 workspace-hack.workspace = true

--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -204,7 +204,7 @@ impl ActionLog {
            git_store.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
        })?;

-        let (mut git_diff_updates_tx, mut git_diff_updates_rx) = watch::channel(());
+        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| {
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -214,7 +214,7 @@ pub trait Tool: 'static + Send + Sync {
        ToolSource::Native
    }

-    /// Returns true if the tool needs the users's confirmation
+    /// Returns true iff the tool needs the users's confirmation
    /// before having permission to run.
    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool;

--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -46,19 +46,15 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
            );
        }

-        const KEYS_TO_REMOVE: [(&str, fn(&Value) -> bool); 5] = [
-            ("format", |value| value.is_string()),
-            ("additionalProperties", |value| value.is_boolean()),
-            ("exclusiveMinimum", |value| value.is_number()),
-            ("exclusiveMaximum", |value| value.is_number()),
-            ("optional", |value| value.is_boolean()),
+        const KEYS_TO_REMOVE: [&str; 5] = [
+            "format",
+            "additionalProperties",
+            "exclusiveMinimum",
+            "exclusiveMaximum",
+            "optional",
        ];
-        for (key, predicate) in KEYS_TO_REMOVE {
-            if let Some(value) = obj.get(key) {
-                if predicate(value) {
-                    obj.remove(key);
-                }
-            }
+        for key in KEYS_TO_REMOVE {
+            obj.remove(key);
        }

        // If a type is not specified for an input parameter, add a default type
@@ -157,24 +153,6 @@ mod tests {
                "type": "integer"
            })
        );
-
-        // Ensure that we do not remove keys that are actually supported (e.g. "format" can just be used as another property)
-        let mut json = json!({
-            "description": "A test field",
-            "type": "integer",
-            "format": {},
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "integer",
-                "format": {},
-            })
-        );
    }

    #[test]
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

-use collections::{HashMap, IndexMap};
-use gpui::App;
+use collections::{HashMap, HashSet, IndexMap};
+use gpui::{App, Context, EventEmitter};

 use crate::{Tool, ToolRegistry, ToolSource};

@@ -13,9 +13,17 @@ pub struct ToolId(usize);
 pub struct ToolWorkingSet {
    context_server_tools_by_id: HashMap<ToolId, Arc<dyn Tool>>,
    context_server_tools_by_name: HashMap<String, Arc<dyn Tool>>,
+    enabled_sources: HashSet<ToolSource>,
+    enabled_tools_by_source: HashMap<ToolSource, HashSet<Arc<str>>>,
    next_tool_id: ToolId,
 }

+pub enum ToolWorkingSetEvent {
+    EnabledToolsChanged,
+}
+
+impl EventEmitter<ToolWorkingSetEvent> for ToolWorkingSet {}
+
 impl ToolWorkingSet {
    pub fn tool(&self, name: &str, cx: &App) -> Option<Arc<dyn Tool>> {
        self.context_server_tools_by_name
@@ -49,6 +57,42 @@ impl ToolWorkingSet {
        tools_by_source
    }

+    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+        let all_tools = self.tools(cx);
+
+        all_tools
+            .into_iter()
+            .filter(|tool| self.is_enabled(&tool.source(), &tool.name().into()))
+            .collect()
+    }
+
+    pub fn disable_all_tools(&mut self, cx: &mut Context<Self>) {
+        self.enabled_tools_by_source.clear();
+        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    }
+
+    pub fn enable_source(&mut self, source: ToolSource, cx: &mut Context<Self>) {
+        self.enabled_sources.insert(source.clone());
+
+        let tools_by_source = self.tools_by_source(cx);
+        if let Some(tools) = tools_by_source.get(&source) {
+            self.enabled_tools_by_source.insert(
+                source,
+                tools
+                    .into_iter()
+                    .map(|tool| tool.name().into())
+                    .collect::<HashSet<_>>(),
+            );
+        }
+        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    }
+
+    pub fn disable_source(&mut self, source: &ToolSource, cx: &mut Context<Self>) {
+        self.enabled_sources.remove(source);
+        self.enabled_tools_by_source.remove(source);
+        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    }
+
    pub fn insert(&mut self, tool: Arc<dyn Tool>) -> ToolId {
        let tool_id = self.next_tool_id;
        self.next_tool_id.0 += 1;
@@ -58,6 +102,42 @@ impl ToolWorkingSet {
        tool_id
    }

+    pub fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        self.enabled_tools_by_source
+            .get(source)
+            .map_or(false, |enabled_tools| enabled_tools.contains(name))
+    }
+
+    pub fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        !self.is_enabled(source, name)
+    }
+
+    pub fn enable(
+        &mut self,
+        source: ToolSource,
+        tools_to_enable: &[Arc<str>],
+        cx: &mut Context<Self>,
+    ) {
+        self.enabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .extend(tools_to_enable.into_iter().cloned());
+        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    }
+
+    pub fn disable(
+        &mut self,
+        source: ToolSource,
+        tools_to_disable: &[Arc<str>],
+        cx: &mut Context<Self>,
+    ) {
+        self.enabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .retain(|name| !tools_to_disable.contains(name));
+        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    }
+
    pub fn remove(&mut self, tool_ids_to_remove: &[ToolId]) {
        self.context_server_tools_by_id
            .retain(|id, _| !tool_ids_to_remove.contains(id));
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -18,6 +18,7 @@ eval = []
 agent_settings.workspace = true
 anyhow.workspace = true
 assistant_tool.workspace = true
+async-watch.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 collections.workspace = true
@@ -57,7 +58,6 @@ terminal_view.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
-watch.workspace = true
 web_search.workspace = true
 which.workspace = true
 workspace-hack.workspace = true
@@ -80,7 +80,6 @@ rand.workspace = true
 pretty_assertions.workspace = true
 reqwest_client.workspace = true
 settings = { workspace = true, features = ["test-support"] }
-smol.workspace = true
 task = { workspace = true, features = ["test-support"]}
 tempfile.workspace = true
 theme.workspace = true
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -286,13 +286,7 @@ impl EditAgent {
                _ => {
                    let ranges = resolved_old_text
                        .into_iter()
-                        .map(|text| {
-                            let start_line =
-                                (snapshot.offset_to_point(text.range.start).row + 1) as usize;
-                            let end_line =
-                                (snapshot.offset_to_point(text.range.end).row + 1) as usize;
-                            start_line..end_line
-                        })
+                        .map(|text| text.range)
                        .collect();
                    output_events
                        .unbounded_send(EditAgentOutputEvent::AmbiguousEditRange(ranges))
@@ -426,34 +420,34 @@ impl EditAgent {
        cx: &mut AsyncApp,
    ) -> (
        Task<Result<(T, Vec<ResolvedOldText>)>>,
-        watch::Receiver<Option<Range<usize>>>,
+        async_watch::Receiver<Option<Range<usize>>>,
    )
    where
        T: 'static + Send + Unpin + Stream<Item = Result<EditParserEvent>>,
    {
-        let (mut old_range_tx, old_range_rx) = watch::channel(None);
+        let (old_range_tx, old_range_rx) = async_watch::channel(None);
        let task = cx.background_spawn(async move {
            let mut matcher = StreamingFuzzyMatcher::new(snapshot);
            while let Some(edit_event) = edit_events.next().await {
-                let EditParserEvent::OldTextChunk {
-                    chunk,
-                    done,
-                    line_hint,
-                } = edit_event?
-                else {
+                let EditParserEvent::OldTextChunk { chunk, done } = edit_event? else {
                    break;
                };

-                old_range_tx.send(matcher.push(&chunk, line_hint))?;
+                old_range_tx.send(matcher.push(&chunk))?;
                if done {
                    break;
                }
            }

            let matches = matcher.finish();
-            let best_match = matcher.select_best_match();

-            old_range_tx.send(best_match.clone())?;
+            let old_range = if matches.len() == 1 {
+                matches.first()
+            } else {
+                // No matches or multiple ambiguous matches
+                None
+            };
+            old_range_tx.send(old_range.cloned())?;

            let indent = LineIndent::from_iter(
                matcher
@@ -462,18 +456,10 @@ impl EditAgent {
                    .unwrap_or(&String::new())
                    .chars(),
            );
-
-            let resolved_old_texts = if let Some(best_match) = best_match {
-                vec![ResolvedOldText {
-                    range: best_match,
-                    indent,
-                }]
-            } else {
-                matches
-                    .into_iter()
-                    .map(|range| ResolvedOldText { range, indent })
-                    .collect::<Vec<_>>()
-            };
+            let resolved_old_texts = matches
+                .into_iter()
+                .map(|range| ResolvedOldText { range, indent })
+                .collect::<Vec<_>>();

            Ok((edit_events, resolved_old_texts))
        });
@@ -1388,12 +1374,10 @@ mod tests {
            &agent,
            indoc! {"
                <old_text>
-                    return 42;
-                }
+                return 42;
                </old_text>
                <new_text>
-                    return 100;
-                }
+                return 100;
                </new_text>
            "},
            &mut rng,
@@ -1423,7 +1407,7 @@ mod tests {

        // And AmbiguousEditRange even should be emitted
        let events = drain_events(&mut events);
-        let ambiguous_ranges = vec![2..3, 6..7, 10..11];
+        let ambiguous_ranges = vec![17..31, 52..66, 87..101];
        assert!(
            events.contains(&EditAgentOutputEvent::AmbiguousEditRange(ambiguous_ranges)),
            "Should emit AmbiguousEditRange for non-unique text"
--- a/crates/assistant_tools/src/edit_agent/edit_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/edit_parser.rs
@@ -1,5 +1,4 @@
 use derive_more::{Add, AddAssign};
-use regex::Regex;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
@@ -12,15 +11,8 @@ const END_TAGS: [&str; 3] = [OLD_TEXT_END_TAG, NEW_TEXT_END_TAG, EDITS_END_TAG];

 #[derive(Debug)]
 pub enum EditParserEvent {
-    OldTextChunk {
-        chunk: String,
-        done: bool,
-        line_hint: Option<u32>,
-    },
-    NewTextChunk {
-        chunk: String,
-        done: bool,
-    },
+    OldTextChunk { chunk: String, done: bool },
+    NewTextChunk { chunk: String, done: bool },
 }

 #[derive(
@@ -41,7 +33,7 @@ pub struct EditParser {
 #[derive(Debug, PartialEq)]
 enum EditParserState {
    Pending,
-    WithinOldText { start: bool, line_hint: Option<u32> },
+    WithinOldText { start: bool },
    AfterOldText,
    WithinNewText { start: bool },
 }
@@ -62,24 +54,14 @@ impl EditParser {
        loop {
            match &mut self.state {
                EditParserState::Pending => {
-                    if let Some(start) = self.buffer.find("<old_text") {
-                        if let Some(tag_end) = self.buffer[start..].find('>') {
-                            let tag_end = start + tag_end + 1;
-                            let tag = &self.buffer[start..tag_end];
-                            let line_hint = self.parse_line_hint(tag);
-                            self.buffer.drain(..tag_end);
-                            self.state = EditParserState::WithinOldText {
-                                start: true,
-                                line_hint,
-                            };
-                        } else {
-                            break;
-                        }
+                    if let Some(start) = self.buffer.find("<old_text>") {
+                        self.buffer.drain(..start + "<old_text>".len());
+                        self.state = EditParserState::WithinOldText { start: true };
                    } else {
                        break;
                    }
                }
-                EditParserState::WithinOldText { start, line_hint } => {
+                EditParserState::WithinOldText { start } => {
                    if !self.buffer.is_empty() {
                        if *start && self.buffer.starts_with('\n') {
                            self.buffer.remove(0);
@@ -87,7 +69,6 @@ impl EditParser {
                        *start = false;
                    }

-                    let line_hint = *line_hint;
                    if let Some(tag_range) = self.find_end_tag() {
                        let mut chunk = self.buffer[..tag_range.start].to_string();
                        if chunk.ends_with('\n') {
@@ -101,17 +82,12 @@ impl EditParser {

                        self.buffer.drain(..tag_range.end);
                        self.state = EditParserState::AfterOldText;
-                        edit_events.push(EditParserEvent::OldTextChunk {
-                            chunk,
-                            done: true,
-                            line_hint,
-                        });
+                        edit_events.push(EditParserEvent::OldTextChunk { chunk, done: true });
                    } else {
                        if !self.ends_with_tag_prefix() {
                            edit_events.push(EditParserEvent::OldTextChunk {
                                chunk: mem::take(&mut self.buffer),
                                done: false,
-                                line_hint,
                            });
                        }
                        break;
@@ -178,16 +154,6 @@ impl EditParser {
        end_prefixes.any(|prefix| self.buffer.ends_with(&prefix))
    }

-    fn parse_line_hint(&self, tag: &str) -> Option<u32> {
-        static LINE_HINT_REGEX: std::sync::LazyLock<Regex> =
-            std::sync::LazyLock::new(|| Regex::new(r#"line=(?:"?)(\d+)"#).unwrap());
-
-        LINE_HINT_REGEX
-            .captures(tag)
-            .and_then(|caps| caps.get(1))
-            .and_then(|m| m.as_str().parse::<u32>().ok())
-    }
-
    pub fn finish(self) -> EditParserMetrics {
        self.metrics
    }
@@ -212,7 +178,6 @@ mod tests {
            vec![Edit {
                old_text: "original".to_string(),
                new_text: "updated".to_string(),
-                line_hint: None,
            }]
        );
        assert_eq!(
@@ -244,12 +209,10 @@ mod tests {
                Edit {
                    old_text: "first old".to_string(),
                    new_text: "first new".to_string(),
-                    line_hint: None,
                },
                Edit {
                    old_text: "second old".to_string(),
                    new_text: "second new".to_string(),
-                    line_hint: None,
                },
            ]
        );
@@ -281,17 +244,14 @@ mod tests {
                Edit {
                    old_text: "content".to_string(),
                    new_text: "updated content".to_string(),
-                    line_hint: None,
                },
                Edit {
                    old_text: "second item".to_string(),
                    new_text: "modified second item".to_string(),
-                    line_hint: None,
                },
                Edit {
                    old_text: "third case".to_string(),
                    new_text: "improved third case".to_string(),
-                    line_hint: None,
                },
            ]
        );
@@ -316,7 +276,6 @@ mod tests {
            vec![Edit {
                old_text: "code with <tag>nested</tag> elements".to_string(),
                new_text: "new <code>content</code>".to_string(),
-                line_hint: None,
            }]
        );
        assert_eq!(
@@ -340,7 +299,6 @@ mod tests {
            vec![Edit {
                old_text: "".to_string(),
                new_text: "".to_string(),
-                line_hint: None,
            }]
        );
        assert_eq!(
@@ -364,7 +322,6 @@ mod tests {
            vec![Edit {
                old_text: "line1\nline2\nline3".to_string(),
                new_text: "line1\nmodified line2\nline3".to_string(),
-                line_hint: None,
            }]
        );
        assert_eq!(
@@ -411,12 +368,10 @@ mod tests {
                Edit {
                    old_text: "a\nb\nc".to_string(),
                    new_text: "a\nB\nc".to_string(),
-                    line_hint: None,
                },
                Edit {
                    old_text: "d\ne\nf".to_string(),
                    new_text: "D\ne\nF".to_string(),
-                    line_hint: None,
                }
            ]
        );
@@ -447,7 +402,6 @@ mod tests {
            vec![Edit {
                old_text: "Lorem".to_string(),
                new_text: "LOREM".to_string(),
-                line_hint: None,
            },]
        );
        assert_eq!(
@@ -459,77 +413,10 @@ mod tests {
        );
    }

-    #[gpui::test(iterations = 100)]
-    fn test_line_hints(mut rng: StdRng) {
-        // Line hint is a single quoted line number
-        let mut parser = EditParser::new();
-
-        let edits = parse_random_chunks(
-            r#"
-                    <old_text line="23">original code</old_text>
-                    <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(23));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // Line hint is a single unquoted line number
-        let mut parser = EditParser::new();
-
-        let edits = parse_random_chunks(
-            r#"
-                    <old_text line=45>original code</old_text>
-                    <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(45));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // Line hint is a range
-        let mut parser = EditParser::new();
-
-        let edits = parse_random_chunks(
-            r#"
-            <old_text line="23:50">original code</old_text>
-            <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(23));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // No line hint
-        let mut parser = EditParser::new();
-        let edits = parse_random_chunks(
-            r#"
-            <old_text>old</old_text>
-            <new_text>new</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "old");
-        assert_eq!(edits[0].line_hint, None);
-        assert_eq!(edits[0].new_text, "new");
-    }
-
    #[derive(Default, Debug, PartialEq, Eq)]
    struct Edit {
        old_text: String,
        new_text: String,
-        line_hint: Option<u32>,
    }

    fn parse_random_chunks(input: &str, parser: &mut EditParser, rng: &mut StdRng) -> Vec<Edit> {
@@ -546,15 +433,10 @@ mod tests {
        for chunk_ix in chunk_indices {
            for event in parser.push(&input[last_ix..chunk_ix]) {
                match event {
-                    EditParserEvent::OldTextChunk {
-                        chunk,
-                        done,
-                        line_hint,
-                    } => {
+                    EditParserEvent::OldTextChunk { chunk, done } => {
                        old_text.as_mut().unwrap().push_str(&chunk);
                        if done {
                            pending_edit.old_text = old_text.take().unwrap();
-                            pending_edit.line_hint = line_hint;
                            new_text = Some(String::new());
                        }
                    }
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -11,7 +11,7 @@ use client::{Client, UserStore};
 use collections::HashMap;
 use fs::FakeFs;
 use futures::{FutureExt, future::LocalBoxFuture};
-use gpui::{AppContext, TestAppContext, Timer};
+use gpui::{AppContext, TestAppContext};
 use indoc::{formatdoc, indoc};
 use language_model::{
    LanguageModelRegistry, LanguageModelRequestTool, LanguageModelToolResult,
@@ -26,7 +26,6 @@ use std::{
    cmp::Reverse,
    fmt::{self, Display},
    io::Write as _,
-    path::Path,
    str::FromStr,
    sync::mpsc,
 };
@@ -39,11 +38,10 @@ fn eval_extract_handle_command_output() {
    //
    // Model                       | Pass rate
    // ----------------------------|----------
-    // claude-3.7-sonnet           |  0.99 (2025-06-14)
-    // claude-sonnet-4             |  0.97 (2025-06-14)
-    // gemini-2.5-pro-06-05        |  0.77 (2025-05-22)
-    // gemini-2.5-flash            |  0.11 (2025-05-22)
-    // gpt-4.1                     |  1.00 (2025-05-22)
+    // claude-3.7-sonnet           |  0.98
+    // gemini-2.5-pro              |  0.86
+    // gemini-2.5-flash            |  0.11
+    // gpt-4.1                     |  1.00

    let input_file_path = "root/blame.rs";
    let input_file_content = include_str!("evals/fixtures/extract_handle_command_output/before.rs");
@@ -60,7 +58,6 @@ fn eval_extract_handle_command_output() {
    eval(
        100,
        0.7, // Taking the lower bar for Gemini
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(
@@ -112,13 +109,6 @@ fn eval_extract_handle_command_output() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_delete_run_git_blame() {
-    // Model                       | Pass rate
-    // ----------------------------|----------
-    // claude-3.7-sonnet           | 1.0  (2025-06-14)
-    // claude-sonnet-4             | 0.96 (2025-06-14)
-    // gemini-2.5-pro-06-05        |
-    // gemini-2.5-flash            |
-    // gpt-4.1                     |
    let input_file_path = "root/blame.rs";
    let input_file_content = include_str!("evals/fixtures/delete_run_git_blame/before.rs");
    let output_file_content = include_str!("evals/fixtures/delete_run_git_blame/after.rs");
@@ -126,7 +116,6 @@ fn eval_delete_run_git_blame() {
    eval(
        100,
        0.95,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(
@@ -174,12 +163,13 @@ fn eval_delete_run_git_blame() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_translate_doc_comments() {
+    // Results for 2025-05-22
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  1.0  (2025-06-14)
-    //  claude-sonnet-4                |  1.0  (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.0  (2025-05-22)
+    //  claude-3.7-sonnet              |
+    //  gemini-2.5-pro-preview-03-25   |  1.0
    //  gemini-2.5-flash-preview-04-17 |
    //  gpt-4.1                        |
    let input_file_path = "root/canvas.rs";
@@ -188,7 +178,6 @@ fn eval_translate_doc_comments() {
    eval(
        200,
        1.,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(
@@ -236,12 +225,13 @@ fn eval_translate_doc_comments() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
+    // Results for 2025-05-22
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  0.96 (2025-06-14)
-    //  claude-sonnet-4                |  0.11 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  0.99 (2025-05-22)
+    //  claude-3.7-sonnet              |  0.98
+    //  gemini-2.5-pro-preview-03-25   |  0.99
    //  gemini-2.5-flash-preview-04-17 |
    //  gpt-4.1                        |
    let input_file_path = "root/lib.rs";
@@ -251,7 +241,6 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
    eval(
        100,
        0.95,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(
@@ -361,12 +350,13 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_disable_cursor_blinking() {
+    // Results for 2025-05-22
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  0.99 (2025-06-14)
-    //  claude-sonnet-4                |  0.85 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.0  (2025-05-22)
+    //  claude-3.7-sonnet              |
+    //  gemini-2.5-pro-preview-03-25   |  1.0
    //  gemini-2.5-flash-preview-04-17 |
    //  gpt-4.1                        |
    let input_file_path = "root/editor.rs";
@@ -375,7 +365,6 @@ fn eval_disable_cursor_blinking() {
    eval(
        100,
        0.95,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(User, [text("Let's research how to cursor blinking works.")]),
@@ -444,21 +433,14 @@ fn eval_disable_cursor_blinking() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_from_pixels_constructor() {
-    // Results for 2025-06-13
-    //
-    // The outcome of this evaluation depends heavily on the LINE_HINT_TOLERANCE
-    // value. Higher values improve the pass rate but may sometimes cause
-    // edits to be misapplied. In the context of this eval, this means
-    // the agent might add from_pixels tests in incorrect locations
-    // (e.g., at the beginning of the file), yet the evaluation may still
-    // rate it highly.
+    // Results for 2025-05-22
    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-4.0-sonnet              |  0.99
-    //  claude-3.7-sonnet              |  0.88
-    //  gemini-2.5-pro-preview-03-25   |  0.96
+    //  claude-3.7-sonnet              |
+    //  gemini-2.5-pro-preview-03-25   |  0.94
+    //  gemini-2.5-flash-preview-04-17 |
    //  gpt-4.1                        |
    let input_file_path = "root/canvas.rs";
    let input_file_content = include_str!("evals/fixtures/from_pixels_constructor/before.rs");
@@ -466,9 +448,6 @@ fn eval_from_pixels_constructor() {
    eval(
        100,
        0.95,
-        // For whatever reason, this eval produces more mismatched tags.
-        // Increasing for now, let's see if we can bring this down.
-        0.25,
        EvalInput::from_conversation(
            vec![
                message(
@@ -654,21 +633,21 @@ fn eval_from_pixels_constructor() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_zode() {
+    // Results for 2025-05-22
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  1.0 (2025-06-14)
-    //  claude-sonnet-4                |  1.0 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.0 (2025-05-22)
-    //  gemini-2.5-flash-preview-04-17 |  1.0 (2025-05-22)
-    //  gpt-4.1                        |  1.0 (2025-05-22)
+    //  claude-3.7-sonnet              |  1.0
+    //  gemini-2.5-pro-preview-03-25   |  1.0
+    //  gemini-2.5-flash-preview-04-17 |  1.0
+    //  gpt-4.1                        |  1.0
    let input_file_path = "root/zode.py";
    let input_content = None;
    let edit_description = "Create the main Zode CLI script";
    eval(
        50,
        1.,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(User, [text(include_str!("evals/fixtures/zode/prompt.md"))]),
@@ -760,12 +739,13 @@ fn eval_zode() {
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_add_overwrite_test() {
+    // Results for 2025-05-22
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  0.65 (2025-06-14)
-    //  claude-sonnet-4                |  0.07 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  0.35 (2025-05-22)
+    //  claude-3.7-sonnet              |  0.16
+    //  gemini-2.5-pro-preview-03-25   |  0.35
    //  gemini-2.5-flash-preview-04-17 |
    //  gpt-4.1                        |
    let input_file_path = "root/action_log.rs";
@@ -774,7 +754,6 @@ fn eval_add_overwrite_test() {
    eval(
        200,
        0.5, // TODO: make this eval better
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(
@@ -995,14 +974,15 @@ fn eval_create_empty_file() {
    // thoughts into it. This issue is not specific to empty files, but
    // it's easier to reproduce with them.
    //
+    // Results for 2025-05-21:
+    //
    //  Model                          | Pass rate
    // ============================================
    //
-    //  claude-3.7-sonnet              |  1.00 (2025-06-14)
-    //  claude-sonnet-4                |  1.00 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.00 (2025-05-21)
-    //  gemini-2.5-flash-preview-04-17 |  1.00 (2025-05-21)
-    //  gpt-4.1                        |  1.00 (2025-05-21)
+    //  claude-3.7-sonnet              |  1.00
+    //  gemini-2.5-pro-preview-03-25   |  1.00
+    //  gemini-2.5-flash-preview-04-17 |  1.00
+    //  gpt-4.1                        |  1.00
    //
    //
    // TODO: gpt-4.1-mini errored 38 times:
@@ -1013,7 +993,6 @@ fn eval_create_empty_file() {
    eval(
        100,
        0.99,
-        0.05,
        EvalInput::from_conversation(
            vec![
                message(User, [text("Create a second empty todo file ")]),
@@ -1265,12 +1244,9 @@ impl EvalAssertion {
                }],
                ..Default::default()
            };
-            let mut response = retry_on_rate_limit(async || {
-                Ok(judge
-                    .stream_completion_text(request.clone(), &cx.to_async())
-                    .await?)
-            })
-            .await?;
+            let mut response = judge
+                .stream_completion_text(request, &cx.to_async())
+                .await?;
            let mut output = String::new();
            while let Some(chunk) = response.stream.next().await {
                let chunk = chunk?;
@@ -1303,12 +1279,7 @@ impl EvalAssertion {
    }
 }

-fn eval(
-    iterations: usize,
-    expected_pass_ratio: f32,
-    mismatched_tag_threshold: f32,
-    mut eval: EvalInput,
-) {
+fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
    let mut evaluated_count = 0;
    let mut failed_count = 0;
    report_progress(evaluated_count, failed_count, iterations);
@@ -1321,17 +1292,10 @@ fn eval(
    run_eval(eval.clone(), tx.clone());

    let executor = gpui::background_executor();
-    let semaphore = Arc::new(smol::lock::Semaphore::new(32));
    for _ in 1..iterations {
        let eval = eval.clone();
        let tx = tx.clone();
-        let semaphore = semaphore.clone();
-        executor
-            .spawn(async move {
-                let _guard = semaphore.acquire().await;
-                run_eval(eval, tx)
-            })
-            .detach();
+        executor.spawn(async move { run_eval(eval, tx) }).detach();
    }
    drop(tx);

@@ -1387,7 +1351,7 @@ fn eval(

    let mismatched_tag_ratio =
        cumulative_parser_metrics.mismatched_tags as f32 / cumulative_parser_metrics.tags as f32;
-    if mismatched_tag_ratio > mismatched_tag_threshold {
+    if mismatched_tag_ratio > 0.10 {
        for eval_output in eval_outputs {
            println!("{}", eval_output);
        }
@@ -1559,7 +1523,6 @@ impl EditAgentTest {
            .collect::<Vec<_>>();
        let worktrees = vec![WorktreeContext {
            root_name: "root".to_string(),
-            abs_path: Path::new("/path/to/root").into(),
            rules_file: None,
        }];
        let prompt_builder = PromptBuilder::new(None)?;
@@ -1598,31 +1561,21 @@ impl EditAgentTest {
            if let Some(input_content) = eval.input_content.as_deref() {
                buffer.update(cx, |buffer, cx| buffer.set_text(input_content, cx));
            }
-            retry_on_rate_limit(async || {
-                self.agent
-                    .edit(
-                        buffer.clone(),
-                        eval.edit_file_input.display_description.clone(),
-                        &conversation,
-                        &mut cx.to_async(),
-                    )
-                    .0
-                    .await
-            })
-            .await?
+            let (edit_output, _) = self.agent.edit(
+                buffer.clone(),
+                eval.edit_file_input.display_description,
+                &conversation,
+                &mut cx.to_async(),
+            );
+            edit_output.await?
        } else {
-            retry_on_rate_limit(async || {
-                self.agent
-                    .overwrite(
-                        buffer.clone(),
-                        eval.edit_file_input.display_description.clone(),
-                        &conversation,
-                        &mut cx.to_async(),
-                    )
-                    .0
-                    .await
-            })
-            .await?
+            let (edit_output, _) = self.agent.overwrite(
+                buffer.clone(),
+                eval.edit_file_input.display_description,
+                &conversation,
+                &mut cx.to_async(),
+            );
+            edit_output.await?
        };

        let buffer_text = buffer.read_with(cx, |buffer, _| buffer.text());
@@ -1644,31 +1597,6 @@ impl EditAgentTest {
    }
 }

-async fn retry_on_rate_limit<R>(mut request: impl AsyncFnMut() -> Result<R>) -> Result<R> {
-    let mut attempt = 0;
-    loop {
-        attempt += 1;
-        match request().await {
-            Ok(result) => return Ok(result),
-            Err(err) => match err.downcast::<LanguageModelCompletionError>() {
-                Ok(err) => match err {
-                    LanguageModelCompletionError::RateLimit(duration) => {
-                        // Wait for the duration supplied, with some jitter to avoid all requests being made at the same time.
-                        let jitter = duration.mul_f64(rand::thread_rng().gen_range(0.0..1.0));
-                        eprintln!(
-                            "Attempt #{attempt}: Rate limit exceeded. Retry after {duration:?} + jitter of {jitter:?}"
-                        );
-                        Timer::after(duration + jitter).await;
-                        continue;
-                    }
-                    _ => return Err(err.into()),
-                },
-                Err(err) => return Err(err),
-            },
-        }
-    }
-}
-
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
 struct EvalAssertionOutcome {
    score: usize,
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
@@ -16632,6 +16632,56 @@ impl Editor {
        }
    }

+    // Returns true if the editor handled a go-to-line request
+    pub fn go_to_active_debug_line(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
+        maybe!({
+            let breakpoint_store = self.breakpoint_store.as_ref()?;
+
+            let Some(active_stack_frame) = breakpoint_store.read(cx).active_position().cloned()
+            else {
+                self.clear_row_highlights::<ActiveDebugLine>();
+                return None;
+            };
+
+            let position = active_stack_frame.position;
+            let buffer_id = position.buffer_id?;
+            let snapshot = self
+                .project
+                .as_ref()?
+                .read(cx)
+                .buffer_for_id(buffer_id, cx)?
+                .read(cx)
+                .snapshot();
+
+            let mut handled = false;
+            for (id, ExcerptRange { context, .. }) in
+                self.buffer.read(cx).excerpts_for_buffer(buffer_id, cx)
+            {
+                if context.start.cmp(&position, &snapshot).is_ge()
+                    || context.end.cmp(&position, &snapshot).is_lt()
+                {
+                    continue;
+                }
+                let snapshot = self.buffer.read(cx).snapshot(cx);
+                let multibuffer_anchor = snapshot.anchor_in_excerpt(id, position)?;
+
+                handled = true;
+                self.clear_row_highlights::<ActiveDebugLine>();
+                self.go_to_line::<ActiveDebugLine>(
+                    multibuffer_anchor,
+                    Some(cx.theme().colors().editor_debugger_active_line_background),
+                    window,
+                    cx,
+                );
+
+                cx.notify();
+            }
+
+            handled.then_some(())
+        })
+        .is_some()
+    }
+
    pub fn copy_file_name_without_extension(
        &mut self,
        _: &CopyFileNameWithoutExtension,
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/zode/prompt.md
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/zode/prompt.md
@@ -498,7 +498,7 @@ client.with_options(max_retries=5).messages.create(
 ### Timeouts

 By default requests time out after 10 minutes. You can configure this with a `timeout` option,
-which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/timeouts/#fine-tuning-the-configuration) object:
+which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/#fine-tuning-the-configuration) object:

 ```python
 from anthropic import Anthropic
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -10,9 +10,8 @@ const DELETION_COST: u32 = 10;
 pub struct StreamingFuzzyMatcher {
    snapshot: TextBufferSnapshot,
    query_lines: Vec<String>,
-    line_hint: Option<u32>,
    incomplete_line: String,
-    matches: Vec<Range<usize>>,
+    best_matches: Vec<Range<usize>>,
    matrix: SearchMatrix,
 }

@@ -22,9 +21,8 @@ impl StreamingFuzzyMatcher {
        Self {
            snapshot,
            query_lines: Vec::new(),
-            line_hint: None,
            incomplete_line: String::new(),
-            matches: Vec::new(),
+            best_matches: Vec::new(),
            matrix: SearchMatrix::new(buffer_line_count + 1),
        }
    }
@@ -43,10 +41,9 @@ impl StreamingFuzzyMatcher {
    ///
    /// Returns `Some(range)` if a match has been found with the accumulated
    /// query so far, or `None` if no suitable match exists yet.
-    pub fn push(&mut self, chunk: &str, line_hint: Option<u32>) -> Option<Range<usize>> {
+    pub fn push(&mut self, chunk: &str) -> Option<Range<usize>> {
        // Add the chunk to our incomplete line buffer
        self.incomplete_line.push_str(chunk);
-        self.line_hint = line_hint;

        if let Some((last_pos, _)) = self.incomplete_line.match_indices('\n').next_back() {
            let complete_part = &self.incomplete_line[..=last_pos];
@@ -58,11 +55,20 @@ impl StreamingFuzzyMatcher {

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

-            self.matches = self.resolve_location_fuzzy();
-        }
+            self.best_matches = self.resolve_location_fuzzy();

-        let best_match = self.select_best_match();
-        best_match.or_else(|| self.matches.first().cloned())
+            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
+            }
+        }
    }

    /// Finish processing and return the final best match(es).
@@ -74,9 +80,9 @@ impl StreamingFuzzyMatcher {
        if !self.incomplete_line.is_empty() {
            self.query_lines.push(self.incomplete_line.clone());
            self.incomplete_line.clear();
-            self.matches = self.resolve_location_fuzzy();
+            self.best_matches = self.resolve_location_fuzzy();
        }
-        self.matches.clone()
+        self.best_matches.clone()
    }

    fn resolve_location_fuzzy(&mut self) -> Vec<Range<usize>> {
@@ -192,43 +198,6 @@ impl StreamingFuzzyMatcher {

        valid_matches.into_iter().map(|(_, range)| range).collect()
    }
-
-    /// Return the best match with starting position close enough to line_hint.
-    pub fn select_best_match(&self) -> Option<Range<usize>> {
-        // Allow line hint to be off by that many lines.
-        // Higher values increase probability of applying edits to a wrong place,
-        // Lower values increase edits failures and overall conversation length.
-        const LINE_HINT_TOLERANCE: u32 = 200;
-
-        if self.matches.is_empty() {
-            return None;
-        }
-
-        if self.matches.len() == 1 {
-            return self.matches.first().cloned();
-        }
-
-        let Some(line_hint) = self.line_hint else {
-            // Multiple ambiguous matches
-            return None;
-        };
-
-        let mut best_match = None;
-        let mut best_distance = u32::MAX;
-
-        for range in &self.matches {
-            let start_point = self.snapshot.offset_to_point(range.start);
-            let start_line = start_point.row;
-            let distance = start_line.abs_diff(line_hint);
-
-            if distance <= LINE_HINT_TOLERANCE && distance < best_distance {
-                best_distance = distance;
-                best_match = Some(range.clone());
-            }
-        }
-
-        best_match
-    }
 }

 fn fuzzy_eq(left: &str, right: &str) -> bool {
@@ -671,52 +640,6 @@ mod tests {
        );
    }

-    #[gpui::test]
-    fn test_line_hint_selection() {
-        let text = indoc! {r#"
-            fn first_function() {
-                return 42;
-            }
-
-            fn second_function() {
-                return 42;
-            }
-
-            fn third_function() {
-                return 42;
-            }
-        "#};
-
-        let buffer = TextBuffer::new(0, BufferId::new(1).unwrap(), text.to_string());
-        let snapshot = buffer.snapshot();
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
-
-        // Given a query that matches all three functions
-        let query = "return 42;\n";
-
-        // Test with line hint pointing to second function (around line 5)
-        let best_match = matcher.push(query, Some(5)).expect("Failed to match query");
-
-        let matched_text = snapshot
-            .text_for_range(best_match.clone())
-            .collect::<String>();
-        assert!(matched_text.contains("return 42;"));
-        assert_eq!(
-            best_match,
-            63..77,
-            "Expected to match `second_function` based on the line hint"
-        );
-
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
-        matcher.push(query, None);
-        matcher.finish();
-        let best_match = matcher.select_best_match();
-        assert!(
-            best_match.is_none(),
-            "Best match should be None when query cannot be uniquely resolved"
-        );
-    }
-
    #[track_caller]
    fn assert_location_resolution(text_with_expected_range: &str, query: &str, rng: &mut StdRng) {
        let (text, expected_ranges) = marked_text_ranges(text_with_expected_range, false);
@@ -730,7 +653,7 @@ mod tests {

        // Push chunks incrementally
        for chunk in &chunks {
-            matcher.push(chunk, None);
+            matcher.push(chunk);
        }

        let actual_ranges = matcher.finish();
@@ -783,7 +706,7 @@ mod tests {

    fn push(finder: &mut StreamingFuzzyMatcher, chunk: &str) -> Option<String> {
        finder
-            .push(chunk, None)
+            .push(chunk)
            .map(|range| finder.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
@@ -10,7 +10,7 @@ use assistant_tool::{
    ToolUseStatus,
 };
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey, scroll::Autoscroll};
+use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
@@ -69,13 +69,13 @@ pub struct EditFileToolInput {
    /// start each path with one of the project's root directories.
    ///
    /// The following examples assume we have two root directories in the project:
-    /// - /a/b/backend
-    /// - /c/d/frontend
+    /// - backend
+    /// - frontend
    ///
    /// <example>
    /// `backend/src/main.rs`
    ///
-    /// Notice how the file path starts with `backend`. Without that, the path
+    /// Notice how the file path starts with root-1. Without that, the path
    /// would be ambiguous and the call would fail!
    /// </example>
    ///
@@ -333,18 +333,14 @@ impl Tool for EditFileTool {
                );
                anyhow::ensure!(
                    ambiguous_ranges.is_empty(),
-                    {
-                        let line_numbers = ambiguous_ranges
-                            .iter()
-                            .map(|range| range.start.to_string())
-                            .collect::<Vec<_>>()
-                            .join(", ");
-                        formatdoc! {"
-                            <old_text> matches more than one position in the file (lines: {line_numbers}). Read the
-                            relevant sections of {input_path} again and extend <old_text> so
-                            that I can perform the requested edits.
-                        "}
-                    }
+                    // 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()),
@@ -804,30 +800,11 @@ impl ToolCard for EditFileToolCard {
                                        if let Some(active_editor) = item.downcast::<Editor>() {
                                            active_editor
                                                .update_in(cx, |editor, window, cx| {
-                                                    let snapshot =
-                                                        editor.buffer().read(cx).snapshot(cx);
-                                                    let first_hunk = editor
-                                                        .diff_hunks_in_ranges(
-                                                            &[editor::Anchor::min()
-                                                                ..editor::Anchor::max()],
-                                                            &snapshot,
-                                                        )
-                                                        .next();
-                                                    if let Some(first_hunk) = first_hunk {
-                                                        let first_hunk_start =
-                                                            first_hunk.multi_buffer_range().start;
-                                                        editor.change_selections(
-                                                            Some(Autoscroll::fit()),
-                                                            window,
-                                                            cx,
-                                                            |selections| {
-                                                                selections.select_anchor_ranges([
-                                                                    first_hunk_start
-                                                                        ..first_hunk_start,
-                                                                ]);
-                                                            },
-                                                        )
-                                                    }
+                                                    editor.go_to_singleton_buffer_point(
+                                                        language::Point::new(0, 0),
+                                                        window,
+                                                        cx,
+                                                    );
                                                })
                                                .log_err();
                                        }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -31,8 +31,8 @@ pub struct ReadFileToolInput {
    /// <example>
    /// If the project has the following root directories:
    ///
-    /// - /a/b/directory1
-    /// - /c/d/directory2
+    /// - directory1
+    /// - directory2
    ///
    /// If you want to access `file.txt` in `directory1`, you should use the path `directory1/file.txt`.
    /// If you want to access `file.txt` in `directory2`, you should use the path `directory2/file.txt`.
--- a/crates/assistant_tools/src/templates/edit_file_prompt.hbs
+++ b/crates/assistant_tools/src/templates/edit_file_prompt.hbs
@@ -3,21 +3,21 @@ You MUST respond with a series of edits to a file, using the following format:
 ```
 <edits>

-<old_text line=10>
+<old_text>
 OLD TEXT 1 HERE
 </old_text>
 <new_text>
 NEW TEXT 1 HERE
 </new_text>

-<old_text line=456>
+<old_text>
 OLD TEXT 2 HERE
 </old_text>
 <new_text>
 NEW TEXT 2 HERE
 </new_text>

-<old_text line=42>
+<old_text>
 OLD TEXT 3 HERE
 </old_text>
 <new_text>
@@ -33,7 +33,6 @@ NEW TEXT 3 HERE
 - `<old_text>` must exactly match existing file content, including indentation
 - `<old_text>` must come from the actual file, not an outline
 - `<old_text>` cannot be empty
- `line` should be a starting line number for the text to be replaced
 - Be minimal with replacements:
  - For unique lines, include only those lines
  - For non-unique lines, include enough context to identify them
@@ -49,7 +48,7 @@ Claude and gpt-4.1 don't really need it. --}}
 <example>
 <edits>

-<old_text line=3>
+<old_text>
 struct User {
    name: String,
    email: String,
@@ -63,7 +62,7 @@ struct User {
 }
 </new_text>

-<old_text line=25>
+<old_text>
    let user = User {
        name: String::from("John"),
        email: String::from("john@example.com"),
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -638,36 +638,29 @@ impl ToolCard for TerminalToolCard {
                            .bg(cx.theme().colors().editor_background)
                            .rounded_b_md()
                            .text_ui_sm(cx)
-                            .child({
-                                let content_mode = terminal.read(cx).content_mode(window, cx);
-
-                                if content_mode.is_scrollable() {
-                                    div().h_72().child(terminal.clone()).into_any_element()
-                                } else {
-                                    ToolOutputPreview::new(
-                                        terminal.clone().into_any_element(),
-                                        terminal.entity_id(),
-                                    )
-                                    .with_total_lines(self.content_line_count)
-                                    .toggle_state(!content_mode.is_limited())
-                                    .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,
-                                                );
-                                            });
-                                        }
-                                    })
-                                    .into_any_element()
-                                }
-                            }),
+                            .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,
+                                            );
+                                        });
+                                    }
+                                }),
+                            ),
                    )
                },
            )
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -221,7 +221,7 @@ pub fn check(_: &Check, window: &mut Window, cx: &mut App) {
    }

    if let Some(updater) = AutoUpdater::get(cx) {
-        updater.update(cx, |updater, cx| updater.poll(UpdateCheckType::Manual, cx));
+        updater.update(cx, |updater, cx| updater.poll(cx));
    } else {
        drop(window.prompt(
            gpui::PromptLevel::Info,
@@ -296,11 +296,6 @@ impl InstallerDir {
    }
 }

-pub enum UpdateCheckType {
-    Automatic,
-    Manual,
-}
-
 impl AutoUpdater {
    pub fn get(cx: &mut App) -> Option<Entity<Self>> {
        cx.default_global::<GlobalAutoUpdate>().0.clone()
@@ -318,13 +313,13 @@ impl AutoUpdater {
    pub fn start_polling(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
        cx.spawn(async move |this, cx| {
            loop {
-                this.update(cx, |this, cx| this.poll(UpdateCheckType::Automatic, cx))?;
+                this.update(cx, |this, cx| this.poll(cx))?;
                cx.background_executor().timer(POLL_INTERVAL).await;
            }
        })
    }

-    pub fn poll(&mut self, check_type: UpdateCheckType, cx: &mut Context<Self>) {
+    pub fn poll(&mut self, cx: &mut Context<Self>) {
        if self.pending_poll.is_some() {
            return;
        }
@@ -336,18 +331,8 @@ impl AutoUpdater {
            this.update(cx, |this, cx| {
                this.pending_poll = None;
                if let Err(error) = result {
-                    this.status = match check_type {
-                        // Be quiet if the check was automated (e.g. when offline)
-                        UpdateCheckType::Automatic => {
-                            log::info!("auto-update check failed: error:{:?}", error);
-                            AutoUpdateStatus::Idle
-                        }
-                        UpdateCheckType::Manual => {
-                            log::error!("auto-update failed: error:{:?}", error);
-                            AutoUpdateStatus::Errored
-                        }
-                    };
-
+                    log::error!("auto-update failed: error:{:?}", error);
+                    this.status = AutoUpdateStatus::Errored;
                    cx.notify();
                }
            })
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -452,10 +452,6 @@ impl Model {
                | Model::Claude3_5SonnetV2
                | Model::Claude3_7Sonnet
                | Model::Claude3_7SonnetThinking
-                | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeOpus4
-                | Model::ClaudeOpus4Thinking
                | Model::Claude3Haiku
                | Model::Claude3Opus
                | Model::Claude3Sonnet
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -111,7 +111,7 @@ pub struct ChannelMembership {
    pub role: proto::ChannelRole,
 }
 impl ChannelMembership {
-    pub fn sort_key(&self) -> MembershipSortKey<'_> {
+    pub fn sort_key(&self) -> MembershipSortKey {
        MembershipSortKey {
            role_order: match self.role {
                proto::ChannelRole::Admin => 0,
--- a/crates/channel/src/channel_store/channel_index.rs
+++ b/crates/channel/src/channel_store/channel_index.rs
@@ -32,7 +32,7 @@ impl ChannelIndex {
            .retain(|channel_id| !channels.contains(channel_id));
    }

-    pub fn bulk_insert(&mut self) -> ChannelPathsInsertGuard<'_> {
+    pub fn bulk_insert(&mut self) -> ChannelPathsInsertGuard {
        ChannelPathsInsertGuard {
            channels_ordered: &mut self.channels_ordered,
            channels_by_id: &mut self.channels_by_id,
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -269,6 +269,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                github_login: "nathansobo".into(),
                avatar_url: "http://avatar.com/nathansobo".into(),
                name: None,
+                email: None,
            }],
        },
    );
@@ -322,6 +323,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                github_login: "maxbrunsfeld".into(),
                avatar_url: "http://avatar.com/maxbrunsfeld".into(),
                name: None,
+                email: None,
            }],
        },
    );
@@ -366,6 +368,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                github_login: "as-cii".into(),
                avatar_url: "http://avatar.com/as-cii".into(),
                name: None,
+                email: None,
            }],
        },
    );
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -127,9 +127,6 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
 }

 fn main() -> Result<()> {
-    #[cfg(unix)]
-    util::prevent_root_execution();
-
    // Exit flatpak sandbox if needed
    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
    {
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -28,9 +28,6 @@ feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
 gpui_tokio.workspace = true
-# Don't update `hickory-resolver`, it has a bug that causes it to not resolve DNS queries correctly.
-# See https://github.com/hickory-dns/hickory-dns/issues/3048
-hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }
 http_client.workspace = true
 http_client_tls.workspace = true
 httparse = "1.10"
@@ -39,7 +36,6 @@ paths.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
-regex.workspace = true
 release_channel.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
 schemars.workspace = true
@@ -52,7 +48,7 @@ telemetry_events.workspace = true
 text.workspace = true
 thiserror.workspace = true
 time.workspace = true
-tiny_http.workspace = true
+tiny_http = "0.8"
 tokio-socks = { version = "0.5.2", default-features = false, features = ["futures-io"] }
 url.workspace = true
 util.workspace = true
@@ -64,12 +60,11 @@ workspace-hack.workspace = true
 [dev-dependencies]
 clock = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
-fs.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
 rpc = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 util = { workspace = true, features = ["test-support"] }
+http_client = { workspace = true, features = ["test-support"] }

 [target.'cfg(target_os = "windows")'.dependencies]
 windows.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1887,16 +1887,8 @@ mod tests {
            .set_entity(&entity3, &mut cx.to_async());
        drop(subscription3);

-        server.send(proto::JoinProject {
-            project_id: 1,
-            committer_name: None,
-            committer_email: None,
-        });
-        server.send(proto::JoinProject {
-            project_id: 2,
-            committer_name: None,
-            committer_email: None,
-        });
+        server.send(proto::JoinProject { project_id: 1 });
+        server.send(proto::JoinProject { project_id: 2 });
        done_rx1.recv().await.unwrap();
        done_rx2.recv().await.unwrap();
    }
--- a/crates/client/src/proxy.rs
+++ b/crates/client/src/proxy.rs
@@ -3,30 +3,20 @@
 mod http_proxy;
 mod socks_proxy;

-use std::sync::LazyLock;
-
 use anyhow::{Context as _, Result};
-use hickory_resolver::{
-    AsyncResolver, TokioAsyncResolver,
-    config::LookupIpStrategy,
-    name_server::{GenericConnector, TokioRuntimeProvider},
-    system_conf,
-};
 use http_client::Url;
 use http_proxy::{HttpProxyType, connect_http_proxy_stream, parse_http_proxy};
 use socks_proxy::{SocksVersion, connect_socks_proxy_stream, parse_socks_proxy};
-use tokio_socks::{IntoTargetAddr, TargetAddr};
-use util::ResultExt;

 pub(crate) async fn connect_proxy_stream(
    proxy: &Url,
    rpc_host: (&str, u16),
 ) -> Result<Box<dyn AsyncReadWrite>> {
-    let Some(((proxy_domain, proxy_port), proxy_type)) = parse_proxy_type(proxy).await else {
+    let Some(((proxy_domain, proxy_port), proxy_type)) = parse_proxy_type(proxy) else {
        // If parsing the proxy URL fails, we must avoid falling back to an insecure connection.
        // SOCKS proxies are often used in contexts where security and privacy are critical,
        // so any fallback could expose users to significant risks.
-        anyhow::bail!("Parsing proxy url type failed");
+        anyhow::bail!("Parsing proxy url failed");
    };

    // Connect to proxy and wrap protocol later
@@ -49,8 +39,10 @@ enum ProxyType<'t> {
    HttpProxy(HttpProxyType<'t>),
 }

-async fn parse_proxy_type(proxy: &Url) -> Option<((String, u16), ProxyType<'_>)> {
+fn parse_proxy_type(proxy: &Url) -> Option<((String, u16), ProxyType)> {
    let scheme = proxy.scheme();
+    let host = proxy.host()?.to_string();
+    let port = proxy.port_or_known_default()?;
    let proxy_type = match scheme {
        scheme if scheme.starts_with("socks") => {
            Some(ProxyType::SocksProxy(parse_socks_proxy(scheme, proxy)))
@@ -60,38 +52,8 @@ async fn parse_proxy_type(proxy: &Url) -> Option<((String, u16), ProxyType<'_>)>
        }
        _ => None,
    }?;
-    let (ip, port) = {
-        let host = proxy.host()?.to_string();
-        let port = proxy.port_or_known_default()?;
-        resolve_proxy_url_if_needed((host, port)).await.log_err()?
-    };

-    Some(((ip, port), proxy_type))
-}
-
-static SYSTEM_DNS_RESOLVER: LazyLock<AsyncResolver<GenericConnector<TokioRuntimeProvider>>> =
-    LazyLock::new(|| {
-        let (config, mut opts) = system_conf::read_system_conf().unwrap();
-        opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6;
-        TokioAsyncResolver::tokio(config, opts)
-    });
-
-async fn resolve_proxy_url_if_needed(proxy: (String, u16)) -> Result<(String, u16)> {
-    let proxy = proxy
-        .into_target_addr()
-        .context("Failed to parse proxy addr")?;
-    match proxy {
-        TargetAddr::Domain(domain, port) => {
-            let ip = SYSTEM_DNS_RESOLVER
-                .lookup_ip(domain.as_ref())
-                .await?
-                .into_iter()
-                .next()
-                .ok_or_else(|| anyhow::anyhow!("No IP found for proxy domain {domain}"))?;
-            Ok((ip.to_string(), port))
-        }
-        TargetAddr::Ip(ip_addr) => Ok((ip_addr.ip().to_string(), ip_addr.port())),
-    }
+    Some(((host, port), proxy_type))
 }

 pub(crate) trait AsyncReadWrite:
--- a/crates/client/src/proxy/socks_proxy.rs
+++ b/crates/client/src/proxy/socks_proxy.rs
@@ -1,7 +1,5 @@
 //! socks proxy

-use std::net::SocketAddr;
-
 use anyhow::{Context as _, Result};
 use http_client::Url;
 use tokio::net::TcpStream;
@@ -10,8 +8,6 @@ use tokio_socks::{
    tcp::{Socks4Stream, Socks5Stream},
 };

-use crate::proxy::SYSTEM_DNS_RESOLVER;
-
 use super::AsyncReadWrite;

 /// Identification to a Socks V4 Proxy
@@ -77,14 +73,12 @@ pub(super) async fn connect_socks_proxy_stream(
    };
    let rpc_host = match (rpc_host, local_dns) {
        (TargetAddr::Domain(domain, port), true) => {
-            let ip_addr = SYSTEM_DNS_RESOLVER
-                .lookup_ip(domain.as_ref())
+            let ip_addr = tokio::net::lookup_host((domain.as_ref(), port))
                .await
                .with_context(|| format!("Failed to lookup domain {}", domain))?
-                .into_iter()
                .next()
                .ok_or_else(|| anyhow::anyhow!("Failed to lookup domain {}", domain))?;
-            TargetAddr::Ip(SocketAddr::new(ip_addr, port))
+            TargetAddr::Ip(ip_addr)
        }
        (rpc_host, _) => rpc_host,
    };
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -8,11 +8,10 @@ use futures::{Future, FutureExt, StreamExt};
 use gpui::{App, AppContext as _, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
 use parking_lot::Mutex;
-use regex::Regex;
 use release_channel::ReleaseChannel;
 use settings::{Settings, SettingsStore};
 use sha2::{Digest, Sha256};
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 use std::fs::File;
 use std::io::Write;
 use std::sync::LazyLock;
@@ -46,13 +45,31 @@ struct TelemetryState {
    first_event_date_time: Option<Instant>,
    event_coalescer: EventCoalescer,
    max_queue_size: usize,
-    worktrees_with_project_type_events_sent: HashSet<WorktreeId>,
+    worktree_id_map: WorktreeIdMap,

    os_name: String,
    app_version: String,
    os_version: Option<String>,
 }

+#[derive(Debug)]
+struct WorktreeIdMap(HashMap<String, ProjectCache>);
+
+#[derive(Debug)]
+struct ProjectCache {
+    name: String,
+    worktree_ids_reported: HashSet<WorktreeId>,
+}
+
+impl ProjectCache {
+    fn new(name: String) -> Self {
+        Self {
+            name,
+            worktree_ids_reported: HashSet::default(),
+        }
+    }
+}
+
 #[cfg(debug_assertions)]
 const MAX_QUEUE_LEN: usize = 5;

@@ -74,10 +91,6 @@ static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
        })
 });

-static DOTNET_PROJECT_FILES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r"^(global\.json|Directory\.Build\.props|.*\.(csproj|fsproj|vbproj|sln))$").unwrap()
-});
-
 pub fn os_name() -> String {
    #[cfg(target_os = "macos")]
    {
@@ -181,7 +194,20 @@ impl Telemetry {
            first_event_date_time: None,
            event_coalescer: EventCoalescer::new(clock.clone()),
            max_queue_size: MAX_QUEUE_LEN,
-            worktrees_with_project_type_events_sent: HashSet::new(),
+            worktree_id_map: WorktreeIdMap(HashMap::from_iter([
+                (
+                    "pnpm-lock.yaml".to_string(),
+                    ProjectCache::new("pnpm".to_string()),
+                ),
+                (
+                    "yarn.lock".to_string(),
+                    ProjectCache::new("yarn".to_string()),
+                ),
+                (
+                    "package.json".to_string(),
+                    ProjectCache::new("node".to_string()),
+                ),
+            ])),

            os_version: None,
            os_name: os_name(),
@@ -345,60 +371,51 @@ impl Telemetry {
        }
    }

-    pub fn report_discovered_project_type_events(
+    pub fn report_discovered_project_events(
        self: &Arc<Self>,
        worktree_id: WorktreeId,
        updated_entries_set: &UpdatedEntriesSet,
    ) {
-        let project_type_names = self.detect_project_types(worktree_id, updated_entries_set);
+        let project_type_names: Vec<String> = {
+            let mut state = self.state.lock();
+            state
+                .worktree_id_map
+                .0
+                .iter_mut()
+                .filter_map(|(project_file_name, project_type_telemetry)| {
+                    if project_type_telemetry
+                        .worktree_ids_reported
+                        .contains(&worktree_id)
+                    {
+                        return None;
+                    }
+
+                    let project_file_found = updated_entries_set.iter().any(|(path, _, _)| {
+                        path.as_ref()
+                            .file_name()
+                            .and_then(|name| name.to_str())
+                            .map(|name_str| name_str == project_file_name)
+                            .unwrap_or(false)
+                    });
+
+                    if !project_file_found {
+                        return None;
+                    }
+
+                    project_type_telemetry
+                        .worktree_ids_reported
+                        .insert(worktree_id);
+
+                    Some(project_type_telemetry.name.clone())
+                })
+                .collect()
+        };

        for project_type_name in project_type_names {
            telemetry::event!("Project Opened", project_type = project_type_name);
        }
    }

-    fn detect_project_types(
-        self: &Arc<Self>,
-        worktree_id: WorktreeId,
-        updated_entries_set: &UpdatedEntriesSet,
-    ) -> Vec<String> {
-        let mut state = self.state.lock();
-        let mut project_names: HashSet<String> = HashSet::new();
-
-        if state
-            .worktrees_with_project_type_events_sent
-            .contains(&worktree_id)
-        {
-            return project_names.into_iter().collect();
-        }
-
-        for (path, _, _) in updated_entries_set.iter() {
-            let Some(file_name) = path.file_name().and_then(|f| f.to_str()) else {
-                continue;
-            };
-
-            if file_name == "pnpm-lock.yaml" {
-                project_names.insert("pnpm".to_string());
-            } else if file_name == "yarn.lock" {
-                project_names.insert("yarn".to_string());
-            } else if file_name == "package.json" {
-                project_names.insert("node".to_string());
-            } else if DOTNET_PROJECT_FILES_REGEX.is_match(file_name) {
-                project_names.insert("dotnet".to_string());
-            }
-        }
-
-        if !project_names.is_empty() {
-            state
-                .worktrees_with_project_type_events_sent
-                .insert(worktree_id);
-        }
-
-        let mut project_names_vec: Vec<String> = project_names.into_iter().collect();
-        project_names_vec.sort();
-        project_names_vec
-    }
-
    fn report_event(self: &Arc<Self>, event: Event) {
        let mut state = self.state.lock();
        // RUST_LOG=telemetry=trace to debug telemetry events
@@ -561,9 +578,7 @@ mod tests {
    use clock::FakeSystemClock;
    use gpui::TestAppContext;
    use http_client::FakeHttpClient;
-    use std::collections::HashMap;
    use telemetry_events::FlexibleEvent;
-    use worktree::{PathChange, ProjectEntryId, WorktreeId};

    #[gpui::test]
    fn test_telemetry_flush_on_max_queue_size(cx: &mut TestAppContext) {
@@ -681,97 +696,6 @@ mod tests {
        });
    }

-    #[gpui::test]
-    fn test_project_discovery_does_not_double_report(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-        let worktree_id = 1;
-
-        // First scan of worktree 1 returns project types
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["package.json"],
-            vec!["node"],
-            worktree_id,
-        );
-
-        // Rescan of worktree 1 returns nothing as it has already been reported
-        test_project_discovery_helper(telemetry.clone(), vec!["package.json"], vec![], worktree_id);
-    }
-
-    #[gpui::test]
-    fn test_pnpm_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["package.json", "pnpm-lock.yaml"],
-            vec!["node", "pnpm"],
-            1,
-        );
-    }
-
-    #[gpui::test]
-    fn test_yarn_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["package.json", "yarn.lock"],
-            vec!["node", "yarn"],
-            1,
-        );
-    }
-
-    #[gpui::test]
-    fn test_dotnet_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        // Using different worktrees, as production code blocks from reporting a
-        // project type for the same worktree multiple times
-
-        test_project_discovery_helper(
-            telemetry.clone().clone(),
-            vec!["global.json"],
-            vec!["dotnet"],
-            1,
-        );
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["Directory.Build.props"],
-            vec!["dotnet"],
-            2,
-        );
-        test_project_discovery_helper(telemetry.clone(), vec!["file.csproj"], vec!["dotnet"], 3);
-        test_project_discovery_helper(telemetry.clone(), vec!["file.fsproj"], vec!["dotnet"], 4);
-        test_project_discovery_helper(telemetry.clone(), vec!["file.vbproj"], vec!["dotnet"], 5);
-        test_project_discovery_helper(telemetry.clone(), vec!["file.sln"], vec!["dotnet"], 6);
-
-        // Each worktree should only send a single project type event, even when
-        // encountering multiple files associated with that project type
-        test_project_discovery_helper(
-            telemetry,
-            vec!["global.json", "Directory.Build.props"],
-            vec!["dotnet"],
-            7,
-        );
-    }
-
    // TODO:
    // Test settings
    // Update FakeHTTPClient to keep track of the number of requests and assert on it
@@ -788,36 +712,4 @@ mod tests {
            && telemetry.state.lock().flush_events_task.is_none()
            && telemetry.state.lock().first_event_date_time.is_none()
    }
-
-    fn test_project_discovery_helper(
-        telemetry: Arc<Telemetry>,
-        file_paths: Vec<&str>,
-        expected_project_types: Vec<&str>,
-        worktree_id_num: usize,
-    ) {
-        let worktree_id = WorktreeId::from_usize(worktree_id_num);
-        let entries: Vec<_> = file_paths
-            .into_iter()
-            .enumerate()
-            .map(|(i, path)| {
-                (
-                    Arc::from(std::path::Path::new(path)),
-                    ProjectEntryId::from_proto(i as u64 + 1),
-                    PathChange::Added,
-                )
-            })
-            .collect();
-        let updated_entries: UpdatedEntriesSet = Arc::from(entries.as_slice());
-
-        let mut detected_types = telemetry.detect_project_types(worktree_id, &updated_entries);
-        detected_types.sort();
-
-        let mut expected_sorted = expected_project_types
-            .into_iter()
-            .map(String::from)
-            .collect::<Vec<_>>();
-        expected_sorted.sort();
-
-        assert_eq!(detected_types, expected_sorted);
-    }
 }
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -49,6 +49,7 @@ pub struct User {
    pub github_login: String,
    pub avatar_uri: SharedUri,
    pub name: Option<String>,
+    pub email: Option<String>,
 }

 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -57,8 +58,6 @@ pub struct Collaborator {
    pub replica_id: ReplicaId,
    pub user_id: UserId,
    pub is_host: bool,
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
 }

 impl PartialOrd for User {
@@ -882,6 +881,7 @@ impl User {
            github_login: message.github_login,
            avatar_uri: message.avatar_url.into(),
            name: message.name,
+            email: message.email,
        })
    }
 }
@@ -912,8 +912,6 @@ impl Collaborator {
            replica_id: message.replica_id as ReplicaId,
            user_id: message.user_id as UserId,
            is_host: message.is_host,
-            committer_name: message.committer_name,
-            committer_email: message.committer_email,
        })
    }
 }
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -80,6 +80,7 @@ zed_llm_client.workspace = true
 agent_settings.workspace = true
 assistant_context_editor.workspace = true
 assistant_slash_command.workspace = true
+assistant_tool.workspace = true
 async-trait.workspace = true
 audio.workspace = true
 buffer_diff.workspace = true
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -185,9 +185,7 @@ CREATE TABLE "project_collaborators" (
    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
    "user_id" INTEGER NOT NULL,
    "replica_id" INTEGER NOT NULL,
-    "is_host" BOOLEAN NOT NULL,
-    "committer_name" VARCHAR,
-    "committer_email" VARCHAR
+    "is_host" BOOLEAN NOT NULL
 );

 CREATE INDEX "index_project_collaborators_on_project_id" ON "project_collaborators" ("project_id");
--- a/crates/collab/migrations/20250612153105_add_collaborator_commit_email.sql
+++ b/crates/collab/migrations/20250612153105_add_collaborator_commit_email.sql
@@ -1,4 +0,0 @@
-alter table project_collaborators
-    add column committer_name varchar;
-alter table project_collaborators
-    add column committer_email varchar;
--- a/crates/collab/src/api.rs
+++ b/crates/collab/src/api.rs
@@ -97,7 +97,7 @@ impl std::fmt::Display for SystemIdHeader {

 pub fn routes(rpc_server: Arc<rpc::Server>) -> Router<(), Body> {
    Router::new()
-        .route("/user", get(update_or_create_authenticated_user))
+        .route("/user", get(get_authenticated_user))
        .route("/users/look_up", get(look_up_user))
        .route("/users/:id/access_tokens", post(create_access_token))
        .route("/rpc_server_snapshot", get(get_rpc_server_snapshot))
@@ -157,7 +157,7 @@ struct AuthenticatedUserResponse {
    feature_flags: Vec<String>,
 }

-async fn update_or_create_authenticated_user(
+async fn get_authenticated_user(
    Query(params): Query<AuthenticatedUserParams>,
    Extension(app): Extension<Arc<AppState>>,
 ) -> Result<Json<AuthenticatedUserResponse>> {
@@ -165,7 +165,7 @@ async fn update_or_create_authenticated_user(

    let user = app
        .db
-        .update_or_create_user_by_github_account(
+        .get_or_create_user_by_github_account(
            &params.github_login,
            params.github_user_id,
            params.github_email.as_deref(),
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -751,8 +751,6 @@ pub struct ProjectCollaborator {
    pub user_id: UserId,
    pub replica_id: ReplicaId,
    pub is_host: bool,
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
 }

 impl ProjectCollaborator {
@@ -762,8 +760,6 @@ impl ProjectCollaborator {
            replica_id: self.replica_id.0 as u32,
            user_id: self.user_id.to_proto(),
            is_host: self.is_host,
-            committer_name: self.committer_name.clone(),
-            committer_email: self.committer_email.clone(),
        }
    }
 }
--- a/crates/collab/src/db/queries/buffers.rs
+++ b/crates/collab/src/db/queries/buffers.rs
@@ -118,8 +118,6 @@ impl Database {
                        user_id: collaborator.user_id.to_proto(),
                        replica_id: collaborator.replica_id.0 as u32,
                        is_host: false,
-                        committer_name: None,
-                        committer_email: None,
                    })
                    .collect(),
            })
@@ -227,8 +225,6 @@ impl Database {
                                user_id: collaborator.user_id.to_proto(),
                                replica_id: collaborator.replica_id.0 as u32,
                                is_host: false,
-                                committer_name: None,
-                                committer_email: None,
                            })
                            .collect(),
                    },
@@ -265,8 +261,6 @@ impl Database {
                        replica_id: db_collaborator.replica_id.0 as u32,
                        user_id: db_collaborator.user_id.to_proto(),
                        is_host: false,
-                        committer_name: None,
-                        committer_email: None,
                    })
                } else {
                    collaborator_ids_to_remove.push(db_collaborator.id);
@@ -396,8 +390,6 @@ impl Database {
                replica_id: row.replica_id.0 as u32,
                user_id: row.user_id.to_proto(),
                is_host: false,
-                committer_name: None,
-                committer_email: None,
            });
        }

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-help-icon lucide-circle-help"><circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/><path d="M12 17h.01"/></svg>`