comments

select better and use tools for inline assistant
fix license
2025-12-03 10:09:22 -08:00 · 2025-12-03 09:51:16 -08:00 · 2025-12-02 17:13:52 -08:00 · 2025-12-02 17:13:52 -08:00 · 2025-12-02 17:13:52 -08:00 · 2025-12-02 17:13:52 -08:00
879 changed files with 35123 additions and 45553 deletions
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@@ -75,22 +75,6 @@ body:
        </details>
    validations:
      required: false
-  - type: textarea
-    attributes:
-      label: Relevant Keymap
-      description: |
-        Open the command palette in Zed, then type “zed: open keymap file” and copy/paste the file's contents.
-      value: |
-        <details><summary>keymap.json</summary>
-
-        <!-- Paste your keymap file inside the code block. -->
-        ```json
-
-        ```
-
-        </details>
-    validations:
-      required: false
  - type: textarea
    attributes:
      label: (for AI issues) Model provider details
--- a/.github/workflows/after_release.yml
+++ b/.github/workflows/after_release.yml
@@ -5,27 +5,13 @@ on:
  release:
    types:
    - published
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: tag_name
-        required: true
-        type: string
-      prerelease:
-        description: prerelease
-        required: true
-        type: boolean
-      body:
-        description: body
-        type: string
-        default: ''
 jobs:
  rebuild_releases_page:
    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
    runs-on: namespace-profile-2x4-ubuntu-2404
    steps:
    - name: after_release::rebuild_releases_page::refresh_cloud_releases
-      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name || inputs.tag_name }}
+      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name }}
      shell: bash -euxo pipefail {0}
    - name: after_release::rebuild_releases_page::redeploy_zed_dev
      run: npm exec --yes -- vercel@37 --token="$VERCEL_TOKEN" --scope zed-industries redeploy https://zed.dev
@@ -41,7 +27,7 @@ jobs:
    - id: get-release-url
      name: after_release::post_to_discord::get_release_url
      run: |
-        if [ "${{ github.event.release.prerelease || inputs.prerelease }}" == "true" ]; then
+        if [ "${{ github.event.release.prerelease }}" == "true" ]; then
            URL="https://zed.dev/releases/preview"
        else
            URL="https://zed.dev/releases/stable"
@@ -54,9 +40,9 @@ jobs:
      uses: 2428392/gh-truncate-string-action@b3ff790d21cf42af3ca7579146eedb93c8fb0757
      with:
        stringToTruncate: |
-          📣 Zed [${{ github.event.release.tag_name || inputs.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>)  was just released!
+          📣 Zed [${{ github.event.release.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>) was just released!

-          ${{ github.event.release.body || inputs.body }}
+          ${{ github.event.release.body }}
        maxLength: 2000
        truncationSymbol: '...'
    - name: after_release::post_to_discord::discord_webhook_action
@@ -70,7 +56,7 @@ jobs:
    - id: set-package-name
      name: after_release::publish_winget::set_package_name
      run: |
-        if ("${{ github.event.release.prerelease || inputs.prerelease }}" -eq "true") {
+        if ("${{ github.event.release.prerelease }}" -eq "true") {
            $PACKAGE_NAME = "ZedIndustries.Zed.Preview"
        } else {
            $PACKAGE_NAME = "ZedIndustries.Zed"
@@ -82,7 +68,6 @@ jobs:
      uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
      with:
        identifier: ${{ steps.set-package-name.outputs.PACKAGE_NAME }}
-        release-tag: ${{ github.event.release.tag_name || inputs.tag_name }}
        max-versions-to-keep: 5
        token: ${{ secrets.WINGET_TOKEN }}
  create_sentry_release:
--- a/.github/workflows/autofix_pr.yml
+++ b/.github/workflows/autofix_pr.yml
@@ -1,83 +0,0 @@
-# Generated from xtask::workflows::autofix_pr
-# Rebuild with `cargo xtask workflows`.
-name: autofix_pr
-run-name: 'autofix PR #${{ inputs.pr_number }}'
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: pr_number
-        required: true
-        type: string
-jobs:
-  run_autofix:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - id: get-app-token
-      name: autofix_pr::run_autofix::authenticate_as_zippy
-      uses: actions/create-github-app-token@bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1
-      with:
-        app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
-        private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
-    - name: steps::checkout_repo_with_token
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        token: ${{ steps.get-app-token.outputs.token }}
-    - name: autofix_pr::run_autofix::checkout_pr
-      run: gh pr checkout ${{ inputs.pr_number }}
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: ${{ steps.get-app-token.outputs.token }}
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
-      with:
-        version: '9'
-    - name: autofix_pr::run_autofix::run_prettier_fix
-      run: ./script/prettier --write
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::run_cargo_fmt
-      run: cargo fmt --all
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::run_clippy_fix
-      run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::commit_and_push
-      run: |
-        if git diff --quiet; then
-            echo "No changes to commit"
-        else
-            git add -A
-            git commit -m "Autofix"
-            git push
-        fi
-      shell: bash -euxo pipefail {0}
-      env:
-        GIT_COMMITTER_NAME: Zed Zippy
-        GIT_COMMITTER_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
-        GIT_AUTHOR_NAME: Zed Zippy
-        GIT_AUTHOR_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
-        GITHUB_TOKEN: ${{ steps.get-app-token.outputs.token }}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
--- a/.github/workflows/extension_bump.yml
+++ b/.github/workflows/extension_bump.yml
@@ -25,6 +25,33 @@ on:
        description: The app secret for the corresponding app ID
        required: true
 jobs:
+  check_extension:
+    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    steps:
+    - name: steps::checkout_repo
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        clean: false
+    - id: cache-zed-extension-cli
+      name: extension_tests::cache_zed_extension_cli
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+      with:
+        path: zed-extension
+        key: zed-extension-${{ env.ZED_EXTENSION_CLI_SHA }}
+    - name: extension_tests::download_zed_extension_cli
+      if: steps.cache-zed-extension-cli.outputs.cache-hit != 'true'
+      run: |
+        wget --quiet "https://zed-extension-cli.nyc3.digitaloceanspaces.com/$ZED_EXTENSION_CLI_SHA/x86_64-unknown-linux-gnu/zed-extension"
+        chmod +x zed-extension
+      shell: bash -euxo pipefail {0}
+    - name: extension_tests::check
+      run: |
+        mkdir -p /tmp/ext-scratch
+        mkdir -p /tmp/ext-output
+        ./zed-extension --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output
+      shell: bash -euxo pipefail {0}
+    timeout-minutes: 2
  check_bump_needed:
    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
    runs-on: namespace-profile-2x4-ubuntu-2404
@@ -62,6 +89,7 @@ jobs:
    timeout-minutes: 1
  bump_extension_version:
    needs:
+    - check_extension
    - check_bump_needed
    if: |-
      (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') &&
@@ -113,10 +141,10 @@ jobs:
        delete-branch: true
        token: ${{ steps.generate-token.outputs.token }}
        sign-commits: true
-        assignees: ${{ github.actor }}
    timeout-minutes: 1
  create_version_label:
    needs:
+    - check_extension
    - check_bump_needed
    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.check_bump_needed.outputs.needs_bump == 'false'
    runs-on: namespace-profile-8x16-ubuntu-2204
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -497,8 +497,6 @@ jobs:
    env:
      GIT_AUTHOR_NAME: Protobuf Action
      GIT_AUTHOR_EMAIL: ci@zed.dev
-      GIT_COMMITTER_NAME: Protobuf Action
-      GIT_COMMITTER_EMAIL: ci@zed.dev
    steps:
    - name: steps::checkout_repo
      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 .DS_Store
 .blob_store
 .build
-.claude/settings.local.json
 .envrc
 .flatpak-builder
 .idea
@@ -40,6 +39,3 @@ xcuserdata/
 # Don't commit any secrets to the repo.
 .env
 .env.secret.toml
-
-# `nix build` output
-/result
--- a/.rules
+++ b/.rules
@@ -26,12 +26,6 @@
  });
  ```

-# Timers in tests
-
-* In GPUI tests, prefer GPUI executor timers over `smol::Timer::after(...)` when you need timeouts, delays, or to drive `run_until_parked()`:
-  - Use `cx.background_executor().timer(duration).await` (or `cx.background_executor.timer(duration).await` in `TestAppContext`) so the work is scheduled on GPUI's dispatcher.
-  - Avoid `smol::Timer::after(...)` for test timeouts when you rely on `run_until_parked()`, because it may not be tracked by GPUI's scheduler and can lead to "nothing left to run" when pumping.
-
 # GPUI

 GPUI is a UI framework which also provides primitives for state and concurrency management.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
    "crates/agent_servers",
    "crates/agent_settings",
    "crates/agent_ui",
-    "crates/agent_ui_v2",
    "crates/ai_onboarding",
    "crates/anthropic",
    "crates/askpass",
@@ -33,6 +32,7 @@ members = [
    "crates/cloud_api_client",
    "crates/cloud_api_types",
    "crates/cloud_llm_client",
+    "crates/cloud_zeta2_prompt",
    "crates/collab",
    "crates/collab_ui",
    "crates/collections",
@@ -54,9 +54,9 @@ members = [
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/edit_prediction",
-    "crates/edit_prediction_types",
-    "crates/edit_prediction_ui",
+    "crates/edit_prediction_button",
    "crates/edit_prediction_context",
+    "crates/zeta2_tools",
    "crates/editor",
    "crates/eval",
    "crates/eval_utils",
@@ -201,12 +201,10 @@ members = [
    "crates/zed",
    "crates/zed_actions",
    "crates/zed_env_vars",
-    "crates/edit_prediction_cli",
-    "crates/zeta_prompt",
+    "crates/zeta",
+    "crates/zeta_cli",
    "crates/zlog",
    "crates/zlog_settings",
-    "crates/ztracing",
-    "crates/ztracing_macro",

    #
    # Extensions
@@ -243,9 +241,9 @@ action_log = { path = "crates/action_log" }
 agent = { path = "crates/agent" }
 activity_indicator = { path = "crates/activity_indicator" }
 agent_ui = { path = "crates/agent_ui" }
-agent_ui_v2 = { path = "crates/agent_ui_v2" }
 agent_settings = { path = "crates/agent_settings" }
 agent_servers = { path = "crates/agent_servers" }
+ai = { path = "crates/ai" }
 ai_onboarding = { path = "crates/ai_onboarding" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
@@ -255,6 +253,7 @@ assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
+auto_update_helper = { path = "crates/auto_update_helper" }
 auto_update_ui = { path = "crates/auto_update_ui" }
 aws_http_client = { path = "crates/aws_http_client" }
 bedrock = { path = "crates/bedrock" }
@@ -268,6 +267,8 @@ clock = { path = "crates/clock" }
 cloud_api_client = { path = "crates/cloud_api_client" }
 cloud_api_types = { path = "crates/cloud_api_types" }
 cloud_llm_client = { path = "crates/cloud_llm_client" }
+cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
+collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
@@ -312,9 +313,10 @@ http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
-edit_prediction_types = { path = "crates/edit_prediction_types" }
-edit_prediction_ui = { path = "crates/edit_prediction_ui" }
+edit_prediction = { path = "crates/edit_prediction" }
+edit_prediction_button = { path = "crates/edit_prediction_button" }
 edit_prediction_context = { path = "crates/edit_prediction_context" }
+zeta2_tools = { path = "crates/zeta2_tools" }
 inspector_ui = { path = "crates/inspector_ui" }
 install_cli = { path = "crates/install_cli" }
 journal = { path = "crates/journal" }
@@ -356,6 +358,8 @@ panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
 perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
+plugin = { path = "crates/plugin" }
+plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 settings_profile_selector = { path = "crates/settings_profile_selector" }
 project = { path = "crates/project" }
@@ -366,10 +370,12 @@ proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
+scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
+rich_text = { path = "crates/rich_text" }
 rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
@@ -386,6 +392,7 @@ snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
+storybook = { path = "crates/storybook" }
 streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
@@ -402,6 +409,7 @@ terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_extension = { path = "crates/theme_extension" }
+theme_importer = { path = "crates/theme_importer" }
 theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
 title_bar = { path = "crates/title_bar" }
@@ -425,18 +433,15 @@ x_ai = { path = "crates/x_ai" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
 zed_env_vars = { path = "crates/zed_env_vars" }
-edit_prediction = { path = "crates/edit_prediction" }
-zeta_prompt = { path = "crates/zeta_prompt" }
+zeta = { path = "crates/zeta" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
-ztracing = { path = "crates/ztracing" }
-ztracing_macro = { path = "crates/ztracing_macro" }

 #
 # External crates
 #

-agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
+agent-client-protocol = { version = "0.7.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = "0.25.1-rc1"
 any_vec = "0.14"
@@ -500,14 +505,16 @@ ec4rs = "1.1"
 emojis = "0.6.1"
 env_logger = "0.11"
 exec = "0.3.1"
-fancy-regex = "0.16.0"
+fancy-regex = "0.14.0"
 fork = "0.4.0"
 futures = "0.3"
+futures-batch = "0.6.1"
 futures-lite = "1.13"
-gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "09acfdf2bd5c1d6254abefd609c808ff73547b2c" }
+gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "e5f883040530b4df36437f140084ee5cc7c1c9be" }
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
+hashbrown = "0.15.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
@@ -524,7 +531,7 @@ indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
 json_dotpath = "1.1"
-jsonschema = "0.37.0"
+jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = "0.10.0"
 jupyter-websocket-client = "0.15.0"
@@ -543,6 +550,7 @@ nanoid = "0.4"
 nbformat = "0.15.0"
 nix = "0.29"
 num-format = "0.4.4"
+num-traits = "0.2"
 objc = "0.2"
 objc2-foundation = { version = "=0.3.1", default-features = false, features = [
    "NSArray",
@@ -581,6 +589,7 @@ pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev =
 pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
+pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
 pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
@@ -620,6 +629,7 @@ scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0.221", features = ["derive", "rc"] }
+serde_derive = "1.0.221"
 serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
 serde_json_lenient = { version = "0.2", features = [
    "preserve_order",
@@ -631,9 +641,10 @@ serde_urlencoded = "0.7"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
+similar = "2.6"
 simplelog = "0.12.2"
 slotmap = "1.0.6"
-smallvec = { version = "1.6", features = ["union", "const_new"] }
+smallvec = { version = "1.6", features = ["union"] }
 smol = "2.0"
 sqlformat = "0.2"
 stacksafe = "0.1"
@@ -647,7 +658,7 @@ sysinfo = "0.37.0"
 take-until = "0.2.0"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
-tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "2570c4387a8505fb8f1d3f3557454b474f1e8271" }
+tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "7249f999c5fdf9bf3cc5c288c964454e4dac0c00" }
 time = { version = "0.3", features = [
    "macros",
    "parsing",
@@ -659,7 +670,6 @@ time = { version = "0.3", features = [
 tiny_http = "0.8"
 tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
-tokio-socks = { version = "0.5.2", default-features = false, features = ["futures-io", "tokio"] }
 toml = "0.8"
 toml_edit = { version = "0.22", default-features = false, features = ["display", "parse", "serde"] }
 tower-http = "0.4.4"
@@ -686,7 +696,6 @@ tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
 tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-tracing = "0.1.40"
 unicase = "2.6"
 unicode-script = "0.5.7"
 unicode-segmentation = "1.10"
@@ -710,6 +719,7 @@ wasmtime-wasi = "29"
 wax = "0.6"
 which = "6.0.0"
 windows-core = "0.61"
+wit-component = "0.221"
 yawc = "0.2.5"
 zeroize = "1.8"
 zstd = "0.11"
@@ -791,13 +801,20 @@ settings_macros = { opt-level = 3 }
 sqlez_macros = { opt-level = 3, codegen-units = 1 }
 ui_macros = { opt-level = 3 }
 util_macros = { opt-level = 3 }
+serde_derive = { opt-level = 3 }
 quote = { opt-level = 3 }
 syn = { opt-level = 3 }
 proc-macro2 = { opt-level = 3 }
 # proc-macros end

 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 }
+wasmtime-cranelift = { opt-level = 3 }
 wasmtime = { opt-level = 3 }
 # Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
 activity_indicator = { codegen-units = 1 }
@@ -806,11 +823,12 @@ breadcrumbs = { codegen-units = 1 }
 collections = { codegen-units = 1 }
 command_palette = { codegen-units = 1 }
 command_palette_hooks = { codegen-units = 1 }
+extension_cli = { codegen-units = 1 }
 feature_flags = { codegen-units = 1 }
 file_icons = { codegen-units = 1 }
 fsevent = { codegen-units = 1 }
 image_viewer = { codegen-units = 1 }
-edit_prediction_ui = { codegen-units = 1 }
+edit_prediction_button = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
 json_schema_store = { codegen-units = 1 }
@@ -825,6 +843,7 @@ project_symbols = { codegen-units = 1 }
 refineable = { codegen-units = 1 }
 release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
+rich_text = { codegen-units = 1 }
 session = { codegen-units = 1 }
 snippet = { codegen-units = 1 }
 snippets_ui = { codegen-units = 1 }
@@ -857,6 +876,8 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"

+# This is not a style lint, see https://github.com/rust-lang/rust-clippy/pull/15454
+# Remove when the lint gets promoted to `suspicious`.
 declare_interior_mutable_const = "deny"

 redundant_clone = "deny"
--- a/4
+++ b/4
@@ -34,4 +34,8 @@ RUN apt-get update; \
    linux-perf binutils
 WORKDIR app
 COPY --from=builder /app/collab /app/collab
+COPY --from=builder /app/crates/collab/migrations /app/migrations
+COPY --from=builder /app/crates/collab/migrations_llm /app/migrations_llm
+ENV MIGRATIONS_PATH=/app/migrations
+ENV LLM_DATABASE_MIGRATIONS_PATH=/app/migrations_llm
 ENTRYPOINT ["/app/collab"]
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Welcome to Zed, a high-performance, multiplayer code editor from the creators of

 ### Installation

-On macOS, Linux, and Windows you can [download Zed directly](https://zed.dev/download) or install Zed via your local package manager ([macOS](https://zed.dev/docs/installation#macos)/[Linux](https://zed.dev/docs/linux#installing-via-a-package-manager)/[Windows](https://zed.dev/docs/windows#package-managers)).
+On macOS, Linux, and Windows you can [download Zed directly](https://zed.dev/download) or [install Zed via your local package manager](https://zed.dev/docs/linux#installing-via-a-package-manager).

 Other platforms are not yet available:

--- a/assets/icons/box.svg
+++ b/assets/icons/box.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3996 5.59852C13.3994 5.3881 13.3439 5.18144 13.2386 4.99926C13.1333 4.81709 12.9819 4.66581 12.7997 4.56059L8.59996 2.16076C8.41755 2.05544 8.21063 2 8 2C7.78937 2 7.58246 2.05544 7.40004 2.16076L3.20033 4.56059C3.0181 4.66581 2.86674 4.81709 2.76144 4.99926C2.65613 5.18144 2.60059 5.3881 2.60037 5.59852V10.3982C2.60059 10.6086 2.65613 10.8153 2.76144 10.9975C2.86674 11.1796 3.0181 11.3309 3.20033 11.4361L7.40004 13.836C7.58246 13.9413 7.78937 13.9967 8 13.9967C8.21063 13.9967 8.41755 13.9413 8.59996 13.836L12.7997 11.4361C12.9819 11.3309 13.1333 11.1796 13.2386 10.9975C13.3439 10.8153 13.3994 10.6086 13.3996 10.3982V5.59852Z" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.78033 4.99857L7.99998 7.99836L13.2196 4.99857" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13.9979V7.99829" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/git_branch_plus.svg
+++ b/assets/icons/git_branch_plus.svg
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 2V10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 6C12.5304 6 13.0391 5.78929 13.4142 5.41421C13.7893 5.03914 14 4.53043 14 4C14 3.46957 13.7893 2.96086 13.4142 2.58579C13.0391 2.21071 12.5304 2 12 2C11.4696 2 10.9609 2.21071 10.5858 2.58579C10.2107 2.96086 10 3.46957 10 4C10 4.53043 10.2107 5.03914 10.5858 5.41421C10.9609 5.78929 11.4696 6 12 6Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 14C4.53043 14 5.03914 13.7893 5.41421 13.4142C5.78929 13.0391 6 12.5304 6 12C6 11.4696 5.78929 10.9609 5.41421 10.5858C5.03914 10.2107 4.53043 10 4 10C3.46957 10 2.96086 10.2107 2.58579 10.5858C2.21071 10.9609 2 11.4696 2 12C2 12.5304 2.21071 13.0391 2.58579 13.4142C2.96086 13.7893 3.46957 14 4 14Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4C8.4087 4 6.88258 4.63214 5.75736 5.75736C4.63214 6.88258 4 8.4087 4 10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 10V14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 12H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/inception.svg
+++ b/assets/icons/inception.svg
@@ -1,11 +0,0 @@
-<svg width="28" height="28" viewBox="0 0 28 28" fill="none" id="svg1378540956_510">
-<g clip-path="url(#svg1378540956_510_clip0_1_1506)" transform="translate(4, 4) scale(0.857)">
-<path d="M17.0547 0.372066H8.52652L-0.00165176 8.90024V17.4284H8.52652V8.90024H17.0547V0.372066Z" fill="#1A1C20"></path>
-<path d="M10.1992 27.6279H18.7274L27.2556 19.0998V10.5716H18.7274V19.0998H10.1992V27.6279Z" fill="#1A1C20"></path>
-</g>
-<defs>
-<clipPath id="svg1378540956_510_clip0_1_1506">
-<rect width="27.2559" height="27.2559" fill="white" transform="translate(0 0.37207)"></rect>
-</clipPath>
-</defs>
-</svg>
--- a/assets/icons/zed_agent_two.svg
+++ b/assets/icons/zed_agent_two.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.2224 1.32129L5.2036 4.41875C5.15145 4.57727 5.06282 4.72134 4.94481 4.83934C4.82681 4.95735 4.68274 5.04598 4.52422 5.09813L1.42676 6.11693L4.52422 7.13574C4.68274 7.18788 4.82681 7.27652 4.94481 7.39453C5.06282 7.51253 5.15145 7.6566 5.2036 7.81512L6.2224 10.9126L7.24121 7.81512C7.29335 7.6566 7.38199 7.51253 7.5 7.39453C7.618 7.27652 7.76207 7.18788 7.9206 7.13574L11.018 6.11693L7.9206 5.09813C7.76207 5.04598 7.618 4.95735 7.5 4.83934C7.38199 4.72134 7.29335 4.57727 7.24121 4.41875L6.2224 1.32129Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.76681 13.9373C9.76681 13.6048 9.95997 13.3083 10.5126 12.7917L11.8872 11.4978C12.3545 11.0575 12.5612 10.77 12.5612 10.4735C12.5612 10.1411 12.3185 9.91643 11.9681 9.91643C11.6986 9.91643 11.5054 10.0242 11.2673 10.3208C10.9933 10.6622 10.7956 10.779 10.4946 10.779C10.0633 10.779 9.75781 10.4915 9.75781 10.0916C9.75781 9.21559 10.8136 8.44287 12.067 8.44287C13.3743 8.44287 14.3492 9.22907 14.3492 10.2848C14.3492 10.9452 13.9988 11.5742 13.2845 12.2077L12.2242 13.1511V13.223H13.7292C14.2503 13.223 14.5738 13.5015 14.5738 13.9552C14.5738 14.4089 14.2593 14.6785 13.7292 14.6785H10.5979C10.1037 14.6785 9.76681 14.3775 9.76681 13.9373Z" fill="black"/>
-<path d="M12.8994 1.32129V4.00482M11.5576 2.66302H14.2412" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
--- a/assets/keymaps/initial.json
+++ b/assets/keymaps/initial.json
@@ -10,12 +10,12 @@
    "context": "Workspace",
    "bindings": {
      // "shift shift": "file_finder::Toggle"
-    },
+    }
  },
  {
    "context": "Editor && vim_mode == insert",
    "bindings": {
      // "j k": "vim::NormalBefore"
-    },
-  },
+    }
+  }
 ]
--- a/assets/keymaps/linux/atom.json
+++ b/assets/keymaps/linux/atom.json
@@ -4,15 +4,15 @@
    "bindings": {
      "ctrl-shift-f5": "workspace::Reload", // window:reload
      "ctrl-k ctrl-n": "workspace::ActivatePreviousPane", // window:focus-next-pane
-      "ctrl-k ctrl-p": "workspace::ActivateNextPane", // window:focus-previous-pane
-    },
+      "ctrl-k ctrl-p": "workspace::ActivateNextPane" // window:focus-previous-pane
+    }
  },
  {
    "context": "Editor",
    "bindings": {
      "ctrl-k ctrl-u": "editor::ConvertToUpperCase", // editor:upper-case
-      "ctrl-k ctrl-l": "editor::ConvertToLowerCase", // editor:lower-case
-    },
+      "ctrl-k ctrl-l": "editor::ConvertToLowerCase" // editor:lower-case
+    }
  },
  {
    "context": "Editor && mode == full",
@@ -32,8 +32,8 @@
      "ctrl-down": "editor::MoveLineDown", // editor:move-line-down
      "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
      "ctrl-shift-m": "markdown::OpenPreviewToTheSide", // markdown-preview:toggle
-      "ctrl-r": "outline::Toggle", // symbols-view:toggle-project-symbols
-    },
+      "ctrl-r": "outline::Toggle" // symbols-view:toggle-project-symbols
+    }
  },
  {
    "context": "BufferSearchBar",
@@ -41,8 +41,8 @@
      "f3": ["editor::SelectNext", { "replace_newest": true }], // find-and-replace:find-next
      "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
      "ctrl-f3": "search::SelectNextMatch", // find-and-replace:find-next-selected
-      "ctrl-shift-f3": "search::SelectPreviousMatch", // find-and-replace:find-previous-selected
-    },
+      "ctrl-shift-f3": "search::SelectPreviousMatch" // find-and-replace:find-previous-selected
+    }
  },
  {
    "context": "Workspace",
@@ -50,8 +50,8 @@
      "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
      "ctrl-k ctrl-b": "workspace::ToggleLeftDock", // tree-view:toggle
      "ctrl-t": "file_finder::Toggle", // fuzzy-finder:toggle-file-finder
-      "ctrl-r": "project_symbols::Toggle", // symbols-view:toggle-project-symbols
-    },
+      "ctrl-r": "project_symbols::Toggle" // symbols-view:toggle-project-symbols
+    }
  },
  {
    "context": "Pane",
@@ -65,8 +65,8 @@
      "ctrl-6": ["pane::ActivateItem", 5], // tree-view:open-selected-entry-in-pane-6
      "ctrl-7": ["pane::ActivateItem", 6], // tree-view:open-selected-entry-in-pane-7
      "ctrl-8": ["pane::ActivateItem", 7], // tree-view:open-selected-entry-in-pane-8
-      "ctrl-9": ["pane::ActivateItem", 8], // tree-view:open-selected-entry-in-pane-9
-    },
+      "ctrl-9": ["pane::ActivateItem", 8] // tree-view:open-selected-entry-in-pane-9
+    }
  },
  {
    "context": "ProjectPanel",
@@ -75,8 +75,8 @@
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
      "ctrl-x": "project_panel::Cut", // tree-view:cut
      "ctrl-c": "project_panel::Copy", // tree-view:copy
-      "ctrl-v": "project_panel::Paste", // tree-view:paste
-    },
+      "ctrl-v": "project_panel::Paste" // tree-view:paste
+    }
  },
  {
    "context": "ProjectPanel && not_editing",
@@ -90,7 +90,7 @@
      "d": "project_panel::Duplicate", // tree-view:duplicate
      "home": "menu::SelectFirst", // core:move-to-top
      "end": "menu::SelectLast", // core:move-to-bottom
-      "shift-a": "project_panel::NewDirectory", // tree-view:add-folder
-    },
-  },
+      "shift-a": "project_panel::NewDirectory" // tree-view:add-folder
+    }
+  }
 ]
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -8,8 +8,8 @@
      "ctrl-shift-i": "agent::ToggleFocus",
      "ctrl-l": "agent::ToggleFocus",
      "ctrl-shift-l": "agent::ToggleFocus",
-      "ctrl-shift-j": "agent::OpenSettings",
-    },
+      "ctrl-shift-j": "agent::OpenSettings"
+    }
  },
  {
    "context": "Editor && mode == full",
@@ -20,18 +20,18 @@
      "ctrl-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
      "ctrl-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
      "ctrl-k": "assistant::InlineAssist",
-      "ctrl-shift-k": "assistant::InsertIntoEditor",
-    },
+      "ctrl-shift-k": "assistant::InsertIntoEditor"
+    }
  },
  {
    "context": "InlineAssistEditor",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-shift-backspace": "editor::Cancel",
+      "ctrl-shift-backspace": "editor::Cancel"
      // "alt-enter": // Quick Question
      // "ctrl-shift-enter": // Full File Context
      // "ctrl-shift-k": // Toggle input focus (editor <> inline assist)
-    },
+    }
  },
  {
    "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
@@ -47,7 +47,7 @@
      "ctrl-shift-backspace": "editor::Cancel",
      "ctrl-r": "agent::NewThread",
      "ctrl-shift-v": "editor::Paste",
-      "ctrl-shift-k": "assistant::InsertIntoEditor",
+      "ctrl-shift-k": "assistant::InsertIntoEditor"
      // "escape": "agent::ToggleFocus"
      ///// Enable when Zed supports multiple thread tabs
      // "ctrl-t": // new thread tab
@@ -56,29 +56,28 @@
      ///// Enable if Zed adds support for keyboard navigation of thread elements
      // "tab": // cycle to next message
      // "shift-tab": // cycle to previous message
-    },
+    }
  },
  {
    "context": "Editor && editor_agent_diff",
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-enter": "agent::KeepAll",
-      "ctrl-backspace": "agent::RejectAll",
-    },
+      "ctrl-backspace": "agent::RejectAll"
+    }
  },
  {
    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-right": "editor::AcceptNextWordEditPrediction",
-      "ctrl-down": "editor::AcceptNextLineEditPrediction",
-    },
+      "ctrl-right": "editor::AcceptPartialEditPrediction"
+    }
  },
  {
    "context": "Terminal",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-k": "assistant::InlineAssist",
-    },
-  },
+      "ctrl-k": "assistant::InlineAssist"
+    }
+  }
 ]
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -5,8 +5,8 @@
 [
  {
    "bindings": {
-      "ctrl-g": "menu::Cancel",
-    },
+      "ctrl-g": "menu::Cancel"
+    }
  },
  {
    // Workaround to avoid falling back to default bindings.
@@ -18,8 +18,8 @@
      "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
      "ctrl-x": null, // currently activates `editor::Cut` if no following key is pressed for 1 second
      "ctrl-p": null, // currently activates `file_finder::Toggle` when the cursor is on the first character of the buffer
-      "ctrl-n": null, // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
-    },
+      "ctrl-n": null // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
+    }
  },
  {
    "context": "Editor",
@@ -82,8 +82,8 @@
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
      "ctrl-r": "buffer_search::Deploy", // isearch-backward
      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap", // fill-paragraph
-    },
+      "alt-q": "editor::Rewrap" // fill-paragraph
+    }
  },
  {
    "context": "Editor && selection_mode", // region selection
@@ -119,22 +119,22 @@
      "alt->": "editor::SelectToEnd",
      "ctrl-home": "editor::SelectToBeginning",
      "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel",
-    },
+      "ctrl-g": "editor::Cancel"
+    }
  },
  {
    "context": "Editor && (showing_code_actions || showing_completions)",
    "bindings": {
      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-    },
+      "ctrl-n": "editor::ContextMenuNext"
+    }
  },
  {
    "context": "Editor && showing_signature_help && !showing_completions",
    "bindings": {
      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
  },
  // Example setting for using emacs-style tab
  // (i.e. indent the current line / selection or perform symbol completion depending on context)
@@ -164,8 +164,8 @@
      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll", // save-some-buffers
-    },
+      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
+    }
  },
  {
    // Workaround to enable using native emacs from the Zed terminal.
@@ -185,22 +185,22 @@
      "ctrl-x ctrl-f": null, // find-file
      "ctrl-x ctrl-s": null, // save-buffer
      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null, // save-some-buffers
-    },
+      "ctrl-x s": null // save-some-buffers
+    }
  },
  {
    "context": "BufferSearchBar > Editor",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
      "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss",
-    },
+      "ctrl-g": "buffer_search::Dismiss"
+    }
  },
  {
    "context": "Pane",
    "bindings": {
      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-    },
-  },
+      "ctrl-alt-right": "pane::GoForward"
+    }
+  }
 ]
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -13,8 +13,8 @@
      "shift-f8": "debugger::StepOut",
      "f9": "debugger::Continue",
      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start",
-    },
+      "alt-shift-f9": "debugger::Start"
+    }
  },
  {
    "context": "Editor",
@@ -62,30 +62,28 @@
      "ctrl-shift-end": "editor::SelectToEnd",
      "ctrl-f8": "editor::ToggleBreakpoint",
      "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "ctrl-shift-u": "editor::ToggleCase",
-    },
+      "ctrl-shift-u": "editor::ToggleCase"
+    }
  },
  {
    "context": "Editor && mode == full",
    "bindings": {
      "ctrl-f12": "outline::Toggle",
      "ctrl-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "ctrl-e": "file_finder::Toggle",
      "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-alt-n": "file_finder::Toggle",
      "ctrl-g": "go_to_line::Toggle",
      "alt-enter": "editor::ToggleCodeActions",
      "ctrl-space": "editor::ShowCompletions",
      "ctrl-q": "editor::Hover",
      "ctrl-p": "editor::ShowSignatureHelp",
-      "ctrl-\\": "assistant::InlineAssist",
-    },
+      "ctrl-\\": "assistant::InlineAssist"
+    }
  },
  {
    "context": "BufferSearchBar",
    "bindings": {
-      "shift-enter": "search::SelectPreviousMatch",
-    },
+      "shift-enter": "search::SelectPreviousMatch"
+    }
  },
  {
    "context": "BufferSearchBar || ProjectSearchBar",
@@ -93,8 +91,8 @@
      "alt-c": "search::ToggleCaseSensitive",
      "alt-e": "search::ToggleSelection",
      "alt-x": "search::ToggleRegex",
-      "alt-w": "search::ToggleWholeWord",
-    },
+      "alt-w": "search::ToggleWholeWord"
+    }
  },
  {
    "context": "Workspace",
@@ -107,8 +105,8 @@
      "ctrl-e": "file_finder::Toggle",
      "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
      "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-alt-n": "file_finder::Toggle",
      "ctrl-n": "project_symbols::Toggle",
+      "ctrl-alt-n": "file_finder::Toggle",
      "ctrl-shift-a": "command_palette::Toggle",
      "shift shift": "command_palette::Toggle",
      "ctrl-alt-shift-n": "project_symbols::Toggle",
@@ -116,8 +114,8 @@
      "alt-1": "project_panel::ToggleFocus",
      "alt-5": "debug_panel::ToggleFocus",
      "alt-6": "diagnostics::Deploy",
-      "alt-7": "outline_panel::ToggleFocus",
-    },
+      "alt-7": "outline_panel::ToggleFocus"
+    }
  },
  {
    "context": "Pane", // this is to override the default Pane mappings to switch tabs
@@ -131,15 +129,15 @@
      "alt-7": "outline_panel::ToggleFocus",
      "alt-8": null, // Services (bottom dock)
      "alt-9": null, // Git History (bottom dock)
-      "alt-0": "git_panel::ToggleFocus",
-    },
+      "alt-0": "git_panel::ToggleFocus"
+    }
  },
  {
    "context": "Workspace || Editor",
    "bindings": {
      "alt-f12": "terminal_panel::Toggle",
-      "ctrl-shift-k": "git::Push",
-    },
+      "ctrl-shift-k": "git::Push"
+    }
  },
  {
    "context": "Pane",
@@ -147,8 +145,8 @@
      "ctrl-alt-left": "pane::GoBack",
      "ctrl-alt-right": "pane::GoForward",
      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem",
-    },
+      "alt-right": "pane::ActivateNextItem"
+    }
  },
  {
    "context": "ProjectPanel",
@@ -158,8 +156,8 @@
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
      "delete": ["project_panel::Trash", { "skip_prompt": false }],
      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename",
-    },
+      "shift-f6": "project_panel::Rename"
+    }
  },
  {
    "context": "Terminal",
@@ -169,8 +167,8 @@
      "ctrl-up": "terminal::ScrollLineUp",
      "ctrl-down": "terminal::ScrollLineDown",
      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-    },
+      "shift-pagedown": "terminal::ScrollPageDown"
+    }
  },
  { "context": "GitPanel", "bindings": { "alt-0": "workspace::CloseActiveDock" } },
  { "context": "ProjectPanel", "bindings": { "alt-1": "workspace::CloseActiveDock" } },
@@ -181,7 +179,7 @@
    "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
    "bindings": {
      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock",
-    },
-  },
+      "shift-escape": "workspace::CloseActiveDock"
+    }
+  }
 ]
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -22,8 +22,8 @@
      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }],
-    },
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
+    }
  },
  {
    "context": "Editor",
@@ -55,20 +55,20 @@
      "alt-right": "editor::MoveToNextSubwordEnd",
      "alt-left": "editor::MoveToPreviousSubwordStart",
      "alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart",
-    },
+      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
+    }
  },
  {
    "context": "Editor && mode == full",
    "bindings": {
-      "ctrl-r": "outline::Toggle",
-    },
+      "ctrl-r": "outline::Toggle"
+    }
  },
  {
    "context": "Editor && !agent_diff",
    "bindings": {
-      "ctrl-k ctrl-z": "git::Restore",
-    },
+      "ctrl-k ctrl-z": "git::Restore"
+    }
  },
  {
    "context": "Pane",
@@ -83,15 +83,15 @@
      "alt-6": ["pane::ActivateItem", 5],
      "alt-7": ["pane::ActivateItem", 6],
      "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": "pane::ActivateLastItem",
-    },
+      "alt-9": "pane::ActivateLastItem"
+    }
  },
  {
    "context": "Workspace",
    "bindings": {
      "ctrl-k ctrl-b": "workspace::ToggleLeftDock",
      // "ctrl-0": "project_panel::ToggleFocus", // normally resets zoom
-      "shift-ctrl-r": "project_symbols::Toggle",
-    },
-  },
+      "shift-ctrl-r": "project_symbols::Toggle"
+    }
+  }
 ]
--- a/assets/keymaps/macos/atom.json
+++ b/assets/keymaps/macos/atom.json
@@ -4,16 +4,16 @@
    "bindings": {
      "ctrl-alt-cmd-l": "workspace::Reload",
      "cmd-k cmd-p": "workspace::ActivatePreviousPane",
-      "cmd-k cmd-n": "workspace::ActivateNextPane",
-    },
+      "cmd-k cmd-n": "workspace::ActivateNextPane"
+    }
  },
  {
    "context": "Editor",
    "bindings": {
      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
      "cmd-k cmd-u": "editor::ConvertToUpperCase",
-      "cmd-k cmd-l": "editor::ConvertToLowerCase",
-    },
+      "cmd-k cmd-l": "editor::ConvertToLowerCase"
+    }
  },
  {
    "context": "Editor && mode == full",
@@ -33,8 +33,8 @@
      "ctrl-cmd-down": "editor::MoveLineDown",
      "cmd-\\": "workspace::ToggleLeftDock",
      "ctrl-shift-m": "markdown::OpenPreviewToTheSide",
-      "cmd-r": "outline::Toggle",
-    },
+      "cmd-r": "outline::Toggle"
+    }
  },
  {
    "context": "BufferSearchBar",
@@ -42,8 +42,8 @@
      "cmd-g": ["editor::SelectNext", { "replace_newest": true }],
      "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
      "cmd-f3": "search::SelectNextMatch",
-      "cmd-shift-f3": "search::SelectPreviousMatch",
-    },
+      "cmd-shift-f3": "search::SelectPreviousMatch"
+    }
  },
  {
    "context": "Workspace",
@@ -51,8 +51,8 @@
      "cmd-\\": "workspace::ToggleLeftDock",
      "cmd-k cmd-b": "workspace::ToggleLeftDock",
      "cmd-t": "file_finder::Toggle",
-      "cmd-shift-r": "project_symbols::Toggle",
-    },
+      "cmd-shift-r": "project_symbols::Toggle"
+    }
  },
  {
    "context": "Pane",
@@ -67,8 +67,8 @@
      "cmd-6": ["pane::ActivateItem", 5],
      "cmd-7": ["pane::ActivateItem", 6],
      "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem",
-    },
+      "cmd-9": "pane::ActivateLastItem"
+    }
  },
  {
    "context": "ProjectPanel",
@@ -77,8 +77,8 @@
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
      "cmd-x": "project_panel::Cut",
      "cmd-c": "project_panel::Copy",
-      "cmd-v": "project_panel::Paste",
-    },
+      "cmd-v": "project_panel::Paste"
+    }
  },
  {
    "context": "ProjectPanel && not_editing",
@@ -92,7 +92,7 @@
      "d": "project_panel::Duplicate",
      "home": "menu::SelectFirst",
      "end": "menu::SelectLast",
-      "shift-a": "project_panel::NewDirectory",
-    },
-  },
+      "shift-a": "project_panel::NewDirectory"
+    }
+  }
 ]
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -8,8 +8,8 @@
      "cmd-shift-i": "agent::ToggleFocus",
      "cmd-l": "agent::ToggleFocus",
      "cmd-shift-l": "agent::ToggleFocus",
-      "cmd-shift-j": "agent::OpenSettings",
-    },
+      "cmd-shift-j": "agent::OpenSettings"
+    }
  },
  {
    "context": "Editor && mode == full",
@@ -20,19 +20,19 @@
      "cmd-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
      "cmd-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
      "cmd-k": "assistant::InlineAssist",
-      "cmd-shift-k": "assistant::InsertIntoEditor",
-    },
+      "cmd-shift-k": "assistant::InsertIntoEditor"
+    }
  },
  {
    "context": "InlineAssistEditor",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-backspace": "editor::Cancel",
-      "cmd-enter": "menu::Confirm",
+      "cmd-enter": "menu::Confirm"
      // "alt-enter": // Quick Question
      // "cmd-shift-enter": // Full File Context
      // "cmd-shift-k": // Toggle input focus (editor <> inline assist)
-    },
+    }
  },
  {
    "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
@@ -48,7 +48,7 @@
      "cmd-shift-backspace": "editor::Cancel",
      "cmd-r": "agent::NewThread",
      "cmd-shift-v": "editor::Paste",
-      "cmd-shift-k": "assistant::InsertIntoEditor",
+      "cmd-shift-k": "assistant::InsertIntoEditor"
      // "escape": "agent::ToggleFocus"
      ///// Enable when Zed supports multiple thread tabs
      // "cmd-t": // new thread tab
@@ -57,29 +57,28 @@
      ///// Enable if Zed adds support for keyboard navigation of thread elements
      // "tab": // cycle to next message
      // "shift-tab": // cycle to previous message
-    },
+    }
  },
  {
    "context": "Editor && editor_agent_diff",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-enter": "agent::KeepAll",
-      "cmd-backspace": "agent::RejectAll",
-    },
+      "cmd-backspace": "agent::RejectAll"
+    }
  },
  {
    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-right": "editor::AcceptNextWordEditPrediction",
-      "cmd-down": "editor::AcceptNextLineEditPrediction",
-    },
+      "cmd-right": "editor::AcceptPartialEditPrediction"
+    }
  },
  {
    "context": "Terminal",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-k": "assistant::InlineAssist",
-    },
-  },
+      "cmd-k": "assistant::InlineAssist"
+    }
+  }
 ]
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -6,8 +6,8 @@
  {
    "context": "!GitPanel",
    "bindings": {
-      "ctrl-g": "menu::Cancel",
-    },
+      "ctrl-g": "menu::Cancel"
+    }
  },
  {
    // Workaround to avoid falling back to default bindings.
@@ -15,8 +15,8 @@
    // NOTE: must be declared before the `Editor` override.
    "context": "Editor",
    "bindings": {
-      "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
-    },
+      "ctrl-g": null // currently activates `go_to_line::Toggle` when there is nothing to cancel
+    }
  },
  {
    "context": "Editor",
@@ -79,8 +79,8 @@
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
      "ctrl-r": "buffer_search::Deploy", // isearch-backward
      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap", // fill-paragraph
-    },
+      "alt-q": "editor::Rewrap" // fill-paragraph
+    }
  },
  {
    "context": "Editor && selection_mode", // region selection
@@ -116,22 +116,22 @@
      "alt->": "editor::SelectToEnd",
      "ctrl-home": "editor::SelectToBeginning",
      "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel",
-    },
+      "ctrl-g": "editor::Cancel"
+    }
  },
  {
    "context": "Editor && (showing_code_actions || showing_completions)",
    "bindings": {
      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-    },
+      "ctrl-n": "editor::ContextMenuNext"
+    }
  },
  {
    "context": "Editor && showing_signature_help && !showing_completions",
    "bindings": {
      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
  },
  // Example setting for using emacs-style tab
  // (i.e. indent the current line / selection or perform symbol completion depending on context)
@@ -161,8 +161,8 @@
      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll", // save-some-buffers
-    },
+      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
+    }
  },
  {
    // Workaround to enable using native emacs from the Zed terminal.
@@ -182,22 +182,22 @@
      "ctrl-x ctrl-f": null, // find-file
      "ctrl-x ctrl-s": null, // save-buffer
      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null, // save-some-buffers
-    },
+      "ctrl-x s": null // save-some-buffers
+    }
  },
  {
    "context": "BufferSearchBar > Editor",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
      "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss",
-    },
+      "ctrl-g": "buffer_search::Dismiss"
+    }
  },
  {
    "context": "Pane",
    "bindings": {
      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-    },
-  },
+      "ctrl-alt-right": "pane::GoForward"
+    }
+  }
 ]
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -13,8 +13,8 @@
      "shift-f8": "debugger::StepOut",
      "f9": "debugger::Continue",
      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start",
-    },
+      "alt-shift-f9": "debugger::Start"
+    }
  },
  {
    "context": "Editor",
@@ -60,30 +60,28 @@
      "cmd-shift-end": "editor::SelectToEnd",
      "ctrl-f8": "editor::ToggleBreakpoint",
      "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "cmd-shift-u": "editor::ToggleCase",
-    },
+      "cmd-shift-u": "editor::ToggleCase"
+    }
  },
  {
    "context": "Editor && mode == full",
    "bindings": {
      "cmd-f12": "outline::Toggle",
      "cmd-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "cmd-l": "go_to_line::Toggle",
-      "cmd-e": "file_finder::Toggle",
      "cmd-shift-o": "file_finder::Toggle",
-      "cmd-shift-n": "file_finder::Toggle",
+      "cmd-l": "go_to_line::Toggle",
      "alt-enter": "editor::ToggleCodeActions",
      "ctrl-space": "editor::ShowCompletions",
      "cmd-j": "editor::Hover",
      "cmd-p": "editor::ShowSignatureHelp",
-      "cmd-\\": "assistant::InlineAssist",
-    },
+      "cmd-\\": "assistant::InlineAssist"
+    }
  },
  {
    "context": "BufferSearchBar",
    "bindings": {
-      "shift-enter": "search::SelectPreviousMatch",
-    },
+      "shift-enter": "search::SelectPreviousMatch"
+    }
  },
  {
    "context": "BufferSearchBar || ProjectSearchBar",
@@ -95,8 +93,8 @@
      "ctrl-alt-c": "search::ToggleCaseSensitive",
      "ctrl-alt-e": "search::ToggleSelection",
      "ctrl-alt-w": "search::ToggleWholeWord",
-      "ctrl-alt-x": "search::ToggleRegex",
-    },
+      "ctrl-alt-x": "search::ToggleRegex"
+    }
  },
  {
    "context": "Workspace",
@@ -118,8 +116,8 @@
      "cmd-1": "project_panel::ToggleFocus",
      "cmd-5": "debug_panel::ToggleFocus",
      "cmd-6": "diagnostics::Deploy",
-      "cmd-7": "outline_panel::ToggleFocus",
-    },
+      "cmd-7": "outline_panel::ToggleFocus"
+    }
  },
  {
    "context": "Pane", // this is to override the default Pane mappings to switch tabs
@@ -133,15 +131,15 @@
      "cmd-7": "outline_panel::ToggleFocus",
      "cmd-8": null, // Services (bottom dock)
      "cmd-9": null, // Git History (bottom dock)
-      "cmd-0": "git_panel::ToggleFocus",
-    },
+      "cmd-0": "git_panel::ToggleFocus"
+    }
  },
  {
    "context": "Workspace || Editor",
    "bindings": {
      "alt-f12": "terminal_panel::Toggle",
-      "cmd-shift-k": "git::Push",
-    },
+      "cmd-shift-k": "git::Push"
+    }
  },
  {
    "context": "Pane",
@@ -149,8 +147,8 @@
      "cmd-alt-left": "pane::GoBack",
      "cmd-alt-right": "pane::GoForward",
      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem",
-    },
+      "alt-right": "pane::ActivateNextItem"
+    }
  },
  {
    "context": "ProjectPanel",
@@ -161,8 +159,8 @@
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
      "delete": ["project_panel::Trash", { "skip_prompt": false }],
      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename",
-    },
+      "shift-f6": "project_panel::Rename"
+    }
  },
  {
    "context": "Terminal",
@@ -172,8 +170,8 @@
      "cmd-up": "terminal::ScrollLineUp",
      "cmd-down": "terminal::ScrollLineDown",
      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-    },
+      "shift-pagedown": "terminal::ScrollPageDown"
+    }
  },
  { "context": "GitPanel", "bindings": { "cmd-0": "workspace::CloseActiveDock" } },
  { "context": "ProjectPanel", "bindings": { "cmd-1": "workspace::CloseActiveDock" } },
@@ -184,7 +182,7 @@
    "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
    "bindings": {
      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock",
-    },
-  },
+      "shift-escape": "workspace::CloseActiveDock"
+    }
+  }
 ]
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -22,8 +22,8 @@
      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }],
-    },
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
+    }
  },
  {
    "context": "Editor",
@@ -57,20 +57,20 @@
      "ctrl-right": "editor::MoveToNextSubwordEnd",
      "ctrl-left": "editor::MoveToPreviousSubwordStart",
      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart",
-    },
+      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
+    }
  },
  {
    "context": "Editor && mode == full",
    "bindings": {
-      "cmd-r": "outline::Toggle",
-    },
+      "cmd-r": "outline::Toggle"
+    }
  },
  {
    "context": "Editor && !agent_diff",
    "bindings": {
-      "cmd-k cmd-z": "git::Restore",
-    },
+      "cmd-k cmd-z": "git::Restore"
+    }
  },
  {
    "context": "Pane",
@@ -85,8 +85,8 @@
      "cmd-6": ["pane::ActivateItem", 5],
      "cmd-7": ["pane::ActivateItem", 6],
      "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem",
-    },
+      "cmd-9": "pane::ActivateLastItem"
+    }
  },
  {
    "context": "Workspace",
@@ -95,7 +95,7 @@
      "cmd-t": "file_finder::Toggle",
      "shift-cmd-r": "project_symbols::Toggle",
      // Currently busted: https://github.com/zed-industries/feedback/issues/898
-      "ctrl-0": "project_panel::ToggleFocus",
-    },
-  },
+      "ctrl-0": "project_panel::ToggleFocus"
+    }
+  }
 ]
--- a/assets/keymaps/macos/textmate.json
+++ b/assets/keymaps/macos/textmate.json
@@ -2,8 +2,8 @@
  {
    "bindings": {
      "cmd-shift-o": "projects::OpenRecent",
-      "cmd-alt-tab": "project_panel::ToggleFocus",
-    },
+      "cmd-alt-tab": "project_panel::ToggleFocus"
+    }
  },
  {
    "context": "Editor && mode == full",
@@ -15,8 +15,8 @@
      "cmd-enter": "editor::NewlineBelow",
      "cmd-alt-enter": "editor::NewlineAbove",
      "cmd-shift-l": "editor::SelectLine",
-      "cmd-shift-t": "outline::Toggle",
-    },
+      "cmd-shift-t": "outline::Toggle"
+    }
  },
  {
    "context": "Editor",
@@ -41,30 +41,30 @@
      "ctrl-u": "editor::ConvertToUpperCase",
      "ctrl-shift-u": "editor::ConvertToLowerCase",
      "ctrl-alt-u": "editor::ConvertToUpperCamelCase",
-      "ctrl-_": "editor::ConvertToSnakeCase",
-    },
+      "ctrl-_": "editor::ConvertToSnakeCase"
+    }
  },
  {
    "context": "BufferSearchBar",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-shift-s": "search::SelectPreviousMatch",
-    },
+      "ctrl-shift-s": "search::SelectPreviousMatch"
+    }
  },
  {
    "context": "Workspace",
    "bindings": {
      "cmd-alt-ctrl-d": "workspace::ToggleLeftDock",
      "cmd-t": "file_finder::Toggle",
-      "cmd-shift-t": "project_symbols::Toggle",
-    },
+      "cmd-shift-t": "project_symbols::Toggle"
+    }
  },
  {
    "context": "Pane",
    "bindings": {
      "alt-cmd-r": "search::ToggleRegex",
-      "ctrl-tab": "project_panel::ToggleFocus",
-    },
+      "ctrl-tab": "project_panel::ToggleFocus"
+    }
  },
  {
    "context": "ProjectPanel",
@@ -75,11 +75,11 @@
      "return": "project_panel::Rename",
      "cmd-c": "project_panel::Copy",
      "cmd-v": "project_panel::Paste",
-      "cmd-alt-c": "project_panel::CopyPath",
-    },
+      "cmd-alt-c": "project_panel::CopyPath"
+    }
  },
  {
    "context": "Dock",
-    "bindings": {},
-  },
+    "bindings": {}
+  }
 ]
--- a/assets/keymaps/storybook.json
+++ b/assets/keymaps/storybook.json
@@ -27,7 +27,7 @@
      "backspace": "editor::Backspace",
      "delete": "editor::Delete",
      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
-    },
-  },
+      "right": "editor::MoveRight"
+    }
+  }
 ]
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -180,9 +180,10 @@
      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
      "ctrl-w space": "editor::OpenExcerptsSplit",
      "ctrl-w g space": "editor::OpenExcerptsSplit",
+      "ctrl-6": "pane::AlternateFile",
      "ctrl-^": "pane::AlternateFile",
-      ".": "vim::Repeat",
-    },
+      ".": "vim::Repeat"
+    }
  },
  {
    "context": "vim_mode == normal || vim_mode == visual || vim_mode == operator",
@@ -223,8 +224,8 @@
      "] r": "vim::GoToNextReference",
      // tree-sitter related commands
      "[ x": "vim::SelectLargerSyntaxNode",
-      "] x": "vim::SelectSmallerSyntaxNode",
-    },
+      "] x": "vim::SelectSmallerSyntaxNode"
+    }
  },
  {
    "context": "vim_mode == normal",
@@ -261,16 +262,16 @@
      "[ d": "editor::GoToPreviousDiagnostic",
      "] c": "editor::GoToHunk",
      "[ c": "editor::GoToPreviousHunk",
-      "g c": "vim::PushToggleComments",
-    },
+      "g c": "vim::PushToggleComments"
+    }
  },
  {
    "context": "VimControl && VimCount",
    "bindings": {
      "0": ["vim::Number", 0],
      ":": "vim::CountCommand",
-      "%": "vim::GoToPercentage",
-    },
+      "%": "vim::GoToPercentage"
+    }
  },
  {
    "context": "vim_mode == visual",
@@ -322,8 +323,8 @@
      "g w": "vim::Rewrap",
      "g ?": "vim::ConvertToRot13",
      // "g ?": "vim::ConvertToRot47",
-      "\"": "vim::PushRegister",
-    },
+      "\"": "vim::PushRegister"
+    }
  },
  {
    "context": "vim_mode == helix_select",
@@ -343,8 +344,8 @@
      "ctrl-pageup": "pane::ActivatePreviousItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      ".": "vim::Repeat",
-      "alt-.": "vim::RepeatFind",
-    },
+      "alt-.": "vim::RepeatFind"
+    }
  },
  {
    "context": "vim_mode == insert",
@@ -374,8 +375,8 @@
      "ctrl-r": "vim::PushRegister",
      "insert": "vim::ToggleReplace",
      "ctrl-o": "vim::TemporaryNormal",
-      "ctrl-s": "editor::ShowSignatureHelp",
-    },
+      "ctrl-s": "editor::ShowSignatureHelp"
+    }
  },
  {
    "context": "showing_completions",
@@ -383,8 +384,8 @@
      "ctrl-d": "vim::ScrollDown",
      "ctrl-u": "vim::ScrollUp",
      "ctrl-e": "vim::LineDown",
-      "ctrl-y": "vim::LineUp",
-    },
+      "ctrl-y": "vim::LineUp"
+    }
  },
  {
    "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
@@ -409,31 +410,23 @@
      "shift-s": "vim::SubstituteLine",
      "\"": "vim::PushRegister",
      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-    },
+      "ctrl-pageup": "pane::ActivatePreviousItem"
+    }
  },
  {
    "context": "VimControl && vim_mode == helix_normal && !menu",
    "bindings": {
-      "j": ["vim::Down", { "display_lines": true }],
-      "down": ["vim::Down", { "display_lines": true }],
-      "k": ["vim::Up", { "display_lines": true }],
-      "up": ["vim::Up", { "display_lines": true }],
-      "g j": "vim::Down",
-      "g down": "vim::Down",
-      "g k": "vim::Up",
-      "g up": "vim::Up",
      "escape": "vim::SwitchToHelixNormalMode",
      "i": "vim::HelixInsert",
      "a": "vim::HelixAppend",
-      "ctrl-[": "editor::Cancel",
-    },
+      "ctrl-[": "editor::Cancel"
+    }
  },
  {
    "context": "vim_mode == helix_select && !menu",
    "bindings": {
-      "escape": "vim::SwitchToHelixNormalMode",
-    },
+      "escape": "vim::SwitchToHelixNormalMode"
+    }
  },
  {
    "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu",
@@ -453,9 +446,9 @@
      "shift-r": "editor::Paste",
      "`": "vim::ConvertToLowerCase",
      "alt-`": "vim::ConvertToUpperCase",
-      "insert": "vim::InsertBefore", // not a helix default
+      "insert": "vim::InsertBefore",
      "shift-u": "editor::Redo",
-      "ctrl-r": "vim::Redo", // not a helix default
+      "ctrl-r": "vim::Redo",
      "y": "vim::HelixYank",
      "p": "vim::HelixPaste",
      "shift-p": ["vim::HelixPaste", { "before": true }],
@@ -484,7 +477,6 @@
      "alt-p": "editor::SelectPreviousSyntaxNode",
      "alt-n": "editor::SelectNextSyntaxNode",

-      // Search
      "n": "vim::HelixSelectNext",
      "shift-n": "vim::HelixSelectPrevious",

@@ -492,27 +484,27 @@
      "g e": "vim::EndOfDocument",
      "g h": "vim::StartOfLine",
      "g l": "vim::EndOfLine",
-      "g s": "vim::FirstNonWhitespace",
+      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
      "g t": "vim::WindowTop",
      "g c": "vim::WindowMiddle",
      "g b": "vim::WindowBottom",
-      "g r": "editor::FindAllReferences",
+      "g r": "editor::FindAllReferences", // zed specific
      "g n": "pane::ActivateNextItem",
-      "shift-l": "pane::ActivateNextItem", // not a helix default
+      "shift-l": "pane::ActivateNextItem",
      "g p": "pane::ActivatePreviousItem",
-      "shift-h": "pane::ActivatePreviousItem", // not a helix default
-      "g .": "vim::HelixGotoLastModification",
+      "shift-h": "pane::ActivatePreviousItem",
+      "g .": "vim::HelixGotoLastModification", // go to last modification

      // Window mode
-      "space w v": "pane::SplitDown",
-      "space w s": "pane::SplitRight",
      "space w h": "workspace::ActivatePaneLeft",
-      "space w j": "workspace::ActivatePaneDown",
-      "space w k": "workspace::ActivatePaneUp",
      "space w l": "workspace::ActivatePaneRight",
+      "space w k": "workspace::ActivatePaneUp",
+      "space w j": "workspace::ActivatePaneDown",
      "space w q": "pane::CloseActiveItem",
-      "space w r": "pane::SplitRight", // not a helix default
-      "space w d": "pane::SplitDown", // not a helix default
+      "space w s": "pane::SplitRight",
+      "space w r": "pane::SplitRight",
+      "space w v": "pane::SplitDown",
+      "space w d": "pane::SplitDown",

      // Space mode
      "space f": "file_finder::Toggle",
@@ -526,7 +518,6 @@
      "space c": "editor::ToggleComments",
      "space p": "editor::Paste",
      "space y": "editor::Copy",
-      "space /": "pane::DeploySearch",

      // Other
      ":": "command_palette::Toggle",
@@ -534,22 +525,24 @@
      "]": ["vim::PushHelixNext", { "around": true }],
      "[": ["vim::PushHelixPrevious", { "around": true }],
      "g q": "vim::PushRewrap",
-      "g w": "vim::PushRewrap", // not a helix default & clashes with helix `goto_word`
-    },
+      "g w": "vim::PushRewrap"
+      // "tab": "pane::ActivateNextItem",
+      // "shift-tab": "pane::ActivatePrevItem",
+    }
  },
  {
    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
    "bindings": {
      "ctrl-p": "editor::ShowWordCompletions",
-      "ctrl-n": "editor::ShowWordCompletions",
-    },
+      "ctrl-n": "editor::ShowWordCompletions"
+    }
  },
  {
    "context": "(vim_mode == insert || vim_mode == normal) && showing_signature_help && !showing_completions",
    "bindings": {
      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
  },
  {
    "context": "vim_mode == replace",
@@ -565,8 +558,8 @@
      "backspace": "vim::UndoReplace",
      "tab": "vim::Tab",
      "enter": "vim::Enter",
-      "insert": "vim::InsertBefore",
-    },
+      "insert": "vim::InsertBefore"
+    }
  },
  {
    "context": "vim_mode == waiting",
@@ -578,14 +571,14 @@
      "escape": "vim::ClearOperators",
      "ctrl-k": ["vim::PushDigraph", {}],
      "ctrl-v": ["vim::PushLiteral", {}],
-      "ctrl-q": ["vim::PushLiteral", {}],
-    },
+      "ctrl-q": ["vim::PushLiteral", {}]
+    }
  },
  {
    "context": "Editor && vim_mode == waiting && (vim_operator == ys || vim_operator == cs)",
    "bindings": {
-      "escape": "vim::SwitchToNormalMode",
-    },
+      "escape": "vim::SwitchToNormalMode"
+    }
  },
  {
    "context": "vim_mode == operator",
@@ -593,8 +586,8 @@
      "ctrl-c": "vim::ClearOperators",
      "ctrl-[": "vim::ClearOperators",
      "escape": "vim::ClearOperators",
-      "g c": "vim::Comment",
-    },
+      "g c": "vim::Comment"
+    }
  },
  {
    "context": "vim_operator == a || vim_operator == i || vim_operator == cs || vim_operator == helix_next || vim_operator == helix_previous",
@@ -631,14 +624,14 @@
      "shift-i": ["vim::IndentObj", { "include_below": true }],
      "f": "vim::Method",
      "c": "vim::Class",
-      "e": "vim::EntireFile",
-    },
+      "e": "vim::EntireFile"
+    }
  },
  {
    "context": "vim_operator == helix_m",
    "bindings": {
-      "m": "vim::Matching",
-    },
+      "m": "vim::Matching"
+    }
  },
  {
    "context": "vim_operator == helix_next",
@@ -655,8 +648,8 @@
      "x": "editor::SelectSmallerSyntaxNode",
      "d": "editor::GoToDiagnostic",
      "c": "editor::GoToHunk",
-      "space": "vim::InsertEmptyLineBelow",
-    },
+      "space": "vim::InsertEmptyLineBelow"
+    }
  },
  {
    "context": "vim_operator == helix_previous",
@@ -673,8 +666,8 @@
      "x": "editor::SelectLargerSyntaxNode",
      "d": "editor::GoToPreviousDiagnostic",
      "c": "editor::GoToPreviousHunk",
-      "space": "vim::InsertEmptyLineAbove",
-    },
+      "space": "vim::InsertEmptyLineAbove"
+    }
  },
  {
    "context": "vim_operator == c",
@@ -682,8 +675,8 @@
      "c": "vim::CurrentLine",
      "x": "vim::Exchange",
      "d": "editor::Rename", // zed specific
-      "s": ["vim::PushChangeSurrounds", {}],
-    },
+      "s": ["vim::PushChangeSurrounds", {}]
+    }
  },
  {
    "context": "vim_operator == d",
@@ -695,36 +688,36 @@
      "shift-o": "git::ToggleStaged",
      "p": "git::Restore", // "d p"
      "u": "git::StageAndNext", // "d u"
-      "shift-u": "git::UnstageAndNext", // "d shift-u"
-    },
+      "shift-u": "git::UnstageAndNext" // "d shift-u"
+    }
  },
  {
    "context": "vim_operator == gu",
    "bindings": {
      "g u": "vim::CurrentLine",
-      "u": "vim::CurrentLine",
-    },
+      "u": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == gU",
    "bindings": {
      "g shift-u": "vim::CurrentLine",
-      "shift-u": "vim::CurrentLine",
-    },
+      "shift-u": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == g~",
    "bindings": {
      "g ~": "vim::CurrentLine",
-      "~": "vim::CurrentLine",
-    },
+      "~": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == g?",
    "bindings": {
      "g ?": "vim::CurrentLine",
-      "?": "vim::CurrentLine",
-    },
+      "?": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == gq",
@@ -732,66 +725,66 @@
      "g q": "vim::CurrentLine",
      "q": "vim::CurrentLine",
      "g w": "vim::CurrentLine",
-      "w": "vim::CurrentLine",
-    },
+      "w": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == y",
    "bindings": {
      "y": "vim::CurrentLine",
      "v": "vim::PushForcedMotion",
-      "s": ["vim::PushAddSurrounds", {}],
-    },
+      "s": ["vim::PushAddSurrounds", {}]
+    }
  },
  {
    "context": "vim_operator == ys",
    "bindings": {
-      "s": "vim::CurrentLine",
-    },
+      "s": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == >",
    "bindings": {
-      ">": "vim::CurrentLine",
-    },
+      ">": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == <",
    "bindings": {
-      "<": "vim::CurrentLine",
-    },
+      "<": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == eq",
    "bindings": {
-      "=": "vim::CurrentLine",
-    },
+      "=": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == sh",
    "bindings": {
-      "!": "vim::CurrentLine",
-    },
+      "!": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == gc",
    "bindings": {
-      "c": "vim::CurrentLine",
-    },
+      "c": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == gR",
    "bindings": {
      "r": "vim::CurrentLine",
-      "shift-r": "vim::CurrentLine",
-    },
+      "shift-r": "vim::CurrentLine"
+    }
  },
  {
    "context": "vim_operator == cx",
    "bindings": {
      "x": "vim::CurrentLine",
-      "c": "vim::ClearExchange",
-    },
+      "c": "vim::ClearExchange"
+    }
  },
  {
    "context": "vim_mode == literal",
@@ -833,15 +826,15 @@
      "tab": ["vim::Literal", ["tab", "\u0009"]],
      // zed extensions:
      "backspace": ["vim::Literal", ["backspace", "\u0008"]],
-      "delete": ["vim::Literal", ["delete", "\u007F"]],
-    },
+      "delete": ["vim::Literal", ["delete", "\u007F"]]
+    }
  },
  {
    "context": "BufferSearchBar && !in_replace",
    "bindings": {
      "enter": "vim::SearchSubmit",
-      "escape": "buffer_search::Dismiss",
-    },
+      "escape": "buffer_search::Dismiss"
+    }
  },
  {
    "context": "VimControl && !menu || !Editor && !Terminal",
@@ -902,19 +895,15 @@
      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal",
      "ctrl-w n": "workspace::NewFileSplitHorizontal",
      "g t": "vim::GoToTab",
-      "g shift-t": "vim::GoToPreviousTab",
-    },
+      "g shift-t": "vim::GoToPreviousTab"
+    }
  },
  {
    "context": "!Editor && !Terminal",
    "bindings": {
      ":": "command_palette::Toggle",
-      "g /": "pane::DeploySearch",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0],
-    },
+      "g /": "pane::DeploySearch"
+    }
  },
  {
    // netrw compatibility
@@ -964,45 +953,17 @@
      "6": ["vim::Number", 6],
      "7": ["vim::Number", 7],
      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9],
-    },
+      "9": ["vim::Number", 9]
+    }
  },
  {
    "context": "OutlinePanel && not_editing",
    "bindings": {
-      "h": "outline_panel::CollapseSelectedEntry",
-      "j": "vim::MenuSelectNext",
-      "k": "vim::MenuSelectPrevious",
-      "down": "vim::MenuSelectNext",
-      "up": "vim::MenuSelectPrevious",
-      "l": "outline_panel::ExpandSelectedEntry",
+      "j": "menu::SelectNext",
+      "k": "menu::SelectPrevious",
      "shift-g": "menu::SelectLast",
-      "g g": "menu::SelectFirst",
-      "-": "outline_panel::SelectParent",
-      "enter": "editor::ToggleFocus",
-      "/": "menu::Cancel",
-      "ctrl-u": "outline_panel::ScrollUp",
-      "ctrl-d": "outline_panel::ScrollDown",
-      "z t": "outline_panel::ScrollCursorTop",
-      "z z": "outline_panel::ScrollCursorCenter",
-      "z b": "outline_panel::ScrollCursorBottom",
-      "0": ["vim::Number", 0],
-      "1": ["vim::Number", 1],
-      "2": ["vim::Number", 2],
-      "3": ["vim::Number", 3],
-      "4": ["vim::Number", 4],
-      "5": ["vim::Number", 5],
-      "6": ["vim::Number", 6],
-      "7": ["vim::Number", 7],
-      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9],
-    },
-  },
-  {
-    "context": "OutlinePanel && editing",
-    "bindings": {
-      "enter": "menu::Cancel",
-    },
+      "g g": "menu::SelectFirst"
+    }
  },
  {
    "context": "GitPanel && ChangesList",
@@ -1017,8 +978,8 @@
      "x": "git::ToggleStaged",
      "shift-x": "git::StageAll",
      "g x": "git::StageRange",
-      "shift-u": "git::UnstageAll",
-    },
+      "shift-u": "git::UnstageAll"
+    }
  },
  {
    "context": "Editor && mode == auto_height && VimControl",
@@ -1029,8 +990,8 @@
      "#": null,
      "*": null,
      "n": null,
-      "shift-n": null,
-    },
+      "shift-n": null
+    }
  },
  {
    "context": "Picker > Editor",
@@ -1039,29 +1000,29 @@
      "ctrl-u": "editor::DeleteToBeginningOfLine",
      "ctrl-w": "editor::DeleteToPreviousWordStart",
      "ctrl-p": "menu::SelectPrevious",
-      "ctrl-n": "menu::SelectNext",
-    },
+      "ctrl-n": "menu::SelectNext"
+    }
  },
  {
    "context": "GitCommit > Editor && VimControl && vim_mode == normal",
    "bindings": {
      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-    },
+      "escape": "menu::Cancel"
+    }
  },
  {
    "context": "Editor && edit_prediction",
    "bindings": {
      // This is identical to the binding in the base keymap, but the vim bindings above to
      // "vim::Tab" shadow it, so it needs to be bound again.
-      "tab": "editor::AcceptEditPrediction",
-    },
+      "tab": "editor::AcceptEditPrediction"
+    }
  },
  {
    "context": "MessageEditor > Editor && VimControl",
    "bindings": {
-      "enter": "agent::Chat",
-    },
+      "enter": "agent::Chat"
+    }
  },
  {
    "context": "os != macos && Editor && edit_prediction_conflict",
@@ -1069,8 +1030,8 @@
      // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This
      // is because alt-tab may not be available, as it is often used for window switching on Linux
      // and Windows.
-      "alt-l": "editor::AcceptEditPrediction",
-    },
+      "alt-l": "editor::AcceptEditPrediction"
+    }
  },
  {
    "context": "SettingsWindow > NavigationMenu && !search",
@@ -1080,16 +1041,7 @@
      "k": "settings_editor::FocusPreviousNavEntry",
      "j": "settings_editor::FocusNextNavEntry",
      "g g": "settings_editor::FocusFirstNavEntry",
-      "shift-g": "settings_editor::FocusLastNavEntry",
-    },
-  },
-  {
-    "context": "MarkdownPreview",
-    "bindings": {
-      "ctrl-u": "markdown::ScrollPageUp",
-      "ctrl-d": "markdown::ScrollPageDown",
-      "ctrl-y": "markdown::ScrollUp",
-      "ctrl-e": "markdown::ScrollDown",
-    },
-  },
+      "shift-g": "settings_editor::FocusLastNavEntry"
+    }
+  }
 ]
--- a/assets/prompts/content_prompt_v2.hbs
+++ b/assets/prompts/content_prompt_v2.hbs
@@ -39,5 +39,4 @@ Only make changes that are necessary to fulfill the prompt, leave everything els

 Start at the indentation level in the original file in the rewritten {{content_type}}.

-IMPORTANT: You MUST use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled. You MUST NOT send back unstructured text. If you need to make a statement or ask a question you MUST use one of the tools to do so.
-It is an error if you try to make a change that cannot be made simply by editing the rewrite_section.
+You must use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled.
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -8,7 +8,7 @@
    "adapter": "Debugpy",
    "program": "$ZED_FILE",
    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
+    "cwd": "$ZED_WORKTREE_ROOT"
  },
  {
    "label": "Debug active JavaScript file",
@@ -16,7 +16,7 @@
    "program": "$ZED_FILE",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT",
-    "type": "pwa-node",
+    "type": "pwa-node"
  },
  {
    "label": "JavaScript debug terminal",
@@ -24,6 +24,6 @@
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT",
    "console": "integratedTerminal",
-    "type": "pwa-node",
-  },
+    "type": "pwa-node"
+  }
 ]
--- a/assets/settings/initial_server_settings.json
+++ b/assets/settings/initial_server_settings.json
@@ -3,5 +3,5 @@
 // For a full list of overridable settings, and general information on settings,
 // see the documentation: https://zed.dev/docs/configuring-zed#settings-files
 {
-  "lsp": {},
+  "lsp": {}
 }
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -47,8 +47,8 @@
    // Whether to show the task line in the output of the spawned task, defaults to `true`.
    "show_summary": true,
    // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_command": true,
+    "show_command": true
    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
    // "tags": []
-  },
+  }
 ]
--- a/assets/settings/initial_user_settings.json
+++ b/assets/settings/initial_user_settings.json
@@ -12,6 +12,6 @@
  "theme": {
    "mode": "system",
    "light": "One Light",
-    "dark": "One Dark",
-  },
+    "dark": "One Dark"
+  }
 }
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -45,7 +45,6 @@
        "tab.inactive_background": "#1f2127ff",
        "tab.active_background": "#0d1016ff",
        "search.match_background": "#5ac2fe66",
-        "search.active_match_background": "#ea570166",
        "panel.background": "#1f2127ff",
        "panel.focused_border": "#5ac1feff",
        "pane.focused_border": null,
@@ -437,7 +436,6 @@
        "tab.inactive_background": "#ececedff",
        "tab.active_background": "#fcfcfcff",
        "search.match_background": "#3b9ee566",
-        "search.active_match_background": "#f88b3666",
        "panel.background": "#ececedff",
        "panel.focused_border": "#3b9ee5ff",
        "pane.focused_border": null,
@@ -829,7 +827,6 @@
        "tab.inactive_background": "#353944ff",
        "tab.active_background": "#242835ff",
        "search.match_background": "#73cffe66",
-        "search.active_match_background": "#fd722b66",
        "panel.background": "#353944ff",
        "panel.focused_border": null,
        "pane.focused_border": null,
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -46,7 +46,6 @@
        "tab.inactive_background": "#3a3735ff",
        "tab.active_background": "#282828ff",
        "search.match_background": "#83a59866",
-        "search.active_match_background": "#c09f3f66",
        "panel.background": "#3a3735ff",
        "panel.focused_border": "#83a598ff",
        "pane.focused_border": null,
@@ -71,33 +70,33 @@
        "editor.document_highlight.read_background": "#83a5981a",
        "editor.document_highlight.write_background": "#92847466",
        "terminal.background": "#282828ff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
+        "terminal.dim_foreground": "#282828ff",
        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.ansi.bright_black": "#73675eff",
        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
        "version_control.modified": "#f9bd2fff",
@@ -453,7 +452,6 @@
        "tab.inactive_background": "#393634ff",
        "tab.active_background": "#1d2021ff",
        "search.match_background": "#83a59866",
-        "search.active_match_background": "#c9653666",
        "panel.background": "#393634ff",
        "panel.focused_border": "#83a598ff",
        "pane.focused_border": null,
@@ -478,33 +476,33 @@
        "editor.document_highlight.read_background": "#83a5981a",
        "editor.document_highlight.write_background": "#92847466",
        "terminal.background": "#1d2021ff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.dim_foreground": "#1d2021ff",
+        "terminal.ansi.black": "#1d2021ff",
+        "terminal.ansi.bright_black": "#73675eff",
        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
        "version_control.modified": "#f9bd2fff",
@@ -860,7 +858,6 @@
        "tab.inactive_background": "#3b3735ff",
        "tab.active_background": "#32302fff",
        "search.match_background": "#83a59866",
-        "search.active_match_background": "#aea85166",
        "panel.background": "#3b3735ff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -885,33 +882,33 @@
        "editor.document_highlight.read_background": "#83a5981a",
        "editor.document_highlight.write_background": "#92847466",
        "terminal.background": "#32302fff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.dim_foreground": "#32302fff",
+        "terminal.ansi.black": "#32302fff",
+        "terminal.ansi.bright_black": "#73675eff",
        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
        "version_control.modified": "#f9bd2fff",
@@ -1267,7 +1264,6 @@
        "tab.inactive_background": "#ecddb4ff",
        "tab.active_background": "#fbf1c7ff",
        "search.match_background": "#0b667866",
-        "search.active_match_background": "#ba2d1166",
        "panel.background": "#ecddb4ff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -1295,30 +1291,30 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#fbf1c7ff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#0b6678ff",
+        "terminal.ansi.dim_black": "#5f5650ff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
@@ -1674,7 +1670,6 @@
        "tab.inactive_background": "#ecddb5ff",
        "tab.active_background": "#f9f5d7ff",
        "search.match_background": "#0b667866",
-        "search.active_match_background": "#dc351466",
        "panel.background": "#ecddb5ff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -1702,30 +1697,30 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#f9f5d7ff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#73675eff",
+        "terminal.ansi.dim_black": "#f9f5d7ff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#f9f5d7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
@@ -2081,7 +2076,6 @@
        "tab.inactive_background": "#ecdcb3ff",
        "tab.active_background": "#f2e5bcff",
        "search.match_background": "#0b667866",
-        "search.active_match_background": "#d7331466",
        "panel.background": "#ecdcb3ff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -2109,30 +2103,30 @@
        "terminal.foreground": "#282828ff",
        "terminal.bright_foreground": "#282828ff",
        "terminal.dim_foreground": "#f2e5bcff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#73675eff",
+        "terminal.ansi.dim_black": "#f2e5bcff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#f2e5bcff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
        "version_control.modified": "#b57615ff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -45,7 +45,6 @@
        "tab.inactive_background": "#2f343eff",
        "tab.active_background": "#282c33ff",
        "search.match_background": "#74ade866",
-        "search.active_match_background": "#e8af7466",
        "panel.background": "#2f343eff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -68,34 +67,34 @@
        "editor.active_wrap_guide": "#c8ccd41a",
        "editor.document_highlight.read_background": "#74ade81a",
        "editor.document_highlight.write_background": "#555a6366",
-        "terminal.background": "#282c34ff",
-        "terminal.foreground": "#abb2bfff",
+        "terminal.background": "#282c33ff",
+        "terminal.foreground": "#dce0e5ff",
        "terminal.bright_foreground": "#dce0e5ff",
-        "terminal.dim_foreground": "#636d83ff",
-        "terminal.ansi.black": "#282c34ff",
-        "terminal.ansi.bright_black": "#636d83ff",
-        "terminal.ansi.dim_black": "#3b3f4aff",
-        "terminal.ansi.red": "#e06c75ff",
-        "terminal.ansi.bright_red": "#EA858Bff",
-        "terminal.ansi.dim_red": "#a7545aff",
-        "terminal.ansi.green": "#98c379ff",
-        "terminal.ansi.bright_green": "#AAD581ff",
-        "terminal.ansi.dim_green": "#6d8f59ff",
-        "terminal.ansi.yellow": "#e5c07bff",
-        "terminal.ansi.bright_yellow": "#FFD885ff",
-        "terminal.ansi.dim_yellow": "#b8985bff",
-        "terminal.ansi.blue": "#61afefff",
-        "terminal.ansi.bright_blue": "#85C1FFff",
-        "terminal.ansi.dim_blue": "#457cadff",
-        "terminal.ansi.magenta": "#c678ddff",
-        "terminal.ansi.bright_magenta": "#D398EBff",
-        "terminal.ansi.dim_magenta": "#8d54a0ff",
-        "terminal.ansi.cyan": "#56b6c2ff",
-        "terminal.ansi.bright_cyan": "#6ED5DEff",
-        "terminal.ansi.dim_cyan": "#3c818aff",
-        "terminal.ansi.white": "#abb2bfff",
+        "terminal.dim_foreground": "#282c33ff",
+        "terminal.ansi.black": "#282c33ff",
+        "terminal.ansi.bright_black": "#525561ff",
+        "terminal.ansi.dim_black": "#dce0e5ff",
+        "terminal.ansi.red": "#d07277ff",
+        "terminal.ansi.bright_red": "#673a3cff",
+        "terminal.ansi.dim_red": "#eab7b9ff",
+        "terminal.ansi.green": "#a1c181ff",
+        "terminal.ansi.bright_green": "#4d6140ff",
+        "terminal.ansi.dim_green": "#d1e0bfff",
+        "terminal.ansi.yellow": "#dec184ff",
+        "terminal.ansi.bright_yellow": "#e5c07bff",
+        "terminal.ansi.dim_yellow": "#f1dfc1ff",
+        "terminal.ansi.blue": "#74ade8ff",
+        "terminal.ansi.bright_blue": "#385378ff",
+        "terminal.ansi.dim_blue": "#bed5f4ff",
+        "terminal.ansi.magenta": "#b477cfff",
+        "terminal.ansi.bright_magenta": "#d6b4e4ff",
+        "terminal.ansi.dim_magenta": "#612a79ff",
+        "terminal.ansi.cyan": "#6eb4bfff",
+        "terminal.ansi.bright_cyan": "#3a565bff",
+        "terminal.ansi.dim_cyan": "#b9d9dfff",
+        "terminal.ansi.white": "#dce0e5ff",
        "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#8f969bff",
+        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
        "version_control.added": "#27a657ff",
        "version_control.modified": "#d3b020ff",
@@ -449,7 +448,6 @@
        "tab.inactive_background": "#ebebecff",
        "tab.active_background": "#fafafaff",
        "search.match_background": "#5c79e266",
-        "search.active_match_background": "#d0a92366",
        "panel.background": "#ebebecff",
        "panel.focused_border": null,
        "pane.focused_border": null,
@@ -473,33 +471,33 @@
        "editor.document_highlight.read_background": "#5c78e225",
        "editor.document_highlight.write_background": "#a3a3a466",
        "terminal.background": "#fafafaff",
-        "terminal.foreground": "#2a2c33ff",
-        "terminal.bright_foreground": "#2a2c33ff",
-        "terminal.dim_foreground": "#bbbbbbff",
-        "terminal.ansi.black": "#000000ff",
-        "terminal.ansi.bright_black": "#000000ff",
-        "terminal.ansi.dim_black": "#555555ff",
-        "terminal.ansi.red": "#de3e35ff",
-        "terminal.ansi.bright_red": "#de3e35ff",
-        "terminal.ansi.dim_red": "#9c2b26ff",
-        "terminal.ansi.green": "#3f953aff",
-        "terminal.ansi.bright_green": "#3f953aff",
-        "terminal.ansi.dim_green": "#2b6927ff",
-        "terminal.ansi.yellow": "#d2b67cff",
-        "terminal.ansi.bright_yellow": "#d2b67cff",
-        "terminal.ansi.dim_yellow": "#a48c5aff",
-        "terminal.ansi.blue": "#2f5af3ff",
-        "terminal.ansi.bright_blue": "#2f5af3ff",
-        "terminal.ansi.dim_blue": "#2140abff",
-        "terminal.ansi.magenta": "#950095ff",
-        "terminal.ansi.bright_magenta": "#a00095ff",
-        "terminal.ansi.dim_magenta": "#6a006aff",
-        "terminal.ansi.cyan": "#3f953aff",
-        "terminal.ansi.bright_cyan": "#3f953aff",
-        "terminal.ansi.dim_cyan": "#2b6927ff",
-        "terminal.ansi.white": "#bbbbbbff",
+        "terminal.foreground": "#242529ff",
+        "terminal.bright_foreground": "#242529ff",
+        "terminal.dim_foreground": "#fafafaff",
+        "terminal.ansi.black": "#242529ff",
+        "terminal.ansi.bright_black": "#747579ff",
+        "terminal.ansi.dim_black": "#97979aff",
+        "terminal.ansi.red": "#d36151ff",
+        "terminal.ansi.bright_red": "#f0b0a4ff",
+        "terminal.ansi.dim_red": "#6f312aff",
+        "terminal.ansi.green": "#669f59ff",
+        "terminal.ansi.bright_green": "#b2cfa9ff",
+        "terminal.ansi.dim_green": "#354d2eff",
+        "terminal.ansi.yellow": "#dec184ff",
+        "terminal.ansi.bright_yellow": "#826221ff",
+        "terminal.ansi.dim_yellow": "#786441ff",
+        "terminal.ansi.blue": "#5c78e2ff",
+        "terminal.ansi.bright_blue": "#b5baf2ff",
+        "terminal.ansi.dim_blue": "#2d3d75ff",
+        "terminal.ansi.magenta": "#984ea5ff",
+        "terminal.ansi.bright_magenta": "#cea6d3ff",
+        "terminal.ansi.dim_magenta": "#4b2a50ff",
+        "terminal.ansi.cyan": "#3a82b7ff",
+        "terminal.ansi.bright_cyan": "#a3bedaff",
+        "terminal.ansi.dim_cyan": "#254058ff",
+        "terminal.ansi.white": "#fafafaff",
        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#888888ff",
+        "terminal.ansi.dim_white": "#aaaaaaff",
        "link_text.hover": "#5c78e2ff",
        "version_control.added": "#27a657ff",
        "version_control.modified": "#d3b020ff",
--- a/clippy.toml
+++ b/clippy.toml
@@ -14,7 +14,6 @@ disallowed-methods = [
    { path = "std::process::Command::stderr", reason = "`smol::process::Command::from()` does not preserve stdio configuration", replacement = "smol::process::Command::stderr" },
    { path = "serde_json::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892. Use `serde_json::from_slice` instead." },
    { path = "serde_json_lenient::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892, Use `serde_json_lenient::from_slice` instead." },
-    { path = "cocoa::foundation::NSString::alloc", reason = "NSString must be autoreleased to avoid memory leaks. Use `ns_string()` helper instead." },
 ]
 disallowed-types = [
    # { path = "std::collections::HashMap", replacement = "collections::HashMap" },
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -46,7 +46,6 @@ url.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
-urlencoding.workspace = true

 [dev-dependencies]
 env_logger.workspace = true
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -201,19 +201,17 @@ impl ToolCall {
        };
        let mut content = Vec::with_capacity(tool_call.content.len());
        for item in tool_call.content {
-            if let Some(item) = ToolCallContent::from_acp(
+            content.push(ToolCallContent::from_acp(
                item,
                language_registry.clone(),
                path_style,
                terminals,
                cx,
-            )? {
-                content.push(item);
-            }
+            )?);
        }

        let result = Self {
-            id: tool_call.tool_call_id,
+            id: tool_call.id,
            label: cx
                .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
            kind: tool_call.kind,
@@ -243,7 +241,6 @@ impl ToolCall {
            locations,
            raw_input,
            raw_output,
-            ..
        } = fields;

        if let Some(kind) = kind {
@@ -265,29 +262,21 @@ impl ToolCall {
        }

        if let Some(content) = content {
-            let mut new_content_len = content.len();
+            let new_content_len = content.len();
            let mut content = content.into_iter();

            // Reuse existing content if we can
            for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
-                let valid_content =
-                    old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
-                if !valid_content {
-                    new_content_len -= 1;
-                }
+                old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
            }
            for new in content {
-                if let Some(new) = ToolCallContent::from_acp(
+                self.content.push(ToolCallContent::from_acp(
                    new,
                    language_registry.clone(),
                    path_style,
                    terminals,
                    cx,
-                )? {
-                    self.content.push(new);
-                } else {
-                    new_content_len -= 1;
-                }
+                )?)
            }
            self.content.truncate(new_content_len);
        }
@@ -436,7 +425,6 @@ impl From<acp::ToolCallStatus> for ToolCallStatus {
            acp::ToolCallStatus::InProgress => Self::InProgress,
            acp::ToolCallStatus::Completed => Self::Completed,
            acp::ToolCallStatus::Failed => Self::Failed,
-            _ => Self::Pending,
        }
    }
 }
@@ -549,7 +537,7 @@ impl ContentBlock {
                ..
            }) => Self::resource_link_md(&uri, path_style),
            acp::ContentBlock::Image(image) => Self::image_md(&image),
-            _ => String::new(),
+            acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => String::new(),
        }
    }

@@ -603,17 +591,15 @@ impl ToolCallContent {
        path_style: PathStyle,
        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
        cx: &mut App,
-    ) -> Result<Option<Self>> {
+    ) -> Result<Self> {
        match content {
-            acp::ToolCallContent::Content(acp::Content { content, .. }) => {
-                Ok(Some(Self::ContentBlock(ContentBlock::new(
-                    content,
-                    &language_registry,
-                    path_style,
-                    cx,
-                ))))
-            }
-            acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
+            acp::ToolCallContent::Content { content } => Ok(Self::ContentBlock(ContentBlock::new(
+                content,
+                &language_registry,
+                path_style,
+                cx,
+            ))),
+            acp::ToolCallContent::Diff { diff } => Ok(Self::Diff(cx.new(|cx| {
                Diff::finalized(
                    diff.path.to_string_lossy().into_owned(),
                    diff.old_text,
@@ -621,13 +607,12 @@ impl ToolCallContent {
                    language_registry,
                    cx,
                )
-            })))),
-            acp::ToolCallContent::Terminal(acp::Terminal { terminal_id, .. }) => terminals
+            }))),
+            acp::ToolCallContent::Terminal { terminal_id } => terminals
                .get(&terminal_id)
                .cloned()
-                .map(|terminal| Some(Self::Terminal(terminal)))
+                .map(Self::Terminal)
                .ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
-            _ => Ok(None),
        }
    }

@@ -638,9 +623,9 @@ impl ToolCallContent {
        path_style: PathStyle,
        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
        cx: &mut App,
-    ) -> Result<bool> {
+    ) -> Result<()> {
        let needs_update = match (&self, &new) {
-            (Self::Diff(old_diff), acp::ToolCallContent::Diff(new_diff)) => {
+            (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
                old_diff.read(cx).needs_update(
                    new_diff.old_text.as_deref().unwrap_or(""),
                    &new_diff.new_text,
@@ -650,14 +635,10 @@ impl ToolCallContent {
            _ => true,
        };

-        if let Some(update) = Self::from_acp(new, language_registry, path_style, terminals, cx)? {
-            if needs_update {
-                *self = update;
-            }
-            Ok(true)
-        } else {
-            Ok(false)
+        if needs_update {
+            *self = Self::from_acp(new, language_registry, path_style, terminals, cx)?;
        }
+        Ok(())
    }

    pub fn to_markdown(&self, cx: &App) -> String {
@@ -679,7 +660,7 @@ pub enum ToolCallUpdate {
 impl ToolCallUpdate {
    fn id(&self) -> &acp::ToolCallId {
        match self {
-            Self::UpdateFields(update) => &update.tool_call_id,
+            Self::UpdateFields(update) => &update.id,
            Self::UpdateDiff(diff) => &diff.id,
            Self::UpdateTerminal(terminal) => &terminal.id,
        }
@@ -751,7 +732,6 @@ impl Plan {
                acp::PlanEntryStatus::Completed => {
                    stats.completed += 1;
                }
-                _ => {}
            }
        }

@@ -1174,7 +1154,6 @@ impl AcpThread {
                current_mode_id,
                ..
            }) => cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id)),
-            _ => {}
        }
        Ok(())
    }
@@ -1308,7 +1287,11 @@ impl AcpThread {
                    label: cx.new(|cx| Markdown::new("Tool call not found".into(), None, None, cx)),
                    kind: acp::ToolKind::Fetch,
                    content: vec![ToolCallContent::ContentBlock(ContentBlock::new(
-                        "Tool call not found".into(),
+                        acp::ContentBlock::Text(acp::TextContent {
+                            text: "Tool call not found".to_string(),
+                            annotations: None,
+                            meta: None,
+                        }),
                        &languages,
                        path_style,
                        cx,
@@ -1332,7 +1315,7 @@ impl AcpThread {
                let location_updated = update.fields.locations.is_some();
                call.update_fields(update.fields, languages, path_style, &self.terminals, cx)?;
                if location_updated {
-                    self.resolve_locations(update.tool_call_id, cx);
+                    self.resolve_locations(update.id, cx);
                }
            }
            ToolCallUpdate::UpdateDiff(update) => {
@@ -1370,9 +1353,9 @@ impl AcpThread {
    ) -> Result<(), acp::Error> {
        let language_registry = self.project.read(cx).languages().clone();
        let path_style = self.project.read(cx).path_style(cx);
-        let id = update.tool_call_id.clone();
+        let id = update.id.clone();

-        let agent_telemetry_id = self.connection().telemetry_id();
+        let agent = self.connection().telemetry_id();
        let session = self.session_id();
        if let ToolCallStatus::Completed | ToolCallStatus::Failed = status {
            let status = if matches!(status, ToolCallStatus::Completed) {
@@ -1380,12 +1363,7 @@ impl AcpThread {
            } else {
                "failed"
            };
-            telemetry::event!(
-                "Agent Tool Call Completed",
-                agent_telemetry_id,
-                session,
-                status
-            );
+            telemetry::event!("Agent Tool Call Completed", agent, session, status);
        }

        if let Some(ix) = self.index_for_tool_call(&id) {
@@ -1540,16 +1518,16 @@ impl AcpThread {
            // some tools would (incorrectly) continue to auto-accept.
            if let Some(allow_once_option) = options.iter().find_map(|option| {
                if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
-                    Some(option.option_id.clone())
+                    Some(option.id.clone())
                } else {
                    None
                }
            }) {
                self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
                return Ok(async {
-                    acp::RequestPermissionOutcome::Selected(acp::SelectedPermissionOutcome::new(
-                        allow_once_option,
-                    ))
+                    acp::RequestPermissionOutcome::Selected {
+                        option_id: allow_once_option,
+                    }
                }
                .boxed());
            }
@@ -1565,9 +1543,7 @@ impl AcpThread {

        let fut = async {
            match rx.await {
-                Ok(option) => acp::RequestPermissionOutcome::Selected(
-                    acp::SelectedPermissionOutcome::new(option),
-                ),
+                Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
                Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
            }
        }
@@ -1594,7 +1570,6 @@ impl AcpThread {
            acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
                ToolCallStatus::InProgress
            }
-            _ => ToolCallStatus::InProgress,
        };

        let curr_status = mem::replace(&mut call.status, new_status);
@@ -1673,7 +1648,14 @@ impl AcpThread {
        message: &str,
        cx: &mut Context<Self>,
    ) -> BoxFuture<'static, Result<()>> {
-        self.send(vec![message.into()], cx)
+        self.send(
+            vec![acp::ContentBlock::Text(acp::TextContent {
+                text: message.to_string(),
+                annotations: None,
+                meta: None,
+            })],
+            cx,
+        )
    }

    pub fn send(
@@ -1687,7 +1669,11 @@ impl AcpThread {
            self.project.read(cx).path_style(cx),
            cx,
        );
-        let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
+        let request = acp::PromptRequest {
+            prompt: message.clone(),
+            session_id: self.session_id.clone(),
+            meta: None,
+        };
        let git_store = self.project.read(cx).git_store().clone();

        let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
@@ -1779,7 +1765,7 @@ impl AcpThread {
                            result,
                            Ok(Ok(acp::PromptResponse {
                                stop_reason: acp::StopReason::Cancelled,
-                                ..
+                                meta: None,
                            }))
                        );

@@ -1795,7 +1781,7 @@ impl AcpThread {
                        // Handle refusal - distinguish between user prompt and tool call refusals
                        if let Ok(Ok(acp::PromptResponse {
                            stop_reason: acp::StopReason::Refusal,
-                            ..
+                            meta: _,
                        })) = result
                        {
                            if let Some((user_msg_ix, _)) = this.last_user_message() {
@@ -2031,7 +2017,7 @@ impl AcpThread {
                        })?;
                    Ok(project.open_buffer(path, cx))
                })
-                .map_err(|e| acp::Error::internal_error().data(e.to_string()))
+                .map_err(|e| acp::Error::internal_error().with_data(e.to_string()))
                .flatten()?;

            let buffer = load.await?;
@@ -2064,7 +2050,7 @@ impl AcpThread {
            let start_position = Point::new(line, 0);

            if start_position > max_point {
-                return Err(acp::Error::invalid_params().data(format!(
+                return Err(acp::Error::invalid_params().with_data(format!(
                    "Attempting to read beyond the end of the file, line {}:{}",
                    max_point.row + 1,
                    max_point.column
@@ -2216,7 +2202,7 @@ impl AcpThread {
        let language_registry = project.read(cx).languages().clone();
        let is_windows = project.read(cx).path_style(cx).is_windows();

-        let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(Uuid::new_v4().to_string().into());
        let terminal_task = cx.spawn({
            let terminal_id = terminal_id.clone();
            async move |_this, cx| {
@@ -2426,7 +2412,7 @@ mod tests {
            .await
            .unwrap();

-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());

        // Send Output BEFORE Created - should be buffered by acp_thread
        thread.update(cx, |thread, cx| {
@@ -2488,7 +2474,7 @@ mod tests {
            .await
            .unwrap();

-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());

        // Send Output BEFORE Created
        thread.update(cx, |thread, cx| {
@@ -2506,7 +2492,11 @@ mod tests {
            thread.on_terminal_provider_event(
                TerminalProviderEvent::Exit {
                    terminal_id: terminal_id.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                },
                cx,
            );
@@ -2563,7 +2553,15 @@ mod tests {

        // Test creating a new user message
        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(None, "Hello, ".into(), cx);
+            thread.push_user_content_block(
+                None,
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "Hello, ".to_string(),
+                    meta: None,
+                }),
+                cx,
+            );
        });

        thread.update(cx, |thread, cx| {
@@ -2579,7 +2577,15 @@ mod tests {
        // Test appending to existing user message
        let message_1_id = UserMessageId::new();
        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
+            thread.push_user_content_block(
+                Some(message_1_id.clone()),
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "world!".to_string(),
+                    meta: None,
+                }),
+                cx,
+            );
        });

        thread.update(cx, |thread, cx| {
@@ -2594,14 +2600,26 @@ mod tests {

        // Test creating new user message after assistant message
        thread.update(cx, |thread, cx| {
-            thread.push_assistant_content_block("Assistant response".into(), false, cx);
+            thread.push_assistant_content_block(
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "Assistant response".to_string(),
+                    meta: None,
+                }),
+                false,
+                cx,
+            );
        });

        let message_2_id = UserMessageId::new();
        thread.update(cx, |thread, cx| {
            thread.push_user_content_block(
                Some(message_2_id.clone()),
-                "New user message".into(),
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "New user message".to_string(),
+                    meta: None,
+                }),
                cx,
            );
        });
@@ -2629,22 +2647,27 @@ mod tests {
                    thread.update(&mut cx, |thread, cx| {
                        thread
                            .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "Thinking ".into(),
-                                )),
+                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
+                                    content: "Thinking ".into(),
+                                    meta: None,
+                                }),
                                cx,
                            )
                            .unwrap();
                        thread
                            .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "hard!".into(),
-                                )),
+                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
+                                    content: "hard!".into(),
+                                    meta: None,
+                                }),
                                cx,
                            )
                            .unwrap();
                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            },
@@ -2712,7 +2735,10 @@ mod tests {
                        .unwrap()
                        .await
                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            },
@@ -2934,7 +2960,7 @@ mod tests {
            .await
            .unwrap_err();

-        assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
+        assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
    }

    #[gpui::test]
@@ -2943,7 +2969,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs, [], cx).await;
-        let id = acp::ToolCallId::new("test");
+        let id = acp::ToolCallId("test".into());

        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
            let id = id.clone();
@@ -2953,17 +2979,26 @@ mod tests {
                    thread
                        .update(&mut cx, |thread, cx| {
                            thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new(id.clone(), "Label")
-                                        .kind(acp::ToolKind::Fetch)
-                                        .status(acp::ToolCallStatus::InProgress),
-                                ),
+                                acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                    id: id.clone(),
+                                    title: "Label".into(),
+                                    kind: acp::ToolKind::Fetch,
+                                    status: acp::ToolCallStatus::InProgress,
+                                    content: vec![],
+                                    locations: vec![],
+                                    raw_input: None,
+                                    raw_output: None,
+                                    meta: None,
+                                }),
                                cx,
                            )
                        })
                        .unwrap()
                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            }
@@ -3005,10 +3040,14 @@ mod tests {
        thread
            .update(cx, |thread, cx| {
                thread.handle_session_update(
-                    acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
+                    acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
                        id,
-                        acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                    )),
+                        fields: acp::ToolCallUpdateFields {
+                            status: Some(acp::ToolCallStatus::Completed),
+                            ..Default::default()
+                        },
+                        meta: None,
+                    }),
                    cx,
                )
            })
@@ -3040,21 +3079,33 @@ mod tests {
                    thread
                        .update(&mut cx, |thread, cx| {
                            thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new("test", "Label")
-                                        .kind(acp::ToolKind::Edit)
-                                        .status(acp::ToolCallStatus::Completed)
-                                        .content(vec![acp::ToolCallContent::Diff(acp::Diff::new(
-                                            "/test/test.txt",
-                                            "foo",
-                                        ))]),
-                                ),
+                                acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                    id: acp::ToolCallId("test".into()),
+                                    title: "Label".into(),
+                                    kind: acp::ToolKind::Edit,
+                                    status: acp::ToolCallStatus::Completed,
+                                    content: vec![acp::ToolCallContent::Diff {
+                                        diff: acp::Diff {
+                                            path: "/test/test.txt".into(),
+                                            old_text: None,
+                                            new_text: "foo".into(),
+                                            meta: None,
+                                        },
+                                    }],
+                                    locations: vec![],
+                                    raw_input: None,
+                                    raw_output: None,
+                                    meta: None,
+                                }),
                                cx,
                            )
                        })
                        .unwrap()
                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            }
@@ -3107,14 +3158,18 @@ mod tests {
                    thread.update(&mut cx, |thread, cx| {
                        thread
                            .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
+                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                                    content: content.text.to_uppercase().into(),
+                                    meta: None,
+                                }),
                                cx,
                            )
                            .unwrap();
                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            }
@@ -3270,22 +3325,34 @@ mod tests {
                        thread.update(&mut cx, |thread, cx| {
                            thread
                                .handle_session_update(
-                                    acp::SessionUpdate::ToolCall(
-                                        acp::ToolCall::new("tool1", "Test Tool")
-                                            .kind(acp::ToolKind::Fetch)
-                                            .status(acp::ToolCallStatus::Completed)
-                                            .raw_input(serde_json::json!({"query": "test"}))
-                                            .raw_output(serde_json::json!({"result": "inappropriate content"})),
-                                    ),
+                                    acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                        id: acp::ToolCallId("tool1".into()),
+                                        title: "Test Tool".into(),
+                                        kind: acp::ToolKind::Fetch,
+                                        status: acp::ToolCallStatus::Completed,
+                                        content: vec![],
+                                        locations: vec![],
+                                        raw_input: Some(serde_json::json!({"query": "test"})),
+                                        raw_output: Some(
+                                            serde_json::json!({"result": "inappropriate content"}),
+                                        ),
+                                        meta: None,
+                                    }),
                                    cx,
                                )
                                .unwrap();
                        })?;

                        // Now return refusal because of the tool result
-                        Ok(acp::PromptResponse::new(acp::StopReason::Refusal))
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        })
                    } else {
-                        Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
+                        })
                    }
                }
                .boxed_local()
@@ -3313,7 +3380,16 @@ mod tests {
        });

        // Send a user message - this will trigger tool call and then refusal
-        let send_task = thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
+        let send_task = thread.update(cx, |thread, cx| {
+            thread.send(
+                vec![acp::ContentBlock::Text(acp::TextContent {
+                    text: "Hello".into(),
+                    annotations: None,
+                    meta: None,
+                })],
+                cx,
+            )
+        });
        cx.background_executor.spawn(send_task).detach();
        cx.run_until_parked();

@@ -3359,11 +3435,21 @@ mod tests {
            let refuse_next = refuse_next.clone();
            move |_request, _thread, _cx| {
                if refuse_next.load(SeqCst) {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::Refusal)) }
-                        .boxed_local()
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        })
+                    }
+                    .boxed_local()
                } else {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
-                        .boxed_local()
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
+                        })
+                    }
+                    .boxed_local()
                }
            }
        }));
@@ -3420,7 +3506,10 @@ mod tests {
                let refuse_next = refuse_next.clone();
                async move {
                    if refuse_next.load(SeqCst) {
-                        return Ok(acp::PromptResponse::new(acp::StopReason::Refusal));
+                        return Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        });
                    }

                    let acp::ContentBlock::Text(content) = &request.prompt[0] else {
@@ -3429,14 +3518,18 @@ mod tests {
                    thread.update(&mut cx, |thread, cx| {
                        thread
                            .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
+                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                                    content: content.text.to_uppercase().into(),
+                                    meta: None,
+                                }),
                                cx,
                            )
                            .unwrap();
                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                }
                .boxed_local()
            }
@@ -3561,8 +3654,8 @@ mod tests {
    }

    impl AgentConnection for FakeAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "fake".into()
+        fn telemetry_id(&self) -> &'static str {
+            "fake"
        }

        fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -3575,12 +3668,13 @@ mod tests {
            _cwd: &Path,
            cx: &mut App,
        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(
+            let session_id = acp::SessionId(
                rand::rng()
                    .sample_iter(&distr::Alphanumeric)
                    .take(7)
                    .map(char::from)
-                    .collect::<String>(),
+                    .collect::<String>()
+                    .into(),
            );
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
            let thread = cx.new(|cx| {
@@ -3590,12 +3684,12 @@ mod tests {
                    project,
                    action_log,
                    session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                        meta: None,
+                    }),
                    cx,
                )
            });
@@ -3624,7 +3718,10 @@ mod tests {
                let thread = thread.clone();
                cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
            } else {
-                Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
+                Task::ready(Ok(acp::PromptResponse {
+                    stop_reason: acp::StopReason::EndTurn,
+                    meta: None,
+                }))
            }
        }

@@ -3679,13 +3776,17 @@ mod tests {
            .unwrap();

        // Try to update a tool call that doesn't exist
-        let nonexistent_id = acp::ToolCallId::new("nonexistent-tool-call");
+        let nonexistent_id = acp::ToolCallId("nonexistent-tool-call".into());
        thread.update(cx, |thread, cx| {
            let result = thread.handle_session_update(
-                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
-                    nonexistent_id.clone(),
-                    acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                )),
+                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
+                    id: nonexistent_id.clone(),
+                    fields: acp::ToolCallUpdateFields {
+                        status: Some(acp::ToolCallStatus::Completed),
+                        ..Default::default()
+                    },
+                    meta: None,
+                }),
                cx,
            );

@@ -3760,7 +3861,7 @@ mod tests {
        .unwrap();

        // Create 2 terminals BEFORE the checkpoint that have completed running
-        let terminal_id_1 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id_1 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
        let mock_terminal_1 = cx.new(|cx| {
            let builder = ::terminal::TerminalBuilder::new_display_only(
                ::terminal::terminal_settings::CursorShape::default(),
@@ -3799,13 +3900,17 @@ mod tests {
            thread.on_terminal_provider_event(
                TerminalProviderEvent::Exit {
                    terminal_id: terminal_id_1.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                },
                cx,
            );
        });

-        let terminal_id_2 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id_2 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
        let mock_terminal_2 = cx.new(|cx| {
            let builder = ::terminal::TerminalBuilder::new_display_only(
                ::terminal::terminal_settings::CursorShape::default(),
@@ -3844,7 +3949,11 @@ mod tests {
            thread.on_terminal_provider_event(
                TerminalProviderEvent::Exit {
                    terminal_id: terminal_id_2.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                },
                cx,
            );
@@ -3864,7 +3973,7 @@ mod tests {

        // Create a terminal AFTER the checkpoint we'll restore to.
        // This simulates the AI agent starting a long-running terminal command.
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
        let mock_terminal = cx.new(|cx| {
            let builder = ::terminal::TerminalBuilder::new_display_only(
                ::terminal::terminal_settings::CursorShape::default(),
@@ -3906,15 +4015,21 @@ mod tests {
        thread.update(cx, |thread, cx| {
            thread
                .handle_session_update(
-                    acp::SessionUpdate::ToolCall(
-                        acp::ToolCall::new("terminal-tool-1", "Running command")
-                            .kind(acp::ToolKind::Execute)
-                            .status(acp::ToolCallStatus::InProgress)
-                            .content(vec![acp::ToolCallContent::Terminal(acp::Terminal::new(
-                                terminal_id.clone(),
-                            ))])
-                            .raw_input(serde_json::json!({"command": "sleep 1000", "cd": "/test"})),
-                    ),
+                    acp::SessionUpdate::ToolCall(acp::ToolCall {
+                        id: acp::ToolCallId("terminal-tool-1".into()),
+                        title: "Running command".into(),
+                        kind: acp::ToolKind::Execute,
+                        status: acp::ToolCallStatus::InProgress,
+                        content: vec![acp::ToolCallContent::Terminal {
+                            terminal_id: terminal_id.clone(),
+                        }],
+                        locations: vec![],
+                        raw_input: Some(
+                            serde_json::json!({"command": "sleep 1000", "cd": "/test"}),
+                        ),
+                        raw_output: None,
+                        meta: None,
+                    }),
                    cx,
                )
                .unwrap();
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -20,7 +20,7 @@ impl UserMessageId {
 }

 pub trait AgentConnection {
-    fn telemetry_id(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;

    fn new_thread(
        self: Rc<Self>,
@@ -322,8 +322,8 @@ mod test_support {
    }

    impl AgentConnection for StubAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "stub".into()
+        fn telemetry_id(&self) -> &'static str {
+            "stub"
        }

        fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -336,7 +336,7 @@ mod test_support {
            _cwd: &Path,
            cx: &mut gpui::App,
        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(self.sessions.lock().len().to_string());
+            let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
            let thread = cx.new(|cx| {
                AcpThread::new(
@@ -345,12 +345,12 @@ mod test_support {
                    project,
                    action_log,
                    session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                        meta: None,
+                    }),
                    cx,
                )
            });
@@ -389,7 +389,10 @@ mod test_support {
                response_tx.replace(tx);
                cx.spawn(async move |_| {
                    let stop_reason = rx.await?;
-                    Ok(acp::PromptResponse::new(stop_reason))
+                    Ok(acp::PromptResponse {
+                        stop_reason,
+                        meta: None,
+                    })
                })
            } else {
                for update in self.next_prompt_updates.lock().drain(..) {
@@ -397,7 +400,7 @@ mod test_support {
                    let update = update.clone();
                    let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) =
                        &update
-                        && let Some(options) = self.permission_requests.get(&tool_call.tool_call_id)
+                        && let Some(options) = self.permission_requests.get(&tool_call.id)
                    {
                        Some((tool_call.clone(), options.clone()))
                    } else {
@@ -426,7 +429,10 @@ mod test_support {

                cx.spawn(async move |_| {
                    try_join_all(tasks).await?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                })
            }
        }
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -166,7 +166,7 @@ impl Diff {
    }

    pub fn has_revealed_range(&self, cx: &App) -> bool {
-        self.multibuffer().read(cx).paths().next().is_some()
+        self.multibuffer().read(cx).excerpt_paths().next().is_some()
    }

    pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -4,14 +4,12 @@ use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
 use serde::{Deserialize, Serialize};
 use std::{
-    borrow::Cow,
    fmt,
    ops::RangeInclusive,
    path::{Path, PathBuf},
 };
 use ui::{App, IconName, SharedString};
 use url::Url;
-use urlencoding::decode;
 use util::paths::PathStyle;

 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
@@ -76,13 +74,11 @@ impl MentionUri {
        let path = url.path();
        match url.scheme() {
            "file" => {
-                let normalized = if path_style.is_windows() {
+                let path = if path_style.is_windows() {
                    path.trim_start_matches("/")
                } else {
                    path
                };
-                let decoded = decode(normalized).unwrap_or(Cow::Borrowed(normalized));
-                let path = decoded.as_ref();

                if let Some(fragment) = url.fragment() {
                    let line_range = parse_line_range(fragment)?;
@@ -112,7 +108,7 @@ impl MentionUri {
                if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
                    let name = single_query_param(&url, "name")?.context("Missing thread name")?;
                    Ok(Self::Thread {
-                        id: acp::SessionId::new(thread_id),
+                        id: acp::SessionId(thread_id.into()),
                        name,
                    })
                } else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
@@ -410,19 +406,6 @@ mod tests {
        assert_eq!(parsed.to_uri().to_string(), selection_uri);
    }

-    #[test]
-    fn test_parse_file_uri_with_non_ascii() {
-        let file_uri = uri!("file:///path/to/%E6%97%A5%E6%9C%AC%E8%AA%9E.txt");
-        let parsed = MentionUri::parse(file_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::File { abs_path } => {
-                assert_eq!(abs_path, Path::new(path!("/path/to/日本語.txt")));
-            }
-            _ => panic!("Expected File variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), file_uri);
-    }
-
    #[test]
    fn test_parse_untitled_selection_uri() {
        let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -75,9 +75,11 @@ impl Terminal {

                    let exit_status = exit_status.map(portable_pty::ExitStatus::from);

-                    acp::TerminalExitStatus::new()
-                        .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                        .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
+                    acp::TerminalExitStatus {
+                        exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                        signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                        meta: None,
+                    }
                })
                .shared(),
        }
@@ -101,19 +103,25 @@ impl Terminal {
        if let Some(output) = self.output.as_ref() {
            let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);

-            acp::TerminalOutputResponse::new(
-                output.content.clone(),
-                output.original_content_len > output.content.len(),
-            )
-            .exit_status(
-                acp::TerminalExitStatus::new()
-                    .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                    .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
-            )
+            acp::TerminalOutputResponse {
+                output: output.content.clone(),
+                truncated: output.original_content_len > output.content.len(),
+                exit_status: Some(acp::TerminalExitStatus {
+                    exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                    signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                    meta: None,
+                }),
+                meta: None,
+            }
        } else {
            let (current_content, original_len) = self.truncated_output(cx);
-            let truncated = current_content.len() < original_len;
-            acp::TerminalOutputResponse::new(current_content, truncated)
+
+            acp::TerminalOutputResponse {
+                truncated: current_content.len() < original_len,
+                output: current_content,
+                exit_status: None,
+                meta: None,
+            }
        }
    }

@@ -187,10 +195,8 @@ pub async fn create_terminal_entity(
        Default::default()
    };

-    // Disable pagers so agent/terminal commands don't hang behind interactive UIs
+    // Disables paging for `git` and hopefully other commands
    env.insert("PAGER".into(), "".into());
-    // Override user core.pager (e.g. delta) which Git prefers over PAGER
-    env.insert("GIT_PAGER".into(), "cat".into());
    env.extend(env_vars);

    // Use remote shell or default system shell, as appropriate
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -371,13 +371,13 @@ impl AcpTools {
                                    syntax: cx.theme().syntax().clone(),
                                    code_block_overflow_x_scroll: true,
                                    code_block: StyleRefinement {
-                                        text: TextStyleRefinement {
+                                        text: Some(TextStyleRefinement {
                                            font_family: Some(
                                                theme_settings.buffer_font.family.clone(),
                                            ),
                                            font_size: Some((base_size * 0.8).into()),
                                            ..Default::default()
-                                        },
+                                        }),
                                        ..Default::default()
                                    },
                                    ..Default::default()
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -777,7 +777,7 @@ impl ActionLog {

 #[derive(Clone)]
 pub struct ActionLogTelemetry {
-    pub agent_telemetry_id: SharedString,
+    pub agent_telemetry_id: &'static str,
    pub session_id: Arc<str>,
 }

--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -33,8 +33,7 @@ use gpui::{
 use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
-    ProjectContext, PromptStore, RULES_FILE_NAMES, RulesFileContext, UserRulesContext,
-    WorktreeContext,
+    ProjectContext, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
 use settings::{LanguageModelSelection, update_settings_file};
@@ -52,6 +51,18 @@ pub struct ProjectSnapshot {
    pub timestamp: DateTime<Utc>,
 }

+const RULES_FILE_NAMES: [&str; 9] = [
+    ".rules",
+    ".cursorrules",
+    ".windsurfrules",
+    ".clinerules",
+    ".github/copilot-instructions.md",
+    "CLAUDE.md",
+    "AGENT.md",
+    "AGENTS.md",
+    "GEMINI.md",
+];
+
 pub struct RulesLoadingError {
    pub message: SharedString,
 }
@@ -159,7 +170,7 @@ impl LanguageModels {
    }

    fn model_id(model: &Arc<dyn LanguageModel>) -> acp::ModelId {
-        acp::ModelId::new(format!("{}/{}", model.provider_id().0, model.id().0))
+        acp::ModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
    }

    fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
@@ -778,12 +789,28 @@ impl NativeAgentConnection {
                            }
                            ThreadEvent::AgentText(text) => {
                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), false, cx)
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                            meta: None,
+                                        }),
+                                        false,
+                                        cx,
+                                    )
                                })?;
                            }
                            ThreadEvent::AgentThinking(text) => {
                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), true, cx)
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                            meta: None,
+                                        }),
+                                        true,
+                                        cx,
+                                    )
                                })?;
                            }
                            ThreadEvent::ToolCallAuthorization(ToolCallAuthorization {
@@ -797,9 +824,8 @@ impl NativeAgentConnection {
                                    )
                                })??;
                                cx.background_spawn(async move {
-                                    if let acp::RequestPermissionOutcome::Selected(
-                                        acp::SelectedPermissionOutcome { option_id, .. },
-                                    ) = outcome_task.await
+                                    if let acp::RequestPermissionOutcome::Selected { option_id } =
+                                        outcome_task.await
                                    {
                                        response
                                            .send(option_id)
@@ -826,7 +852,10 @@ impl NativeAgentConnection {
                            }
                            ThreadEvent::Stop(stop_reason) => {
                                log::debug!("Assistant message complete: {:?}", stop_reason);
-                                return Ok(acp::PromptResponse::new(stop_reason));
+                                return Ok(acp::PromptResponse {
+                                    stop_reason,
+                                    meta: None,
+                                });
                            }
                        }
                    }
@@ -838,7 +867,10 @@ impl NativeAgentConnection {
            }

            log::debug!("Response stream completed");
-            anyhow::Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+            anyhow::Ok(acp::PromptResponse {
+                stop_reason: acp::StopReason::EndTurn,
+                meta: None,
+            })
        })
    }
 }
@@ -936,8 +968,8 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
 }

 impl acp_thread::AgentConnection for NativeAgentConnection {
-    fn telemetry_id(&self) -> SharedString {
-        "zed".into()
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
    }

    fn new_thread(
@@ -1208,15 +1240,6 @@ impl TerminalHandle for AcpTerminalHandle {
        self.terminal
            .read_with(cx, |term, cx| term.current_output(cx))
    }
-
-    fn kill(&self, cx: &AsyncApp) -> Result<()> {
-        cx.update(|cx| {
-            self.terminal.update(cx, |terminal, cx| {
-                terminal.kill(cx);
-            });
-        })?;
-        Ok(())
-    }
 }

 #[cfg(test)]
@@ -1351,7 +1374,7 @@ mod internal_tests {
            IndexMap::from_iter([(
                AgentModelGroupName("Fake".into()),
                vec![AgentModelInfo {
-                    id: acp::ModelId::new("fake/fake"),
+                    id: acp::ModelId("fake/fake".into()),
                    name: "Fake".into(),
                    description: None,
                    icon: Some(ui::IconName::ZedAssistant),
@@ -1412,7 +1435,7 @@ mod internal_tests {

        // Select a model
        let selector = connection.model_selector(&session_id).unwrap();
-        let model_id = acp::ModelId::new("fake/fake");
+        let model_id = acp::ModelId("fake/fake".into());
        cx.update(|cx| selector.select_model(model_id.clone(), cx))
            .await
            .unwrap();
@@ -1498,14 +1521,20 @@ mod internal_tests {
            thread.send(
                vec![
                    "What does ".into(),
-                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                        "b.md",
-                        MentionUri::File {
+                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: "b.md".into(),
+                        uri: MentionUri::File {
                            abs_path: path!("/a/b.md").into(),
                        }
                        .to_uri()
                        .to_string(),
-                    )),
+                        annotations: None,
+                        description: None,
+                        mime_type: None,
+                        size: None,
+                        title: None,
+                        meta: None,
+                    }),
                    " mean?".into(),
                ],
                cx,
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -366,7 +366,7 @@ impl ThreadsDatabase {

            for (id, summary, updated_at) in rows {
                threads.push(DbThreadMetadata {
-                    id: acp::SessionId::new(id),
+                    id: acp::SessionId(id),
                    title: summary.into(),
                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
                });
--- a/crates/agent/src/edit_agent/evals.rs
+++ b/crates/agent/src/edit_agent/evals.rs
@@ -4,7 +4,6 @@ use crate::{
 };
 use Role::*;
 use client::{Client, UserStore};
-use eval_utils::{EvalOutput, EvalOutputProcessor, OutcomeKind};
 use fs::FakeFs;
 use futures::{FutureExt, future::LocalBoxFuture};
 use gpui::{AppContext, TestAppContext, Timer};
@@ -23,59 +22,11 @@ use std::{
    fmt::{self, Display},
    path::Path,
    str::FromStr,
+    sync::mpsc,
    time::Duration,
 };
 use util::path;

-#[derive(Default, Clone, Debug)]
-struct EditAgentOutputProcessor {
-    mismatched_tag_threshold: f32,
-    cumulative_tags: usize,
-    cumulative_mismatched_tags: usize,
-    eval_outputs: Vec<EvalOutput<EditEvalMetadata>>,
-}
-
-fn mismatched_tag_threshold(mismatched_tag_threshold: f32) -> EditAgentOutputProcessor {
-    EditAgentOutputProcessor {
-        mismatched_tag_threshold,
-        cumulative_tags: 0,
-        cumulative_mismatched_tags: 0,
-        eval_outputs: Vec::new(),
-    }
-}
-
-#[derive(Clone, Debug)]
-struct EditEvalMetadata {
-    tags: usize,
-    mismatched_tags: usize,
-}
-
-impl EvalOutputProcessor for EditAgentOutputProcessor {
-    type Metadata = EditEvalMetadata;
-
-    fn process(&mut self, output: &EvalOutput<Self::Metadata>) {
-        if matches!(output.outcome, OutcomeKind::Passed | OutcomeKind::Failed) {
-            self.cumulative_mismatched_tags += output.metadata.mismatched_tags;
-            self.cumulative_tags += output.metadata.tags;
-            self.eval_outputs.push(output.clone());
-        }
-    }
-
-    fn assert(&mut self) {
-        let mismatched_tag_ratio =
-            self.cumulative_mismatched_tags as f32 / self.cumulative_tags as f32;
-        if mismatched_tag_ratio > self.mismatched_tag_threshold {
-            for eval_output in &self.eval_outputs {
-                println!("{}", eval_output.data);
-            }
-            panic!(
-                "Too many mismatched tags: {:?}",
-                self.cumulative_mismatched_tags
-            );
-        }
-    }
-}
-
 #[test]
 #[cfg_attr(not(feature = "unit-eval"), ignore)]
 fn eval_extract_handle_command_output() {
@@ -101,19 +52,22 @@ fn eval_extract_handle_command_output() {
        include_str!("evals/fixtures/extract_handle_command_output/possible-07.diff"),
    ];
    let edit_description = "Extract `handle_command_output` method from `run_git_blame`.";
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        100,
+        0.95,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(
                    User,
                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and extract a method in
-                            the final stanza of `run_git_blame` to deal with command failures,
-                            call it `handle_command_output` and take the std::process::Output as the only parameter.
-                            Do not document the method and do not add any comments.
+                        Read the `{input_file_path}` file and extract a method in
+                        the final stanza of `run_git_blame` to deal with command failures,
+                        call it `handle_command_output` and take the std::process::Output as the only parameter.
+                        Do not document the method and do not add any comments.

-                            Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
-                        "})],
+                        Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
+                    "})],
                ),
                message(
                    Assistant,
@@ -145,9 +99,9 @@ fn eval_extract_handle_command_output() {
                ),
            ],
            Some(input_file_content.into()),
-            EvalAssertion::assert_diff_any(possible_diffs.clone()),
-        ))
-    });
+            EvalAssertion::assert_diff_any(possible_diffs),
+        ),
+    );
 }

 #[test]
@@ -165,16 +119,18 @@ fn eval_delete_run_git_blame() {
    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");
    let edit_description = "Delete the `run_git_blame` function.";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        100,
+        0.95,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(
                    User,
                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and delete `run_git_blame`. Just that
-                            one function, not its usages.
-                        "})],
+                        Read the `{input_file_path}` file and delete `run_git_blame`. Just that
+                        one function, not its usages.
+                    "})],
                ),
                message(
                    Assistant,
@@ -207,8 +163,8 @@ fn eval_delete_run_git_blame() {
            ],
            Some(input_file_content.into()),
            EvalAssertion::assert_eq(output_file_content),
-        ))
-    });
+        ),
+    );
 }

 #[test]
@@ -226,16 +182,18 @@ fn eval_translate_doc_comments() {
    let input_file_path = "root/canvas.rs";
    let input_file_content = include_str!("evals/fixtures/translate_doc_comments/before.rs");
    let edit_description = "Translate all doc comments to Italian";
-
-    eval_utils::eval(200, 1., mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        200,
+        1.,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(
                    User,
                    [text(formatdoc! {"
-                            Read the {input_file_path} file and edit it (without overwriting it),
-                            translating all the doc comments to italian.
-                        "})],
+                        Read the {input_file_path} file and edit it (without overwriting it),
+                        translating all the doc comments to italian.
+                    "})],
                ),
                message(
                    Assistant,
@@ -268,8 +226,8 @@ fn eval_translate_doc_comments() {
            ],
            Some(input_file_content.into()),
            EvalAssertion::judge_diff("Doc comments were translated to Italian"),
-        ))
-    });
+        ),
+    );
 }

 #[test]
@@ -288,31 +246,33 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
    let input_file_content =
        include_str!("evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs");
    let edit_description = "Update compile_parser_to_wasm to use wasi-sdk instead of emscripten";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        100,
+        0.95,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(
                    User,
                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
-                            Use `ureq` to download the SDK for the current platform and architecture.
-                            Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
-                            Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
-                            that's inside of the archive.
-                            Don't re-download the SDK if that executable already exists.
+                        Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
+                        Use `ureq` to download the SDK for the current platform and architecture.
+                        Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
+                        Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
+                        that's inside of the archive.
+                        Don't re-download the SDK if that executable already exists.

-                            Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}
+                        Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}

-                            Here are the available wasi-sdk assets:
-                            - wasi-sdk-25.0-x86_64-macos.tar.gz
-                            - wasi-sdk-25.0-arm64-macos.tar.gz
-                            - wasi-sdk-25.0-x86_64-linux.tar.gz
-                            - wasi-sdk-25.0-arm64-linux.tar.gz
-                            - wasi-sdk-25.0-x86_64-linux.tar.gz
-                            - wasi-sdk-25.0-arm64-linux.tar.gz
-                            - wasi-sdk-25.0-x86_64-windows.tar.gz
-                        "})],
+                        Here are the available wasi-sdk assets:
+                        - wasi-sdk-25.0-x86_64-macos.tar.gz
+                        - wasi-sdk-25.0-arm64-macos.tar.gz
+                        - wasi-sdk-25.0-x86_64-linux.tar.gz
+                        - wasi-sdk-25.0-arm64-linux.tar.gz
+                        - wasi-sdk-25.0-x86_64-linux.tar.gz
+                        - wasi-sdk-25.0-arm64-linux.tar.gz
+                        - wasi-sdk-25.0-x86_64-windows.tar.gz
+                    "})],
                ),
                message(
                    Assistant,
@@ -389,11 +349,11 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
            ],
            Some(input_file_content.into()),
            EvalAssertion::judge_diff(indoc! {"
-                    - The compile_parser_to_wasm method has been changed to use wasi-sdk
-                    - ureq is used to download the SDK for current platform and architecture
-                "}),
-        ))
-    });
+                - The compile_parser_to_wasm method has been changed to use wasi-sdk
+                - ureq is used to download the SDK for current platform and architecture
+            "}),
+        ),
+    );
 }

 #[test]
@@ -417,8 +377,11 @@ fn eval_disable_cursor_blinking() {
        include_str!("evals/fixtures/disable_cursor_blinking/possible-03.diff"),
        include_str!("evals/fixtures/disable_cursor_blinking/possible-04.diff"),
    ];
-    eval_utils::eval(100, 0.51, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        100,
+        0.51,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(User, [text("Let's research how to cursor blinking works.")]),
                message(
@@ -455,10 +418,10 @@ fn eval_disable_cursor_blinking() {
                message(
                    User,
                    [text(indoc! {"
-                            Comment out the lines that interact with the BlinkManager.
-                            Keep the outer `update` blocks, but comments everything that's inside (including if statements).
-                            Don't add additional comments.
-                        "})],
+                        Comment out the lines that interact with the BlinkManager.
+                        Keep the outer `update` blocks, but comments everything that's inside (including if statements).
+                        Don't add additional comments.
+                    "})],
                ),
                message(
                    Assistant,
@@ -474,9 +437,9 @@ fn eval_disable_cursor_blinking() {
                ),
            ],
            Some(input_file_content.into()),
-            EvalAssertion::assert_diff_any(possible_diffs.clone()),
-        ))
-    });
+            EvalAssertion::assert_diff_any(possible_diffs),
+        ),
+    );
 }

 #[test]
@@ -501,16 +464,20 @@ fn eval_from_pixels_constructor() {
    let input_file_path = "root/canvas.rs";
    let input_file_content = include_str!("evals/fixtures/from_pixels_constructor/before.rs");
    let edit_description = "Implement from_pixels constructor and add tests.";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.25), move || {
-        run_eval(EvalInput::from_conversation(
+    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(
                    User,
                    [text(indoc! {"
-                            Introduce a new `from_pixels` constructor in Canvas and
-                            also add tests for it in the same file.
-                        "})],
+                        Introduce a new `from_pixels` constructor in Canvas and
+                        also add tests for it in the same file.
+                    "})],
                ),
                message(
                    Assistant,
@@ -575,92 +542,92 @@ fn eval_from_pixels_constructor() {
                        "tool_4",
                        "grep",
                        indoc! {"
-                                Found 6 matches:
+                            Found 6 matches:

-                                ## Matches in font-kit/src/loaders/core_text.rs
+                            ## Matches in font-kit/src/loaders/core_text.rs

-                                ### mod test › L926-936
-                                ```
-                                mod test {
-                                    use super::Font;
-                                    use crate::properties::{Stretch, Weight};
+                            ### mod test › L926-936
+                            ```
+                            mod test {
+                                use super::Font;
+                                use crate::properties::{Stretch, Weight};

-                                    #[cfg(feature = \"source\")]
-                                    use crate::source::SystemSource;
+                                #[cfg(feature = \"source\")]
+                                use crate::source::SystemSource;

-                                    static TEST_FONT_POSTSCRIPT_NAME: &'static str = \"ArialMT\";
+                                static TEST_FONT_POSTSCRIPT_NAME: &'static str = \"ArialMT\";

-                                    #[cfg(feature = \"source\")]
-                                    #[test]
-                                ```
+                                #[cfg(feature = \"source\")]
+                                #[test]
+                            ```

-                                55 lines remaining in ancestor node. Read the file to see all.
+                            55 lines remaining in ancestor node. Read the file to see all.

-                                ### mod test › L947-951
-                                ```
-                                    }
+                            ### mod test › L947-951
+                            ```
+                                }

-                                    #[test]
-                                    fn test_core_text_to_css_font_weight() {
-                                        // Exact matches
-                                ```
+                                #[test]
+                                fn test_core_text_to_css_font_weight() {
+                                    // Exact matches
+                            ```

-                                ### mod test › L959-963
-                                ```
-                                    }
+                            ### mod test › L959-963
+                            ```
+                                }

-                                    #[test]
-                                    fn test_core_text_to_css_font_stretch() {
-                                        // Exact matches
-                                ```
+                                #[test]
+                                fn test_core_text_to_css_font_stretch() {
+                                    // Exact matches
+                            ```

-                                ## Matches in font-kit/src/loaders/freetype.rs
+                            ## Matches in font-kit/src/loaders/freetype.rs

-                                ### mod test › L1238-1248
-                                ```
-                                mod test {
-                                    use crate::loaders::freetype::Font;
+                            ### mod test › L1238-1248
+                            ```
+                            mod test {
+                                use crate::loaders::freetype::Font;

-                                    static PCF_FONT_PATH: &str = \"resources/tests/times-roman-pcf/timR12.pcf\";
-                                    static PCF_FONT_POSTSCRIPT_NAME: &str = \"Times-Roman\";
+                                static PCF_FONT_PATH: &str = \"resources/tests/times-roman-pcf/timR12.pcf\";
+                                static PCF_FONT_POSTSCRIPT_NAME: &str = \"Times-Roman\";

-                                    #[test]
-                                    fn get_pcf_postscript_name() {
-                                        let font = Font::from_path(PCF_FONT_PATH, 0).unwrap();
-                                        assert_eq!(font.postscript_name().unwrap(), PCF_FONT_POSTSCRIPT_NAME);
-                                    }
-                                ```
+                                #[test]
+                                fn get_pcf_postscript_name() {
+                                    let font = Font::from_path(PCF_FONT_PATH, 0).unwrap();
+                                    assert_eq!(font.postscript_name().unwrap(), PCF_FONT_POSTSCRIPT_NAME);
+                                }
+                            ```

-                                1 lines remaining in ancestor node. Read the file to see all.
+                            1 lines remaining in ancestor node. Read the file to see all.

-                                ## Matches in font-kit/src/sources/core_text.rs
+                            ## Matches in font-kit/src/sources/core_text.rs

-                                ### mod test › L265-275
-                                ```
-                                mod test {
-                                    use crate::properties::{Stretch, Weight};
+                            ### mod test › L265-275
+                            ```
+                            mod test {
+                                use crate::properties::{Stretch, Weight};

-                                    #[test]
-                                    fn test_css_to_core_text_font_weight() {
-                                        // Exact matches
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(100.0)), -0.7);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(400.0)), 0.0);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(700.0)), 0.4);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(900.0)), 0.8);
+                                #[test]
+                                fn test_css_to_core_text_font_weight() {
+                                    // Exact matches
+                                    assert_eq!(super::css_to_core_text_font_weight(Weight(100.0)), -0.7);
+                                    assert_eq!(super::css_to_core_text_font_weight(Weight(400.0)), 0.0);
+                                    assert_eq!(super::css_to_core_text_font_weight(Weight(700.0)), 0.4);
+                                    assert_eq!(super::css_to_core_text_font_weight(Weight(900.0)), 0.8);

-                                ```
+                            ```

-                                27 lines remaining in ancestor node. Read the file to see all.
+                            27 lines remaining in ancestor node. Read the file to see all.

-                                ### mod test › L278-282
-                                ```
-                                    }
+                            ### mod test › L278-282
+                            ```
+                                }

-                                    #[test]
-                                    fn test_css_to_core_text_font_stretch() {
-                                        // Exact matches
-                                ```
-                            "},
+                                #[test]
+                                fn test_css_to_core_text_font_stretch() {
+                                    // Exact matches
+                            ```
+                        "},
                    )],
                ),
                message(
@@ -678,11 +645,11 @@ fn eval_from_pixels_constructor() {
            ],
            Some(input_file_content.into()),
            EvalAssertion::judge_diff(indoc! {"
-                        - The diff contains a new `from_pixels` constructor
-                        - The diff contains new tests for the `from_pixels` constructor
-                    "}),
-        ))
-    });
+                    - The diff contains a new `from_pixels` constructor
+                    - The diff contains new tests for the `from_pixels` constructor
+                "}),
+        ),
+    );
 }

 #[test]
@@ -700,9 +667,11 @@ fn eval_zode() {
    let input_file_path = "root/zode.py";
    let input_content = None;
    let edit_description = "Create the main Zode CLI script";
-
-    eval_utils::eval(50, 1., mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        50,
+        1.,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(User, [text(include_str!("evals/fixtures/zode/prompt.md"))]),
                message(
@@ -761,7 +730,7 @@ fn eval_zode() {
                    ],
                ),
            ],
-            input_content.clone(),
+            input_content,
            EvalAssertion::new(async move |sample, _, _cx| {
                let invalid_starts = [' ', '`', '\n'];
                let mut message = String::new();
@@ -786,8 +755,8 @@ fn eval_zode() {
                    })
                }
            }),
-        ))
-    });
+        ),
+    );
 }

 #[test]
@@ -805,17 +774,19 @@ fn eval_add_overwrite_test() {
    let input_file_path = "root/action_log.rs";
    let input_file_content = include_str!("evals/fixtures/add_overwrite_test/before.rs");
    let edit_description = "Add a new test for overwriting a file in action_log.rs";
-
-    eval_utils::eval(200, 0.5, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        200,
+        0.5, // TODO: make this eval better
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(
                    User,
                    [text(indoc! {"
-                            Introduce a new test in `action_log.rs` to test overwriting a file.
-                            That is, a file already exists, but we call `buffer_created` as if the file were new.
-                            Take inspiration from all the other tests in the file.
-                        "})],
+                        Introduce a new test in `action_log.rs` to test overwriting a file.
+                        That is, a file already exists, but we call `buffer_created` as if the file were new.
+                        Take inspiration from all the other tests in the file.
+                    "})],
                ),
                message(
                    Assistant,
@@ -835,81 +806,81 @@ fn eval_add_overwrite_test() {
                        "tool_1",
                        "read_file",
                        indoc! {"
-                                pub struct ActionLog [L13-20]
-                                 tracked_buffers [L15]
-                                 edited_since_project_diagnostics_check [L17]
-                                 project [L19]
-                                impl ActionLog [L22-498]
-                                 pub fn new [L24-30]
-                                 pub fn project [L32-34]
-                                 pub fn checked_project_diagnostics [L37-39]
-                                 pub fn has_edited_files_since_project_diagnostics_check [L42-44]
-                                 fn track_buffer_internal [L46-101]
-                                 fn handle_buffer_event [L103-116]
-                                 fn handle_buffer_edited [L118-123]
-                                 fn handle_buffer_file_changed [L125-158]
-                                 async fn maintain_diff [L160-264]
-                                 pub fn buffer_read [L267-269]
-                                 pub fn buffer_created [L272-276]
-                                 pub fn buffer_edited [L279-287]
-                                 pub fn will_delete_buffer [L289-304]
-                                 pub fn keep_edits_in_range [L306-364]
-                                 pub fn reject_edits_in_ranges [L366-459]
-                                 pub fn keep_all_edits [L461-473]
-                                 pub fn changed_buffers [L476-482]
-                                 pub fn stale_buffers [L485-497]
-                                fn apply_non_conflicting_edits [L500-561]
-                                fn diff_snapshots [L563-585]
-                                fn point_to_row_edit [L587-614]
-                                enum ChangeAuthor [L617-620]
-                                 User [L618]
-                                 Agent [L619]
-                                enum TrackedBufferStatus [L623-627]
-                                 Created [L624]
-                                 Modified [L625]
-                                 Deleted [L626]
-                                struct TrackedBuffer [L629-641]
-                                 buffer [L630]
-                                 base_text [L631]
-                                 unreviewed_changes [L632]
-                                 status [L633]
-                                 version [L634]
-                                 diff [L635]
-                                 snapshot [L636]
-                                 diff_update [L637]
-                                 _open_lsp_handle [L638]
-                                 _maintain_diff [L639]
-                                 _subscription [L640]
-                                impl TrackedBuffer [L643-657]
-                                 fn has_changes [L644-650]
-                                 fn schedule_diff_update [L652-656]
-                                pub struct ChangedBuffer [L659-661]
-                                 pub diff [L660]
-                                mod tests [L664-1574]
-                                 fn init_logger [L678-682]
-                                 fn init_test [L684-691]
-                                 async fn test_keep_edits [L694-769]
-                                 async fn test_deletions [L772-854]
-                                 async fn test_overlapping_user_edits [L857-951]
-                                 async fn test_creating_files [L954-1010]
-                                 async fn test_deleting_files [L1013-1120]
-                                 async fn test_reject_edits [L1123-1255]
-                                 async fn test_reject_multiple_edits [L1258-1331]
-                                 async fn test_reject_deleted_file [L1334-1388]
-                                 async fn test_reject_created_file [L1391-1443]
-                                 async fn test_random_diffs [L1446-1535]
-                                  fn quiesce [L1510-1534]
-                                 struct HunkStatus [L1538-1542]
-                                  range [L1539]
-                                  diff_status [L1540]
-                                  old_text [L1541]
-                                 fn unreviewed_hunks [L1544-1573]
+                            pub struct ActionLog [L13-20]
+                             tracked_buffers [L15]
+                             edited_since_project_diagnostics_check [L17]
+                             project [L19]
+                            impl ActionLog [L22-498]
+                             pub fn new [L24-30]
+                             pub fn project [L32-34]
+                             pub fn checked_project_diagnostics [L37-39]
+                             pub fn has_edited_files_since_project_diagnostics_check [L42-44]
+                             fn track_buffer_internal [L46-101]
+                             fn handle_buffer_event [L103-116]
+                             fn handle_buffer_edited [L118-123]
+                             fn handle_buffer_file_changed [L125-158]
+                             async fn maintain_diff [L160-264]
+                             pub fn buffer_read [L267-269]
+                             pub fn buffer_created [L272-276]
+                             pub fn buffer_edited [L279-287]
+                             pub fn will_delete_buffer [L289-304]
+                             pub fn keep_edits_in_range [L306-364]
+                             pub fn reject_edits_in_ranges [L366-459]
+                             pub fn keep_all_edits [L461-473]
+                             pub fn changed_buffers [L476-482]
+                             pub fn stale_buffers [L485-497]
+                            fn apply_non_conflicting_edits [L500-561]
+                            fn diff_snapshots [L563-585]
+                            fn point_to_row_edit [L587-614]
+                            enum ChangeAuthor [L617-620]
+                             User [L618]
+                             Agent [L619]
+                            enum TrackedBufferStatus [L623-627]
+                             Created [L624]
+                             Modified [L625]
+                             Deleted [L626]
+                            struct TrackedBuffer [L629-641]
+                             buffer [L630]
+                             base_text [L631]
+                             unreviewed_changes [L632]
+                             status [L633]
+                             version [L634]
+                             diff [L635]
+                             snapshot [L636]
+                             diff_update [L637]
+                             _open_lsp_handle [L638]
+                             _maintain_diff [L639]
+                             _subscription [L640]
+                            impl TrackedBuffer [L643-657]
+                             fn has_changes [L644-650]
+                             fn schedule_diff_update [L652-656]
+                            pub struct ChangedBuffer [L659-661]
+                             pub diff [L660]
+                            mod tests [L664-1574]
+                             fn init_logger [L678-682]
+                             fn init_test [L684-691]
+                             async fn test_keep_edits [L694-769]
+                             async fn test_deletions [L772-854]
+                             async fn test_overlapping_user_edits [L857-951]
+                             async fn test_creating_files [L954-1010]
+                             async fn test_deleting_files [L1013-1120]
+                             async fn test_reject_edits [L1123-1255]
+                             async fn test_reject_multiple_edits [L1258-1331]
+                             async fn test_reject_deleted_file [L1334-1388]
+                             async fn test_reject_created_file [L1391-1443]
+                             async fn test_random_diffs [L1446-1535]
+                              fn quiesce [L1510-1534]
+                             struct HunkStatus [L1538-1542]
+                              range [L1539]
+                              diff_status [L1540]
+                              old_text [L1541]
+                             fn unreviewed_hunks [L1544-1573]

-                                Showing symbols 1-69 (total symbols: 69)
+                            Showing symbols 1-69 (total symbols: 69)

-                                Using the line numbers in this outline, you can call this tool again while specifying
-                                the start_line and end_line fields to see the implementations of symbols in the outline.
-                            "},
+                            Using the line numbers in this outline, you can call this tool again while specifying
+                            the start_line and end_line fields to see the implementations of symbols in the outline.
+                        "},
                    )],
                ),
                message(
@@ -989,17 +960,17 @@ fn eval_add_overwrite_test() {
                    Assistant,
                    [
                        text(indoc! {"
-                                Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:
+                            Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:

-                                1. Create a file
-                                2. Open a buffer for it
-                                3. Track it in the action log
-                                4. Modify the buffer
-                                5. Call `buffer_created` again as if the file were new
-                                6. Check that the changes are properly tracked
+                            1. Create a file
+                            2. Open a buffer for it
+                            3. Track it in the action log
+                            4. Modify the buffer
+                            5. Call `buffer_created` again as if the file were new
+                            6. Check that the changes are properly tracked

-                                Let's write the test:
-                            "}),
+                            Let's write the test:
+                        "}),
                        tool_use(
                            "tool_5",
                            "edit_file",
@@ -1016,8 +987,8 @@ fn eval_add_overwrite_test() {
            EvalAssertion::judge_diff(
                "A new test for overwritten files was created, without changing any previous test",
            ),
-        ))
-    });
+        ),
+    );
 }

 #[test]
@@ -1042,18 +1013,20 @@ fn eval_create_empty_file() {

    let input_file_content = None;
    let expected_output_content = String::new();
-
-    eval_utils::eval(100, 0.99, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
+    eval(
+        100,
+        0.99,
+        0.05,
+        EvalInput::from_conversation(
            vec![
                message(User, [text("Create a second empty todo file ")]),
                message(
                    Assistant,
                    [
                        text(formatdoc! {"
-                            I'll help you create a second empty todo file.
-                            First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
-                            "}),
+                        I'll help you create a second empty todo file.
+                        First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
+                        "}),
                        tool_use(
                            "toolu_01GAF8TtsgpjKxCr8fgQLDgR",
                            "list_directory",
@@ -1075,8 +1048,8 @@ fn eval_create_empty_file() {
                    Assistant,
                    [
                        text(formatdoc! {"
-                            I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
-                        "}),
+                        I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
+                    "}),
                        tool_use(
                            "toolu_01Tb3iQ9griqSYMmVuykQPWU",
                            "edit_file",
@@ -1089,12 +1062,12 @@ fn eval_create_empty_file() {
                    ],
                ),
            ],
-            input_file_content.clone(),
+            input_file_content,
            // Bad behavior is to write something like
            // "I'll create an empty TODO3 file as requested."
-            EvalAssertion::assert_eq(expected_output_content.clone()),
-        ))
-    });
+            EvalAssertion::assert_eq(expected_output_content),
+        ),
+    );
 }

 fn message(
@@ -1336,45 +1309,55 @@ impl EvalAssertion {
    }
 }

-fn run_eval(eval: EvalInput) -> eval_utils::EvalOutput<EditEvalMetadata> {
+fn eval(
+    iterations: usize,
+    expected_pass_ratio: f32,
+    mismatched_tag_threshold: f32,
+    eval: EvalInput,
+) {
+    eval_utils::eval(
+        iterations,
+        expected_pass_ratio,
+        mismatched_tag_threshold,
+        Arc::new(move |tx| run_eval(eval.clone(), tx)),
+    );
+}
+
+fn run_eval(eval: EvalInput, tx: mpsc::Sender<eval_utils::EvalOutput>) {
    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
    let mut cx = TestAppContext::build(dispatcher, None);
    let result = cx.executor().block_test(async {
        let test = EditAgentTest::new(&mut cx).await;
        test.eval(eval, &mut cx).await
    });
-    cx.quit();
-    match result {
+    let output = match result {
        Ok(output) => eval_utils::EvalOutput {
            data: output.to_string(),
-            outcome: if output.assertion.score < 80 {
+            mismatched_tags: output.sample.edit_output.parser_metrics.mismatched_tags,
+            tags: output.sample.edit_output.parser_metrics.tags,
+            outcome_kind: if output.assertion.score < 80 {
                eval_utils::OutcomeKind::Failed
            } else {
                eval_utils::OutcomeKind::Passed
            },
-            metadata: EditEvalMetadata {
-                tags: output.sample.edit_output.parser_metrics.tags,
-                mismatched_tags: output.sample.edit_output.parser_metrics.mismatched_tags,
-            },
        },
        Err(e) => eval_utils::EvalOutput {
            data: format!("{e:?}"),
-            outcome: eval_utils::OutcomeKind::Error,
-            metadata: EditEvalMetadata {
-                tags: 0,
-                mismatched_tags: 0,
-            },
+            mismatched_tags: 0,
+            tags: 0,
+            outcome_kind: eval_utils::OutcomeKind::Error,
        },
-    }
+    };
+    tx.send(output).unwrap();
 }

 #[derive(Clone)]
-struct EditEvalOutput {
+struct EvalOutput {
    sample: EvalSample,
    assertion: EvalAssertionOutcome,
 }

-impl Display for EditEvalOutput {
+impl Display for EvalOutput {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        writeln!(f, "Score: {:?}", self.assertion.score)?;
        if let Some(message) = self.assertion.message.as_ref() {
@@ -1488,7 +1471,7 @@ impl EditAgentTest {
        })
    }

-    async fn eval(&self, mut eval: EvalInput, cx: &mut TestAppContext) -> Result<EditEvalOutput> {
+    async fn eval(&self, mut eval: EvalInput, cx: &mut TestAppContext) -> Result<EvalOutput> {
        // Make sure the last message in the conversation is cached.
        eval.conversation.last_mut().unwrap().cache = true;

@@ -1597,7 +1580,7 @@ impl EditAgentTest {
            .run(&sample, self.judge_model.clone(), cx)
            .await?;

-        Ok(EditEvalOutput { assertion, sample })
+        Ok(EvalOutput { assertion, sample })
    }
 }

--- a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
+++ b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
@@ -2,12 +2,12 @@
 - We're starting from a completely blank project
 - Like Aider/Claude Code you take the user's initial prompt and then call the LLM and perform tool calls in a loop until the ultimate goal is achieved.
 - Unlike Aider or Claude code, it's not intended to be interactive. Once the initial prompt is passed in, there will be no further input from the user.
- The system you will build must reach the stated goal just by performing tool calls and calling the LLM
+- The system you will build must reach the stated goal just by performing too calls and calling the LLM
 - I want you to build this in python. Use the anthropic python sdk and the model context protocol sdk. Use a virtual env and pip to install dependencies
 - Follow the anthropic guidance on tool calls: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/overview
 - Use this Anthropic model: `claude-3-7-sonnet-20250219`
 - Use this Anthropic API Key: `sk-ant-api03-qweeryiofdjsncmxquywefidopsugus`
- One of the most important pieces to this is having good tool calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
+- One of the most important pieces to this is having good too calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
 - The cli tool should be invocable via python zode.py file.md where file.md is any possible file that contains the users prompt. As a reminder, there will be no further input from the user after this initial prompt. Zode must take it from there and call the LLM and tools until the user goal is accomplished
 - Try and keep all code in zode.py and make heavy use of the asks I mentioned
 - Once you’ve implemented this, you must run python zode.py eval/instructions.md to see how well our new agent tool does!
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -354,9 +354,9 @@ impl HistoryStore {
                .into_iter()
                .take(MAX_RECENTLY_OPENED_ENTRIES)
                .flat_map(|entry| match entry {
-                    SerializedRecentOpen::AcpThread(id) => {
-                        Some(HistoryEntryId::AcpThread(acp::SessionId::new(id.as_str())))
-                    }
+                    SerializedRecentOpen::AcpThread(id) => Some(HistoryEntryId::AcpThread(
+                        acp::SessionId(id.as_str().into()),
+                    )),
                    SerializedRecentOpen::TextThread(file_name) => Some(
                        HistoryEntryId::TextThread(text_threads_dir().join(file_name).into()),
                    ),
--- a/crates/agent/src/native_agent_server.rs
+++ b/crates/agent/src/native_agent_server.rs
@@ -21,6 +21,10 @@ impl NativeAgentServer {
 }

 impl AgentServer for NativeAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
+    }
+
    fn name(&self) -> SharedString {
        "Zed Agent".into()
    }
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -16,7 +16,7 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 3. DO NOT use tools to access items that are already available in the context section.
 4. Use only the tools that are currently available.
 5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-6. When running commands that may run indefinitely or for a long time (such as build scripts, tests, servers, or file watchers), specify `timeout_ms` to bound runtime. If the command times out, the user can always ask you to run it again with a longer timeout or no timeout if they're willing to wait or cancel manually.
+6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.
 7. Avoid HTML entity escaping - use plain characters instead.

 ## Searching and Reading
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -9,16 +9,14 @@ use collections::IndexMap;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
 use futures::{
-    FutureExt as _, StreamExt,
+    StreamExt,
    channel::{
        mpsc::{self, UnboundedReceiver},
        oneshot,
    },
-    future::{Fuse, Shared},
 };
 use gpui::{
-    App, AppContext, AsyncApp, Entity, Task, TestAppContext, UpdateGlobal,
-    http_client::FakeHttpClient,
+    App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
 };
 use indoc::indoc;
 use language_model::{
@@ -37,109 +35,12 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use settings::{Settings, SettingsStore};
-use std::{
-    path::Path,
-    pin::Pin,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    },
-    time::Duration,
-};
+use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
 use util::path;

 mod test_tools;
 use test_tools::*;

-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-    });
-}
-
-struct FakeTerminalHandle {
-    killed: Arc<AtomicBool>,
-    wait_for_exit: Shared<Task<acp::TerminalExitStatus>>,
-    output: acp::TerminalOutputResponse,
-    id: acp::TerminalId,
-}
-
-impl FakeTerminalHandle {
-    fn new_never_exits(cx: &mut App) -> Self {
-        let killed = Arc::new(AtomicBool::new(false));
-
-        let killed_for_task = killed.clone();
-        let wait_for_exit = cx
-            .spawn(async move |cx| {
-                loop {
-                    if killed_for_task.load(Ordering::SeqCst) {
-                        return acp::TerminalExitStatus::new();
-                    }
-                    cx.background_executor()
-                        .timer(Duration::from_millis(1))
-                        .await;
-                }
-            })
-            .shared();
-
-        Self {
-            killed,
-            wait_for_exit,
-            output: acp::TerminalOutputResponse::new("partial output".to_string(), false),
-            id: acp::TerminalId::new("fake_terminal".to_string()),
-        }
-    }
-
-    fn was_killed(&self) -> bool {
-        self.killed.load(Ordering::SeqCst)
-    }
-}
-
-impl crate::TerminalHandle for FakeTerminalHandle {
-    fn id(&self, _cx: &AsyncApp) -> Result<acp::TerminalId> {
-        Ok(self.id.clone())
-    }
-
-    fn current_output(&self, _cx: &AsyncApp) -> Result<acp::TerminalOutputResponse> {
-        Ok(self.output.clone())
-    }
-
-    fn wait_for_exit(&self, _cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>> {
-        Ok(self.wait_for_exit.clone())
-    }
-
-    fn kill(&self, _cx: &AsyncApp) -> Result<()> {
-        self.killed.store(true, Ordering::SeqCst);
-        Ok(())
-    }
-}
-
-struct FakeThreadEnvironment {
-    handle: Rc<FakeTerminalHandle>,
-}
-
-impl crate::ThreadEnvironment for FakeThreadEnvironment {
-    fn create_terminal(
-        &self,
-        _command: String,
-        _cwd: Option<std::path::PathBuf>,
-        _output_byte_limit: Option<u64>,
-        _cx: &mut AsyncApp,
-    ) -> Task<Result<Rc<dyn crate::TerminalHandle>>> {
-        Task::ready(Ok(self.handle.clone() as Rc<dyn crate::TerminalHandle>))
-    }
-}
-
-fn always_allow_tools(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
-        settings.always_allow_tool_actions = true;
-        agent_settings::AgentSettings::override_global(settings, cx);
-    });
-}
-
 #[gpui::test]
 async fn test_echo(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -170,120 +71,6 @@ async fn test_echo(cx: &mut TestAppContext) {
    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
 }

-#[gpui::test]
-async fn test_terminal_tool_timeout_kills_handle(cx: &mut TestAppContext) {
-    init_test(cx);
-    always_allow_tools(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-
-    let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
-    let environment = Rc::new(FakeThreadEnvironment {
-        handle: handle.clone(),
-    });
-
-    #[allow(clippy::arc_with_non_send_sync)]
-    let tool = Arc::new(crate::TerminalTool::new(project, environment));
-    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
-
-    let task = cx.update(|cx| {
-        tool.run(
-            crate::TerminalToolInput {
-                command: "sleep 1000".to_string(),
-                cd: ".".to_string(),
-                timeout_ms: Some(5),
-            },
-            event_stream,
-            cx,
-        )
-    });
-
-    let update = rx.expect_update_fields().await;
-    assert!(
-        update.content.iter().any(|blocks| {
-            blocks
-                .iter()
-                .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
-        }),
-        "expected tool call update to include terminal content"
-    );
-
-    let mut task_future: Pin<Box<Fuse<Task<Result<String>>>>> = Box::pin(task.fuse());
-
-    let deadline = std::time::Instant::now() + Duration::from_millis(500);
-    loop {
-        if let Some(result) = task_future.as_mut().now_or_never() {
-            let result = result.expect("terminal tool task should complete");
-
-            assert!(
-                handle.was_killed(),
-                "expected terminal handle to be killed on timeout"
-            );
-            assert!(
-                result.contains("partial output"),
-                "expected result to include terminal output, got: {result}"
-            );
-            return;
-        }
-
-        if std::time::Instant::now() >= deadline {
-            panic!("timed out waiting for terminal tool task to complete");
-        }
-
-        cx.run_until_parked();
-        cx.background_executor.timer(Duration::from_millis(1)).await;
-    }
-}
-
-#[gpui::test]
-#[ignore]
-async fn test_terminal_tool_without_timeout_does_not_kill_handle(cx: &mut TestAppContext) {
-    init_test(cx);
-    always_allow_tools(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-
-    let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
-    let environment = Rc::new(FakeThreadEnvironment {
-        handle: handle.clone(),
-    });
-
-    #[allow(clippy::arc_with_non_send_sync)]
-    let tool = Arc::new(crate::TerminalTool::new(project, environment));
-    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
-
-    let _task = cx.update(|cx| {
-        tool.run(
-            crate::TerminalToolInput {
-                command: "sleep 1000".to_string(),
-                cd: ".".to_string(),
-                timeout_ms: None,
-            },
-            event_stream,
-            cx,
-        )
-    });
-
-    let update = rx.expect_update_fields().await;
-    assert!(
-        update.content.iter().any(|blocks| {
-            blocks
-                .iter()
-                .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
-        }),
-        "expected tool call update to include terminal content"
-    );
-
-    smol::Timer::after(Duration::from_millis(25)).await;
-
-    assert!(
-        !handle.was_killed(),
-        "did not expect terminal handle to be killed without a timeout"
-    );
-}
-
 #[gpui::test]
 async fn test_thinking(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -706,14 +493,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
    // Approve the first
    tool_call_auth_1
        .response
-        .send(tool_call_auth_1.options[1].option_id.clone())
+        .send(tool_call_auth_1.options[1].id.clone())
        .unwrap();
    cx.run_until_parked();

    // Reject the second
    tool_call_auth_2
        .response
-        .send(tool_call_auth_1.options[2].option_id.clone())
+        .send(tool_call_auth_1.options[2].id.clone())
        .unwrap();
    cx.run_until_parked();

@@ -723,14 +510,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
        message.content,
        vec![
            language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_1.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_1.tool_call.id.0.to_string().into(),
                tool_name: ToolRequiringPermission::name().into(),
                is_error: false,
                content: "Allowed".into(),
                output: Some("Allowed".into())
            }),
            language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_2.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_2.tool_call.id.0.to_string().into(),
                tool_name: ToolRequiringPermission::name().into(),
                is_error: true,
                content: "Permission to run tool denied by user".into(),
@@ -756,7 +543,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
    let tool_call_auth_3 = next_tool_call_authorization(&mut events).await;
    tool_call_auth_3
        .response
-        .send(tool_call_auth_3.options[0].option_id.clone())
+        .send(tool_call_auth_3.options[0].id.clone())
        .unwrap();
    cx.run_until_parked();
    let completion = fake_model.pending_completions().pop().unwrap();
@@ -765,7 +552,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
        message.content,
        vec![language_model::MessageContent::ToolResult(
            LanguageModelToolResult {
-                tool_use_id: tool_call_auth_3.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_3.tool_call.id.0.to_string().into(),
                tool_name: ToolRequiringPermission::name().into(),
                is_error: false,
                content: "Allowed".into(),
@@ -1566,20 +1353,20 @@ async fn test_cancellation(cx: &mut TestAppContext) {
            ThreadEvent::ToolCall(tool_call) => {
                assert_eq!(tool_call.title, expected_tools.remove(0));
                if tool_call.title == "Echo" {
-                    echo_id = Some(tool_call.tool_call_id);
+                    echo_id = Some(tool_call.id);
                }
            }
            ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
                acp::ToolCallUpdate {
-                    tool_call_id,
+                    id,
                    fields:
                        acp::ToolCallUpdateFields {
                            status: Some(acp::ToolCallStatus::Completed),
                            ..
                        },
-                    ..
+                    meta: None,
                },
-            )) if Some(&tool_call_id) == echo_id.as_ref() => {
+            )) if Some(&id) == echo_id.as_ref() => {
                echo_completed = true;
            }
            _ => {}
@@ -2208,7 +1995,11 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
        .update(|cx| {
            connection.prompt(
                Some(acp_thread::UserMessageId::new()),
-                acp::PromptRequest::new(session_id.clone(), vec!["ghi".into()]),
+                acp::PromptRequest {
+                    session_id: session_id.clone(),
+                    prompt: vec!["ghi".into()],
+                    meta: None,
+                },
                cx,
            )
        })
@@ -2265,50 +2056,68 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
    let tool_call = expect_tool_call(&mut events).await;
    assert_eq!(
        tool_call,
-        acp::ToolCall::new("1", "Thinking")
-            .kind(acp::ToolKind::Think)
-            .raw_input(json!({}))
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                "thinking".into()
-            )]))
+        acp::ToolCall {
+            id: acp::ToolCallId("1".into()),
+            title: "Thinking".into(),
+            kind: acp::ToolKind::Think,
+            status: acp::ToolCallStatus::Pending,
+            content: vec![],
+            locations: vec![],
+            raw_input: Some(json!({})),
+            raw_output: None,
+            meta: Some(json!({ "tool_name": "thinking" })),
+        }
    );
    let update = expect_tool_call_update_fields(&mut events).await;
    assert_eq!(
        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .title("Thinking")
-                .kind(acp::ToolKind::Think)
-                .raw_input(json!({ "content": "Thinking hard!"}))
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                title: Some("Thinking".into()),
+                kind: Some(acp::ToolKind::Think),
+                raw_input: Some(json!({ "content": "Thinking hard!" })),
+                ..Default::default()
+            },
+            meta: None,
+        }
    );
    let update = expect_tool_call_update_fields(&mut events).await;
    assert_eq!(
        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress)
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                status: Some(acp::ToolCallStatus::InProgress),
+                ..Default::default()
+            },
+            meta: None,
+        }
    );
    let update = expect_tool_call_update_fields(&mut events).await;
    assert_eq!(
        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().content(vec!["Thinking hard!".into()])
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                content: Some(vec!["Thinking hard!".into()]),
+                ..Default::default()
+            },
+            meta: None,
+        }
    );
    let update = expect_tool_call_update_fields(&mut events).await;
    assert_eq!(
        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .status(acp::ToolCallStatus::Completed)
-                .raw_output("Finished thinking.")
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                status: Some(acp::ToolCallStatus::Completed),
+                raw_output: Some("Finished thinking.".into()),
+                ..Default::default()
+            },
+            meta: None,
+        }
    );
 }

--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -530,7 +530,6 @@ pub trait TerminalHandle {
    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId>;
    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse>;
    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>>;
-    fn kill(&self, cx: &AsyncApp) -> Result<()>;
 }

 pub trait ThreadEnvironment {
@@ -620,9 +619,12 @@ pub struct Thread {
 impl Thread {
    fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
        let image = model.map_or(true, |model| model.supports_images());
-        acp::PromptCapabilities::new()
-            .image(image)
-            .embedded_context(true)
+        acp::PromptCapabilities {
+            meta: None,
+            image,
+            audio: false,
+            embedded_context: true,
+        }
    }

    pub fn new(
@@ -638,7 +640,7 @@ impl Thread {
        let (prompt_capabilities_tx, prompt_capabilities_rx) =
            watch::channel(Self::prompt_capabilities(model.as_deref()));
        Self {
-            id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
+            id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
            prompt_id: PromptId::new(),
            updated_at: Utc::now(),
            title: None,
@@ -735,11 +737,17 @@ impl Thread {
        let Some(tool) = tool else {
            stream
                .0
-                .unbounded_send(Ok(ThreadEvent::ToolCall(
-                    acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
-                        .status(acp::ToolCallStatus::Failed)
-                        .raw_input(tool_use.input.clone()),
-                )))
+                .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
+                    meta: None,
+                    id: acp::ToolCallId(tool_use.id.to_string().into()),
+                    title: tool_use.name.to_string(),
+                    kind: acp::ToolKind::Other,
+                    status: acp::ToolCallStatus::Failed,
+                    content: Vec::new(),
+                    locations: Vec::new(),
+                    raw_input: Some(tool_use.input.clone()),
+                    raw_output: None,
+                })))
                .ok();
            return;
        };
@@ -769,8 +777,8 @@ impl Thread {

        stream.update_tool_call_fields(
            &tool_use.id,
-            acp::ToolCallUpdateFields::new()
-                .status(
+            acp::ToolCallUpdateFields {
+                status: Some(
                    tool_result
                        .as_ref()
                        .map_or(acp::ToolCallStatus::Failed, |result| {
@@ -780,8 +788,10 @@ impl Thread {
                                acp::ToolCallStatus::Completed
                            }
                        }),
-                )
-                .raw_output(output),
+                ),
+                raw_output: output,
+                ..Default::default()
+            },
        );
    }

@@ -1264,13 +1274,15 @@ impl Thread {

                event_stream.update_tool_call_fields(
                    &tool_result.tool_use_id,
-                    acp::ToolCallUpdateFields::new()
-                        .status(if tool_result.is_error {
+                    acp::ToolCallUpdateFields {
+                        status: Some(if tool_result.is_error {
                            acp::ToolCallStatus::Failed
                        } else {
                            acp::ToolCallStatus::Completed
-                        })
-                        .raw_output(tool_result.output.clone()),
+                        }),
+                        raw_output: tool_result.output.clone(),
+                        ..Default::default()
+                    },
                );
                this.update(cx, |this, _cx| {
                    this.pending_message()
@@ -1548,10 +1560,12 @@ impl Thread {
        } else {
            event_stream.update_tool_call_fields(
                &tool_use.id,
-                acp::ToolCallUpdateFields::new()
-                    .title(title.as_str())
-                    .kind(kind)
-                    .raw_input(tool_use.input.clone()),
+                acp::ToolCallUpdateFields {
+                    title: Some(title.into()),
+                    kind: Some(kind),
+                    raw_input: Some(tool_use.input.clone()),
+                    ..Default::default()
+                },
            );
        }

@@ -1573,9 +1587,10 @@ impl Thread {
        let fs = self.project.read(cx).fs().clone();
        let tool_event_stream =
            ToolCallEventStream::new(tool_use.id.clone(), event_stream.clone(), Some(fs));
-        tool_event_stream.update_fields(
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress),
-        );
+        tool_event_stream.update_fields(acp::ToolCallUpdateFields {
+            status: Some(acp::ToolCallStatus::InProgress),
+            ..Default::default()
+        });
        let supports_images = self.model().is_some_and(|model| model.supports_images());
        let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
        log::debug!("Running tool {}", tool_use.name);
@@ -2366,13 +2381,19 @@ impl ThreadEventStream {
        kind: acp::ToolKind,
        input: serde_json::Value,
    ) -> acp::ToolCall {
-        acp::ToolCall::new(id.to_string(), title)
-            .kind(kind)
-            .raw_input(input)
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                tool_name.into(),
-            )]))
+        acp::ToolCall {
+            meta: Some(serde_json::json!({
+                "tool_name": tool_name
+            })),
+            id: acp::ToolCallId(id.to_string().into()),
+            title,
+            kind,
+            status: acp::ToolCallStatus::Pending,
+            content: vec![],
+            locations: vec![],
+            raw_input: Some(input),
+            raw_output: None,
+        }
    }

    fn update_tool_call_fields(
@@ -2382,7 +2403,12 @@ impl ThreadEventStream {
    ) {
        self.0
            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp::ToolCallUpdate::new(tool_use_id.to_string(), fields).into(),
+                acp::ToolCallUpdate {
+                    meta: None,
+                    id: acp::ToolCallId(tool_use_id.to_string().into()),
+                    fields,
+                }
+                .into(),
            )))
            .ok();
    }
@@ -2445,7 +2471,7 @@ impl ToolCallEventStream {
            .0
            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                acp_thread::ToolCallUpdateDiff {
-                    id: acp::ToolCallId::new(self.tool_use_id.to_string()),
+                    id: acp::ToolCallId(self.tool_use_id.to_string().into()),
                    diff,
                }
                .into(),
@@ -2463,26 +2489,33 @@ impl ToolCallEventStream {
            .0
            .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                ToolCallAuthorization {
-                    tool_call: acp::ToolCallUpdate::new(
-                        self.tool_use_id.to_string(),
-                        acp::ToolCallUpdateFields::new().title(title.into()),
-                    ),
+                    tool_call: acp::ToolCallUpdate {
+                        meta: None,
+                        id: acp::ToolCallId(self.tool_use_id.to_string().into()),
+                        fields: acp::ToolCallUpdateFields {
+                            title: Some(title.into()),
+                            ..Default::default()
+                        },
+                    },
                    options: vec![
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("always_allow"),
-                            "Always Allow",
-                            acp::PermissionOptionKind::AllowAlways,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("allow"),
-                            "Allow",
-                            acp::PermissionOptionKind::AllowOnce,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("deny"),
-                            "Deny",
-                            acp::PermissionOptionKind::RejectOnce,
-                        ),
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("always_allow".into()),
+                            name: "Always Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowAlways,
+                            meta: None,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("allow".into()),
+                            name: "Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowOnce,
+                            meta: None,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("deny".into()),
+                            name: "Deny".into(),
+                            kind: acp::PermissionOptionKind::RejectOnce,
+                            meta: None,
+                        },
                    ],
                    response: response_tx,
                },
@@ -2627,15 +2660,7 @@ impl UserMessageContent {
                    // TODO
                    Self::Text("[blob]".to_string())
                }
-                other => {
-                    log::warn!("Unexpected content type: {:?}", other);
-                    Self::Text("[unknown]".to_string())
-                }
            },
-            other => {
-                log::warn!("Unexpected content type: {:?}", other);
-                Self::Text("[unknown]".to_string())
-            }
        }
    }
 }
@@ -2643,15 +2668,32 @@ impl UserMessageContent {
 impl From<UserMessageContent> for acp::ContentBlock {
    fn from(content: UserMessageContent) -> Self {
        match content {
-            UserMessageContent::Text(text) => text.into(),
-            UserMessageContent::Image(image) => {
-                acp::ContentBlock::Image(acp::ImageContent::new(image.source, "image/png"))
+            UserMessageContent::Text(text) => acp::ContentBlock::Text(acp::TextContent {
+                text,
+                annotations: None,
+                meta: None,
+            }),
+            UserMessageContent::Image(image) => acp::ContentBlock::Image(acp::ImageContent {
+                data: image.source.to_string(),
+                mime_type: "image/png".to_string(),
+                meta: None,
+                annotations: None,
+                uri: None,
+            }),
+            UserMessageContent::Mention { uri, content } => {
+                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    meta: None,
+                    resource: acp::EmbeddedResourceResource::TextResourceContents(
+                        acp::TextResourceContents {
+                            meta: None,
+                            mime_type: None,
+                            text: content,
+                            uri: uri.to_uri().to_string(),
+                        },
+                    ),
+                    annotations: None,
+                })
            }
-            UserMessageContent::Mention { uri, content } => acp::ContentBlock::Resource(
-                acp::EmbeddedResource::new(acp::EmbeddedResourceResource::TextResourceContents(
-                    acp::TextResourceContents::new(content, uri.to_uri().to_string()),
-                )),
-            ),
        }
    }
 }
@@ -2659,6 +2701,7 @@ impl From<UserMessageContent> for acp::ContentBlock {
 fn convert_image(image_content: acp::ImageContent) -> LanguageModelImage {
    LanguageModelImage {
        source: image_content.data.into(),
-        size: None,
+        // TODO: make this optional?
+        size: gpui::Size::new(0.into(), 0.into()),
    }
 }
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -4,7 +4,7 @@ mod create_directory_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_file_tool;
-
+mod failure_message_tool;
 mod fetch_tool;
 mod find_path_tool;
 mod grep_tool;
@@ -13,7 +13,7 @@ mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod read_file_tool;
-
+mod rewrite_section_tool;
 mod terminal_tool;
 mod thinking_tool;
 mod web_search_tool;
@@ -27,7 +27,7 @@ pub use create_directory_tool::*;
 pub use delete_path_tool::*;
 pub use diagnostics_tool::*;
 pub use edit_file_tool::*;
-
+pub use failure_message_tool::*;
 pub use fetch_tool::*;
 pub use find_path_tool::*;
 pub use grep_tool::*;
@@ -36,7 +36,7 @@ pub use move_path_tool::*;
 pub use now_tool::*;
 pub use open_tool::*;
 pub use read_file_tool::*;
-
+pub use rewrite_section_tool::*;
 pub use terminal_tool::*;
 pub use thinking_tool::*;
 pub use web_search_tool::*;
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -273,9 +273,14 @@ impl AgentTool for EditFileTool {
        };
        let abs_path = project.read(cx).absolute_path(&project_path, cx);
        if let Some(abs_path) = abs_path.clone() {
-            event_stream.update_fields(
-                ToolCallUpdateFields::new().locations(vec![acp::ToolCallLocation::new(abs_path)]),
-            );
+            event_stream.update_fields(ToolCallUpdateFields {
+                locations: Some(vec![acp::ToolCallLocation {
+                    path: abs_path,
+                    line: None,
+                    meta: None,
+                }]),
+                ..Default::default()
+            });
        }

        let authorize = self.authorize(&input, &event_stream, cx);
@@ -384,7 +389,10 @@ impl AgentTool for EditFileTool {
                                range.start.to_point(&buffer.snapshot()).row
                            }).ok();
                            if let Some(abs_path) = abs_path.clone() {
-                                event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
+                                event_stream.update_fields(ToolCallUpdateFields {
+                                    locations: Some(vec![ToolCallLocation { path: abs_path, line, meta: None }]),
+                                    ..Default::default()
+                                });
                            }
                            emitted_location = true;
                        }
--- a/crates/agent/src/tools/failure_message_tool.rs
+++ b/crates/agent/src/tools/failure_message_tool.rs
@@ -0,0 +1,50 @@
+//! This tool is intended for use with the inline assistant, not the agent panel.
+
+use std::sync::Arc;
+
+use agent_client_protocol as acp;
+use anyhow::Result;
+use gpui::{App, SharedString, Task};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::{AgentTool, ToolCallEventStream};
+
+/// Use this tool to provide a message to the user when you're unable to complete a task.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct FailureMessageInput {
+    /// A brief message to the user explaining why you're unable to fulfill the request.
+    pub message: String,
+}
+
+pub struct FailureMessageTool;
+
+impl AgentTool for FailureMessageTool {
+    type Input = FailureMessageInput;
+    type Output = String;
+
+    fn name() -> &'static str {
+        "failure_message"
+    }
+
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Think
+    }
+
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
+        "".into()
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _input: Self::Input,
+        _event_stream: ToolCallEventStream,
+        _cx: &mut App,
+    ) -> Task<Result<String>> {
+        unimplemented!()
+    }
+}
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -118,29 +118,33 @@ impl AgentTool for FindPathTool {
            let paginated_matches: &[PathBuf] = &matches[cmp::min(input.offset, matches.len())
                ..cmp::min(input.offset + RESULTS_PER_PAGE, matches.len())];

-            event_stream.update_fields(
-                acp::ToolCallUpdateFields::new()
-                    .title(if paginated_matches.is_empty() {
-                        "No matches".into()
-                    } else if paginated_matches.len() == 1 {
-                        "1 match".into()
-                    } else {
-                        format!("{} matches", paginated_matches.len())
-                    })
-                    .content(
-                        paginated_matches
-                            .iter()
-                            .map(|path| {
-                                acp::ToolCallContent::Content(acp::Content::new(
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        path.to_string_lossy(),
-                                        format!("file://{}", path.display()),
-                                    )),
-                                ))
-                            })
-                            .collect::<Vec<_>>(),
-                    ),
-            );
+            event_stream.update_fields(acp::ToolCallUpdateFields {
+                title: Some(if paginated_matches.is_empty() {
+                    "No matches".into()
+                } else if paginated_matches.len() == 1 {
+                    "1 match".into()
+                } else {
+                    format!("{} matches", paginated_matches.len())
+                }),
+                content: Some(
+                    paginated_matches
+                        .iter()
+                        .map(|path| acp::ToolCallContent::Content {
+                            content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                                uri: format!("file://{}", path.display()),
+                                name: path.to_string_lossy().into(),
+                                annotations: None,
+                                description: None,
+                                mime_type: None,
+                                size: None,
+                                title: None,
+                                meta: None,
+                            }),
+                        })
+                        .collect(),
+                ),
+                ..Default::default()
+            });

            Ok(FindPathToolOutput {
                offset: input.offset,
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -322,6 +322,7 @@ mod tests {

    use super::*;
    use gpui::{TestAppContext, UpdateGlobal};
+    use language::{Language, LanguageConfig, LanguageMatcher};
    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
@@ -563,7 +564,7 @@ mod tests {
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;

        project.update(cx, |project, _cx| {
-            project.languages().add(language::rust_lang())
+            project.languages().add(rust_lang().into())
        });

        project
@@ -792,6 +793,22 @@ mod tests {
        });
    }

+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(include_str!("../../../languages/src/rust/outline.scm"))
+        .unwrap()
+    }
+
    #[gpui::test]
    async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
        init_test(cx);
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -153,10 +153,14 @@ impl AgentTool for ReadFileTool {

        let file_path = input.path.clone();

-        event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
-                acp::ToolCallLocation::new(&abs_path)
-                    .line(input.start_line.map(|line| line.saturating_sub(1))),
-            ]));
+        event_stream.update_fields(ToolCallUpdateFields {
+            locations: Some(vec![acp::ToolCallLocation {
+                path: abs_path.clone(),
+                line: input.start_line.map(|line| line.saturating_sub(1)),
+                meta: None,
+            }]),
+            ..Default::default()
+        });

        if image_store::is_image_file(&self.project, &project_path, cx) {
            return cx.spawn(async move |cx| {
@@ -285,9 +289,12 @@ impl AgentTool for ReadFileTool {
                        text,
                    }
                    .to_string();
-                    event_stream.update_fields(ToolCallUpdateFields::new().content(vec![
-                        acp::ToolCallContent::Content(acp::Content::new(markdown)),
-                    ]));
+                    event_stream.update_fields(ToolCallUpdateFields {
+                        content: Some(vec![acp::ToolCallContent::Content {
+                            content: markdown.into(),
+                        }]),
+                        ..Default::default()
+                    })
                }
            })?;

@@ -301,6 +308,7 @@ mod test {
    use super::*;
    use crate::{ContextServerRegistry, Templates, Thread};
    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
+    use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
    use language_model::fake_provider::FakeLanguageModel;
    use project::{FakeFs, Project};
    use prompt_store::ProjectContext;
@@ -404,7 +412,7 @@ mod test {
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(language::rust_lang());
+        language_registry.add(Arc::new(rust_lang()));
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -594,6 +602,49 @@ mod test {
        });
    }

+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(
+            r#"
+            (line_comment) @annotation
+
+            (struct_item
+                "struct" @context
+                name: (_) @name) @item
+            (enum_item
+                "enum" @context
+                name: (_) @name) @item
+            (enum_variant
+                name: (_) @name) @item
+            (field_declaration
+                name: (_) @name) @item
+            (impl_item
+                "impl" @context
+                trait: (_)? @name
+                "for"? @context
+                type: (_) @name
+                body: (_ "{" (_)* "}")) @item
+            (function_item
+                "fn" @context
+                name: (_) @name) @item
+            (mod_item
+                "mod" @context
+                name: (_) @name) @item
+            "#,
+        )
+        .unwrap()
+    }
+
    #[gpui::test]
    async fn test_read_file_security(cx: &mut TestAppContext) {
        init_test(cx);
--- a/crates/agent/src/tools/rewrite_section_tool.rs
+++ b/crates/agent/src/tools/rewrite_section_tool.rs
@@ -0,0 +1,55 @@
+//! This tool is intended for use with the inline assistant, not the agent panel.
+
+use std::sync::Arc;
+
+use agent_client_protocol as acp;
+use anyhow::Result;
+use gpui::{App, SharedString, Task};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::{AgentTool, ToolCallEventStream};
+
+/// Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct RewriteSectionInput {
+    /// A brief description of the edit you have made.
+    ///
+    /// This is optional - if the edit is simple or obvious, you should leave it empty.
+    pub description: String,
+
+    /// The text to replace the section with.
+    pub replacement_text: String,
+}
+
+pub struct RewriteSectionTool;
+
+impl AgentTool for RewriteSectionTool {
+    type Input = RewriteSectionInput;
+    type Output = String;
+
+    fn name() -> &'static str {
+        "rewrite_section"
+    }
+
+    fn kind() -> acp::ToolKind {
+        acp::ToolKind::Edit
+    }
+
+    fn initial_title(
+        &self,
+        _input: Result<Self::Input, serde_json::Value>,
+        _cx: &mut App,
+    ) -> SharedString {
+        "".into()
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _input: Self::Input,
+        _event_stream: ToolCallEventStream,
+        _cx: &mut App,
+    ) -> Task<Result<String>> {
+        unimplemented!()
+    }
+}
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -1,7 +1,6 @@
 use agent_client_protocol as acp;
 use anyhow::Result;
-use futures::FutureExt as _;
-use gpui::{App, AppContext, Entity, SharedString, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -9,7 +8,6 @@ use std::{
    path::{Path, PathBuf},
    rc::Rc,
    sync::Arc,
-    time::Duration,
 };
 use util::markdown::MarkdownInlineCode;

@@ -27,17 +25,13 @@ const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 ///
 /// Do not use this tool for commands that run indefinitely, such as servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers that don't terminate on their own.
 ///
-/// For potentially long-running commands, prefer specifying `timeout_ms` to bound runtime and prevent indefinite hangs.
-///
 /// Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct TerminalToolInput {
    /// The one-liner command to execute.
-    pub command: String,
+    command: String,
    /// Working directory for the command. This must be one of the root directories of the project.
-    pub cd: String,
-    /// Optional maximum runtime (in milliseconds). If exceeded, the running terminal task is killed.
-    pub timeout_ms: Option<u64>,
+    cd: String,
 }

 pub struct TerminalTool {
@@ -118,30 +112,12 @@ impl AgentTool for TerminalTool {
                .await?;

            let terminal_id = terminal.id(cx)?;
-            event_stream.update_fields(acp::ToolCallUpdateFields::new().content(vec![
-                acp::ToolCallContent::Terminal(acp::Terminal::new(terminal_id)),
-            ]));
-
-            let timeout = input.timeout_ms.map(Duration::from_millis);
-
-            let exit_status = match timeout {
-                Some(timeout) => {
-                    let wait_for_exit = terminal.wait_for_exit(cx)?;
-                    let timeout_task = cx.background_spawn(async move {
-                        smol::Timer::after(timeout).await;
-                    });
-
-                    futures::select! {
-                        status = wait_for_exit.clone().fuse() => status,
-                        _ = timeout_task.fuse() => {
-                            terminal.kill(cx)?;
-                            wait_for_exit.await
-                        }
-                    }
-                }
-                None => terminal.wait_for_exit(cx)?.await,
-            };
+            event_stream.update_fields(acp::ToolCallUpdateFields {
+                content: Some(vec![acp::ToolCallContent::Terminal { terminal_id }]),
+                ..Default::default()
+            });

+            let exit_status = terminal.wait_for_exit(cx)?.await;
            let output = terminal.current_output(cx)?;

            Ok(process_content(output, &input.command, exit_status))
--- a/crates/agent/src/tools/thinking_tool.rs
+++ b/crates/agent/src/tools/thinking_tool.rs
@@ -43,8 +43,10 @@ impl AgentTool for ThinkingTool {
        event_stream: ToolCallEventStream,
        _cx: &mut App,
    ) -> Task<Result<String>> {
-        event_stream
-            .update_fields(acp::ToolCallUpdateFields::new().content(vec![input.content.into()]));
+        event_stream.update_fields(acp::ToolCallUpdateFields {
+            content: Some(vec![input.content.into()]),
+            ..Default::default()
+        });
        Task::ready(Ok("Finished thinking.".to_string()))
    }
 }
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -76,8 +76,10 @@ impl AgentTool for WebSearchTool {
            let response = match search_task.await {
                Ok(response) => response,
                Err(err) => {
-                    event_stream
-                        .update_fields(acp::ToolCallUpdateFields::new().title("Web Search Failed"));
+                    event_stream.update_fields(acp::ToolCallUpdateFields {
+                        title: Some("Web Search Failed".to_string()),
+                        ..Default::default()
+                    });
                    return Err(err);
                }
            };
@@ -105,23 +107,26 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
    } else {
        format!("{} results", response.results.len())
    };
-    event_stream.update_fields(
-        acp::ToolCallUpdateFields::new()
-            .title(format!("Searched the web: {result_text}"))
-            .content(
-                response
-                    .results
-                    .iter()
-                    .map(|result| {
-                        acp::ToolCallContent::Content(acp::Content::new(
-                            acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(result.title.clone(), result.url.clone())
-                                    .title(result.title.clone())
-                                    .description(result.text.clone()),
-                            ),
-                        ))
-                    })
-                    .collect::<Vec<_>>(),
-            ),
-    );
+    event_stream.update_fields(acp::ToolCallUpdateFields {
+        title: Some(format!("Searched the web: {result_text}")),
+        content: Some(
+            response
+                .results
+                .iter()
+                .map(|result| acp::ToolCallContent::Content {
+                    content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: result.title.clone(),
+                        uri: result.url.clone(),
+                        title: Some(result.title.clone()),
+                        description: Some(result.text.clone()),
+                        mime_type: None,
+                        annotations: None,
+                        size: None,
+                        meta: None,
+                    }),
+                })
+                .collect(),
+        ),
+        ..Default::default()
+    });
 }
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -9,8 +9,6 @@ use futures::io::BufReader;
 use project::Project;
 use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
-use settings::Settings as _;
-use task::ShellBuilder;
 use util::ResultExt as _;

 use std::path::PathBuf;
@@ -23,7 +21,7 @@ use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntit

 use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
 use terminal::TerminalBuilder;
-use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
+use terminal::terminal_settings::{AlternateScroll, CursorShape};

 #[derive(Debug, Error)]
 #[error("Unsupported version")]
@@ -31,7 +29,7 @@ pub struct UnsupportedVersion;

 pub struct AcpConnection {
    server_name: SharedString,
-    telemetry_id: SharedString,
+    telemetry_id: &'static str,
    connection: Rc<acp::ClientSideConnection>,
    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
    auth_methods: Vec<acp::AuthMethod>,
@@ -56,6 +54,7 @@ pub struct AcpSession {

 pub async fn connect(
    server_name: SharedString,
+    telemetry_id: &'static str,
    command: AgentServerCommand,
    root_dir: &Path,
    default_mode: Option<acp::SessionModeId>,
@@ -65,6 +64,7 @@ pub async fn connect(
 ) -> Result<Rc<dyn AgentConnection>> {
    let conn = AcpConnection::stdio(
        server_name,
+        telemetry_id,
        command.clone(),
        root_dir,
        default_mode,
@@ -76,11 +76,12 @@ pub async fn connect(
    Ok(Rc::new(conn) as _)
 }

-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
+const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;

 impl AcpConnection {
    pub async fn stdio(
        server_name: SharedString,
+        telemetry_id: &'static str,
        command: AgentServerCommand,
        root_dir: &Path,
        default_mode: Option<acp::SessionModeId>,
@@ -88,11 +89,9 @@ impl AcpConnection {
        is_remote: bool,
        cx: &mut AsyncApp,
    ) -> Result<Self> {
-        let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone())?;
-        let builder = ShellBuilder::new(&shell, cfg!(windows)).non_interactive();
-        let mut child =
-            builder.build_command(Some(command.path.display().to_string()), &command.args);
+        let mut child = util::command::new_smol_command(&command.path);
        child
+            .args(command.args.iter().map(|arg| arg.as_str()))
            .envs(command.env.iter().flatten())
            .stdin(std::process::Stdio::piped())
            .stdout(std::process::Stdio::piped())
@@ -175,38 +174,34 @@ impl AcpConnection {
        })?;

        let response = connection
-            .initialize(
-                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
-                    .client_capabilities(
-                        acp::ClientCapabilities::new()
-                            .fs(acp::FileSystemCapability::new()
-                                .read_text_file(true)
-                                .write_text_file(true))
-                            .terminal(true)
-                            // Experimental: Allow for rendering terminal output from the agents
-                            .meta(acp::Meta::from_iter([
-                                ("terminal_output".into(), true.into()),
-                                ("terminal-auth".into(), true.into()),
-                            ])),
-                    )
-                    .client_info(
-                        acp::Implementation::new("zed", version)
-                            .title(release_channel.map(ToOwned::to_owned)),
-                    ),
-            )
+            .initialize(acp::InitializeRequest {
+                protocol_version: acp::VERSION,
+                client_capabilities: acp::ClientCapabilities {
+                    fs: acp::FileSystemCapability {
+                        read_text_file: true,
+                        write_text_file: true,
+                        meta: None,
+                    },
+                    terminal: true,
+                    meta: Some(serde_json::json!({
+                        // Experimental: Allow for rendering terminal output from the agents
+                        "terminal_output": true,
+                        "terminal-auth": true,
+                    })),
+                },
+                client_info: Some(acp::Implementation {
+                    name: "zed".to_owned(),
+                    title: release_channel.map(|c| c.to_owned()),
+                    version,
+                }),
+                meta: None,
+            })
            .await?;

        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
            return Err(UnsupportedVersion.into());
        }

-        let telemetry_id = response
-            .agent_info
-            // Use the one the agent provides if we have one
-            .map(|info| info.name.into())
-            // Otherwise, just use the name
-            .unwrap_or_else(|| server_name.clone());
-
        Ok(Self {
            auth_methods: response.auth_methods,
            root_dir: root_dir.to_owned(),
@@ -241,8 +236,8 @@ impl Drop for AcpConnection {
 }

 impl AgentConnection for AcpConnection {
-    fn telemetry_id(&self) -> SharedString {
-        self.telemetry_id.clone()
+    fn telemetry_id(&self) -> &'static str {
+        self.telemetry_id
    }

    fn new_thread(
@@ -258,13 +253,14 @@ impl AgentConnection for AcpConnection {
        let default_model = self.default_model.clone();
        let cwd = cwd.to_path_buf();
        let context_server_store = project.read(cx).context_server_store().read(cx);
-        let mcp_servers = if project.read(cx).is_local() {
-            context_server_store
-                .configured_server_ids()
-                .iter()
-                .filter_map(|id| {
-                    let configuration = context_server_store.configuration_for_server(id)?;
-                    match &*configuration {
+        let mcp_servers =
+            if project.read(cx).is_local() {
+                context_server_store
+                    .configured_server_ids()
+                    .iter()
+                    .filter_map(|id| {
+                        let configuration = context_server_store.configuration_for_server(id)?;
+                        match &*configuration {
                        project::context_server_store::ContextServerConfiguration::Custom {
                            command,
                            ..
@@ -272,47 +268,53 @@ impl AgentConnection for AcpConnection {
                        | project::context_server_store::ContextServerConfiguration::Extension {
                            command,
                            ..
-                        } => Some(acp::McpServer::Stdio(
-                            acp::McpServerStdio::new(id.0.to_string(), &command.path)
-                                .args(command.args.clone())
-                                .env(if let Some(env) = command.env.as_ref() {
-                                    env.iter()
-                                        .map(|(name, value)| acp::EnvVariable::new(name, value))
-                                        .collect()
-                                } else {
-                                    vec![]
-                                }),
-                        )),
+                        } => Some(acp::McpServer::Stdio {
+                            name: id.0.to_string(),
+                            command: command.path.clone(),
+                            args: command.args.clone(),
+                            env: if let Some(env) = command.env.as_ref() {
+                                env.iter()
+                                    .map(|(name, value)| acp::EnvVariable {
+                                        name: name.clone(),
+                                        value: value.clone(),
+                                        meta: None,
+                                    })
+                                    .collect()
+                            } else {
+                                vec![]
+                            },
+                        }),
                        project::context_server_store::ContextServerConfiguration::Http {
                            url,
                            headers,
-                        } => Some(acp::McpServer::Http(
-                            acp::McpServerHttp::new(id.0.to_string(), url.to_string()).headers(
-                                headers
-                                    .iter()
-                                    .map(|(name, value)| acp::HttpHeader::new(name, value))
-                                    .collect(),
-                            ),
-                        )),
+                        } => Some(acp::McpServer::Http {
+                            name: id.0.to_string(),
+                            url: url.to_string(),
+                            headers: headers.iter().map(|(name, value)| acp::HttpHeader {
+                                name: name.clone(),
+                                value: value.clone(),
+                                meta: None,
+                            }).collect(),
+                        }),
                    }
-                })
-                .collect()
-        } else {
-            // In SSH projects, the external agent is running on the remote
-            // machine, and currently we only run MCP servers on the local
-            // machine. So don't pass any MCP servers to the agent in that case.
-            Vec::new()
-        };
+                    })
+                    .collect()
+            } else {
+                // In SSH projects, the external agent is running on the remote
+                // machine, and currently we only run MCP servers on the local
+                // machine. So don't pass any MCP servers to the agent in that case.
+                Vec::new()
+            };

        cx.spawn(async move |cx| {
            let response = conn
-                .new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
+                .new_session(acp::NewSessionRequest { mcp_servers, cwd, meta: None })
                .await
                .map_err(|err| {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        let mut error = AuthRequired::new();

-                        if err.message != acp::ErrorCode::AuthRequired.to_string() {
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
                            error = error.with_description(err.message);
                        }

@@ -339,7 +341,11 @@ impl AgentConnection for AcpConnection {
                            let modes = modes.clone();
                            let conn = conn.clone();
                            async move |_| {
-                                let result = conn.set_session_mode(acp::SetSessionModeRequest::new(session_id, default_mode))
+                                let result = conn.set_session_mode(acp::SetSessionModeRequest {
+                                    session_id,
+                                    mode_id: default_mode,
+                                    meta: None,
+                                })
                                .await.log_err();

                                if result.is_none() {
@@ -382,7 +388,11 @@ impl AgentConnection for AcpConnection {
                            let models = models.clone();
                            let conn = conn.clone();
                            async move |_| {
-                                let result = conn.set_session_model(acp::SetSessionModelRequest::new(session_id, default_model))
+                                let result = conn.set_session_model(acp::SetSessionModelRequest {
+                                    session_id,
+                                    model_id: default_model,
+                                    meta: None,
+                                })
                                .await.log_err();

                                if result.is_none() {
@@ -446,8 +456,12 @@ impl AgentConnection for AcpConnection {
    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
        let conn = self.connection.clone();
        cx.foreground_executor().spawn(async move {
-            conn.authenticate(acp::AuthenticateRequest::new(method_id))
-                .await?;
+            conn.authenticate(acp::AuthenticateRequest {
+                method_id: method_id.clone(),
+                meta: None,
+            })
+            .await?;
+
            Ok(())
        })
    }
@@ -474,11 +488,11 @@ impl AgentConnection for AcpConnection {
            match result {
                Ok(response) => Ok(response),
                Err(err) => {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        return Err(anyhow!(acp::Error::auth_required()));
                    }

-                    if err.code != ErrorCode::InternalError {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                        anyhow::bail!(err)
                    }

@@ -501,7 +515,10 @@ impl AgentConnection for AcpConnection {
                                && (details.contains("This operation was aborted")
                                    || details.contains("The user aborted a request"))
                            {
-                                Ok(acp::PromptResponse::new(acp::StopReason::Cancelled))
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Cancelled,
+                                    meta: None,
+                                })
                            } else {
                                Err(anyhow!(details))
                            }
@@ -518,7 +535,10 @@ impl AgentConnection for AcpConnection {
            session.suppress_abort_err = true;
        }
        let conn = self.connection.clone();
-        let params = acp::CancelNotification::new(session_id.clone());
+        let params = acp::CancelNotification {
+            session_id: session_id.clone(),
+            meta: None,
+        };
        cx.foreground_executor()
            .spawn(async move { conn.cancel(params).await })
            .detach();
@@ -599,7 +619,11 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
        let state = self.state.clone();
        cx.foreground_executor().spawn(async move {
            let result = connection
-                .set_session_mode(acp::SetSessionModeRequest::new(session_id, mode_id))
+                .set_session_mode(acp::SetSessionModeRequest {
+                    session_id,
+                    mode_id,
+                    meta: None,
+                })
                .await;

            if result.is_err() {
@@ -658,7 +682,11 @@ impl acp_thread::AgentModelSelector for AcpModelSelector {
        let state = self.state.clone();
        cx.foreground_executor().spawn(async move {
            let result = connection
-                .set_session_model(acp::SetSessionModelRequest::new(session_id, model_id))
+                .set_session_model(acp::SetSessionModelRequest {
+                    session_id,
+                    model_id,
+                    meta: None,
+                })
                .await;

            if result.is_err() {
@@ -720,7 +748,10 @@ impl acp::Client for ClientDelegate {

        let outcome = task.await;

-        Ok(acp::RequestPermissionResponse::new(outcome))
+        Ok(acp::RequestPermissionResponse {
+            outcome,
+            meta: None,
+        })
    }

    async fn write_text_file(
@@ -752,7 +783,10 @@ impl acp::Client for ClientDelegate {

        let content = task.await?;

-        Ok(acp::ReadTextFileResponse::new(content))
+        Ok(acp::ReadTextFileResponse {
+            content,
+            meta: None,
+        })
    }

    async fn session_notification(
@@ -787,7 +821,7 @@ impl acp::Client for ClientDelegate {
                if let Some(terminal_info) = meta.get("terminal_info") {
                    if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
                    {
-                        let terminal_id = acp::TerminalId::new(id_str);
+                        let terminal_id = acp::TerminalId(id_str.into());
                        let cwd = terminal_info
                            .get("cwd")
                            .and_then(|v| v.as_str().map(PathBuf::from));
@@ -803,7 +837,7 @@ impl acp::Client for ClientDelegate {
                            let lower = cx.new(|cx| builder.subscribe(cx));
                            thread.on_terminal_provider_event(
                                TerminalProviderEvent::Created {
-                                    terminal_id,
+                                    terminal_id: terminal_id.clone(),
                                    label: tc.title.clone(),
                                    cwd,
                                    output_byte_limit: None,
@@ -828,12 +862,15 @@ impl acp::Client for ClientDelegate {
            if let Some(meta) = &tcu.meta {
                if let Some(term_out) = meta.get("terminal_output") {
                    if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
+                        let terminal_id = acp::TerminalId(id_str.into());
                        if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
                            let data = s.as_bytes().to_vec();
                            let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
                                thread.on_terminal_provider_event(
-                                    TerminalProviderEvent::Output { terminal_id, data },
+                                    TerminalProviderEvent::Output {
+                                        terminal_id: terminal_id.clone(),
+                                        data,
+                                    },
                                    cx,
                                );
                            });
@@ -844,24 +881,21 @@ impl acp::Client for ClientDelegate {
                // terminal_exit
                if let Some(term_exit) = meta.get("terminal_exit") {
                    if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
-                        let status = acp::TerminalExitStatus::new()
-                            .exit_code(
-                                term_exit
-                                    .get("exit_code")
-                                    .and_then(|v| v.as_u64())
-                                    .map(|i| i as u32),
-                            )
-                            .signal(
-                                term_exit
-                                    .get("signal")
-                                    .and_then(|v| v.as_str().map(|s| s.to_string())),
-                            );
-
+                        let terminal_id = acp::TerminalId(id_str.into());
+                        let status = acp::TerminalExitStatus {
+                            exit_code: term_exit
+                                .get("exit_code")
+                                .and_then(|v| v.as_u64())
+                                .map(|i| i as u32),
+                            signal: term_exit
+                                .get("signal")
+                                .and_then(|v| v.as_str().map(|s| s.to_string())),
+                            meta: None,
+                        };
                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
                            thread.on_terminal_provider_event(
                                TerminalProviderEvent::Exit {
-                                    terminal_id,
+                                    terminal_id: terminal_id.clone(),
                                    status,
                                },
                                cx,
@@ -898,7 +932,7 @@ impl acp::Client for ClientDelegate {
        // Register with renderer
        let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
            thread.register_terminal_created(
-                acp::TerminalId::new(uuid::Uuid::new_v4().to_string()),
+                acp::TerminalId(uuid::Uuid::new_v4().to_string().into()),
                format!("{} {}", args.command, args.args.join(" ")),
                args.cwd.clone(),
                args.output_byte_limit,
@@ -908,7 +942,10 @@ impl acp::Client for ClientDelegate {
        })?;
        let terminal_id =
            terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone())?;
-        Ok(acp::CreateTerminalResponse::new(terminal_id))
+        Ok(acp::CreateTerminalResponse {
+            terminal_id,
+            meta: None,
+        })
    }

    async fn kill_terminal_command(
@@ -969,7 +1006,10 @@ impl acp::Client for ClientDelegate {
            })??
            .await;

-        Ok(acp::WaitForTerminalExitResponse::new(exit_status))
+        Ok(acp::WaitForTerminalExitResponse {
+            exit_status,
+            meta: None,
+        })
    }
 }

--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -56,6 +56,7 @@ impl AgentServerDelegate {
 pub trait AgentServer: Send {
    fn logo(&self) -> ui::IconName;
    fn name(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;
    fn default_mode(&self, _cx: &mut App) -> Option<agent_client_protocol::SessionModeId> {
        None
    }
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -22,6 +22,10 @@ pub struct AgentServerLoginCommand {
 }

 impl AgentServer for ClaudeCode {
+    fn telemetry_id(&self) -> &'static str {
+        "claude-code"
+    }
+
    fn name(&self) -> SharedString {
        "Claude Code".into()
    }
@@ -37,7 +41,7 @@ impl AgentServer for ClaudeCode {

        settings
            .as_ref()
-            .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
+            .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
    }

    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -58,7 +62,7 @@ impl AgentServer for ClaudeCode {

        settings
            .as_ref()
-            .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
+            .and_then(|s| s.default_model.clone().map(|m| acp::ModelId(m.into())))
    }

    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -79,6 +83,7 @@ impl AgentServer for ClaudeCode {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
+        let telemetry_id = self.telemetry_id();
        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let store = delegate.store.downgrade();
@@ -103,6 +108,7 @@ impl AgentServer for ClaudeCode {
                .await?;
            let connection = crate::acp::connect(
                name,
+                telemetry_id,
                command,
                root_dir.as_ref(),
                default_mode,
--- a/crates/agent_servers/src/codex.rs
+++ b/crates/agent_servers/src/codex.rs
@@ -23,6 +23,10 @@ pub(crate) mod tests {
 }

 impl AgentServer for Codex {
+    fn telemetry_id(&self) -> &'static str {
+        "codex"
+    }
+
    fn name(&self) -> SharedString {
        "Codex".into()
    }
@@ -38,7 +42,7 @@ impl AgentServer for Codex {

        settings
            .as_ref()
-            .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
+            .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
    }

    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -59,7 +63,7 @@ impl AgentServer for Codex {

        settings
            .as_ref()
-            .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
+            .and_then(|s| s.default_model.clone().map(|m| acp::ModelId(m.into())))
    }

    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -80,6 +84,7 @@ impl AgentServer for Codex {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
+        let telemetry_id = self.telemetry_id();
        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let store = delegate.store.downgrade();
@@ -105,6 +110,7 @@ impl AgentServer for Codex {

            let connection = crate::acp::connect(
                name,
+                telemetry_id,
                command,
                root_dir.as_ref(),
                default_mode,
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,4 +1,4 @@
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
+use crate::{AgentServerDelegate, load_proxy_env};
 use acp_thread::AgentConnection;
 use agent_client_protocol as acp;
 use anyhow::{Context as _, Result};
@@ -20,7 +20,11 @@ impl CustomAgentServer {
    }
 }

-impl AgentServer for CustomAgentServer {
+impl crate::AgentServer for CustomAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "custom"
+    }
+
    fn name(&self) -> SharedString {
        self.name.clone()
    }
@@ -40,7 +44,7 @@ impl AgentServer for CustomAgentServer {

        settings
            .as_ref()
-            .and_then(|s| s.default_mode().map(acp::SessionModeId::new))
+            .and_then(|s| s.default_mode().map(|m| acp::SessionModeId(m.into())))
    }

    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -76,7 +80,7 @@ impl AgentServer for CustomAgentServer {

        settings
            .as_ref()
-            .and_then(|s| s.default_model().map(acp::ModelId::new))
+            .and_then(|s| s.default_model().map(|m| acp::ModelId(m.into())))
    }

    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -108,12 +112,14 @@ impl AgentServer for CustomAgentServer {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
+        let telemetry_id = self.telemetry_id();
        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let default_mode = self.default_mode(cx);
        let default_model = self.default_model(cx);
        let store = delegate.store.downgrade();
        let extra_env = load_proxy_env(cx);
+
        cx.spawn(async move |cx| {
            let (command, root_dir, login) = store
                .update(cx, |store, cx| {
@@ -133,6 +139,7 @@ impl AgentServer for CustomAgentServer {
                .await?;
            let connection = crate::acp::connect(
                name,
+                telemetry_id,
                command,
                root_dir.as_ref(),
                default_mode,
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -82,9 +82,26 @@ where
        .update(cx, |thread, cx| {
            thread.send(
                vec![
-                    "Read the file ".into(),
-                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new("foo.rs", "foo.rs")),
-                    " and tell me what the content of the println! is".into(),
+                    acp::ContentBlock::Text(acp::TextContent {
+                        text: "Read the file ".into(),
+                        annotations: None,
+                        meta: None,
+                    }),
+                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        uri: "foo.rs".into(),
+                        name: "foo.rs".into(),
+                        annotations: None,
+                        description: None,
+                        mime_type: None,
+                        size: None,
+                        title: None,
+                        meta: None,
+                    }),
+                    acp::ContentBlock::Text(acp::TextContent {
+                        text: " and tell me what the content of the println! is".into(),
+                        annotations: None,
+                        meta: None,
+                    }),
                ],
                cx,
            )
@@ -412,7 +429,7 @@ macro_rules! common_e2e_tests {
            async fn tool_call_with_permission(cx: &mut ::gpui::TestAppContext) {
                $crate::e2e_tests::test_tool_call_with_permission(
                    $server,
-                    ::agent_client_protocol::PermissionOptionId::new($allow_option_id),
+                    ::agent_client_protocol::PermissionOptionId($allow_option_id.into()),
                    cx,
                )
                .await;
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -12,6 +12,10 @@ use project::agent_server_store::GEMINI_NAME;
 pub struct Gemini;

 impl AgentServer for Gemini {
+    fn telemetry_id(&self) -> &'static str {
+        "gemini-cli"
+    }
+
    fn name(&self) -> SharedString {
        "Gemini CLI".into()
    }
@@ -27,6 +31,7 @@ impl AgentServer for Gemini {
        cx: &mut App,
    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
        let name = self.name();
+        let telemetry_id = self.telemetry_id();
        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
        let is_remote = delegate.project.read(cx).is_via_remote_server();
        let store = delegate.store.downgrade();
@@ -61,6 +66,7 @@ impl AgentServer for Gemini {

            let connection = crate::acp::connect(
                name,
+                telemetry_id,
                command,
                root_dir.as_ref(),
                default_mode,
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -9,7 +9,7 @@ use project::DisableAiSettings;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{
-    DefaultAgentView, DockPosition, DockSide, LanguageModelParameters, LanguageModelSelection,
+    DefaultAgentView, DockPosition, LanguageModelParameters, LanguageModelSelection,
    NotifyWhenAgentWaiting, RegisterSetting, Settings,
 };

@@ -24,12 +24,10 @@ pub struct AgentSettings {
    pub enabled: bool,
    pub button: bool,
    pub dock: DockPosition,
-    pub agents_panel_dock: DockSide,
    pub default_width: Pixels,
    pub default_height: Pixels,
    pub default_model: Option<LanguageModelSelection>,
    pub inline_assistant_model: Option<LanguageModelSelection>,
-    pub inline_assistant_use_streaming_tools: bool,
    pub commit_message_model: Option<LanguageModelSelection>,
    pub thread_summary_model: Option<LanguageModelSelection>,
    pub inline_alternatives: Vec<LanguageModelSelection>,
@@ -153,14 +151,10 @@ impl Settings for AgentSettings {
            enabled: agent.enabled.unwrap(),
            button: agent.button.unwrap(),
            dock: agent.dock.unwrap(),
-            agents_panel_dock: agent.agents_panel_dock.unwrap(),
            default_width: px(agent.default_width.unwrap()),
            default_height: px(agent.default_height.unwrap()),
            default_model: Some(agent.default_model.unwrap()),
            inline_assistant_model: agent.inline_assistant_model,
-            inline_assistant_use_streaming_tools: agent
-                .inline_assistant_use_streaming_tools
-                .unwrap_or(true),
            commit_message_model: agent.commit_message_model,
            thread_summary_model: agent.thread_summary_model,
            inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/agent_ui.rs"
 doctest = false

 [features]
-test-support = ["assistant_text_thread/test-support", "eval_utils", "gpui/test-support", "language/test-support", "reqwest_client", "workspace/test-support"]
+test-support = ["gpui/test-support", "language/test-support", "reqwest_client"]
 unit-eval = []

 [dependencies]
@@ -40,7 +40,6 @@ component.workspace = true
 context_server.workspace = true
 db.workspace = true
 editor.workspace = true
-eval_utils = { workspace = true, optional = true }
 extension.workspace = true
 extension_host.workspace = true
 feature_flags.workspace = true
@@ -72,7 +71,6 @@ postage.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
-rand.workspace = true
 release_channel.workspace = true
 rope.workspace = true
 rules_library.workspace = true
@@ -86,6 +84,7 @@ smol.workspace = true
 streaming_diff.workspace = true
 task.workspace = true
 telemetry.workspace = true
+telemetry_events.workspace = true
 terminal.workspace = true
 terminal_view.workspace = true
 text.workspace = true
@@ -96,7 +95,6 @@ ui.workspace = true
 ui_input.workspace = true
 url.workspace = true
 util.workspace = true
-uuid.workspace = true
 watch.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
@@ -121,6 +119,7 @@ language_model = { workspace = true, "features" = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 semver.workspace = true
+rand.workspace = true
 reqwest_client.workspace = true
 tree-sitter-md.workspace = true
 unindent.workspace = true
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -22,7 +22,7 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};

 pub struct EntryViewState {
    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
+    project: Entity<Project>,
    history_store: Entity<HistoryStore>,
    prompt_store: Option<Entity<PromptStore>>,
    entries: Vec<Entry>,
@@ -34,7 +34,7 @@ pub struct EntryViewState {
 impl EntryViewState {
    pub fn new(
        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
+        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
@@ -328,7 +328,7 @@ impl Entry {

 fn create_terminal(
    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
+    project: Entity<Project>,
    terminal: Entity<acp_thread::Terminal>,
    window: &mut Window,
    cx: &mut App,
@@ -336,9 +336,9 @@ fn create_terminal(
    cx.new(|cx| {
        let mut view = TerminalView::new(
            terminal.read(cx).inner().clone(),
-            workspace,
+            workspace.clone(),
            None,
-            project,
+            project.downgrade(),
            window,
            cx,
        );
@@ -432,11 +432,24 @@ mod tests {
        let (workspace, cx) =
            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));

-        let tool_call = acp::ToolCall::new("tool", "Tool call")
-            .status(acp::ToolCallStatus::InProgress)
-            .content(vec![acp::ToolCallContent::Diff(
-                acp::Diff::new("/project/hello.txt", "hello world").old_text("hi world"),
-            )]);
+        let tool_call = acp::ToolCall {
+            id: acp::ToolCallId("tool".into()),
+            title: "Tool call".into(),
+            kind: acp::ToolKind::Other,
+            status: acp::ToolCallStatus::InProgress,
+            content: vec![acp::ToolCallContent::Diff {
+                diff: acp::Diff {
+                    path: "/project/hello.txt".into(),
+                    old_text: Some("hi world".into()),
+                    new_text: "hello world".into(),
+                    meta: None,
+                },
+            }],
+            locations: vec![],
+            raw_input: None,
+            raw_output: None,
+            meta: None,
+        };
        let connection = Rc::new(StubAgentConnection::new());
        let thread = cx
            .update(|_, cx| {
@@ -458,7 +471,7 @@ mod tests {
        let view_state = cx.new(|_cx| {
            EntryViewState::new(
                workspace.downgrade(),
-                project.downgrade(),
+                project.clone(),
                history_store,
                None,
                Default::default(),
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -21,8 +21,8 @@ use editor::{
 };
 use futures::{FutureExt as _, future::join_all};
 use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
-    KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
+    AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat, KeyContext,
+    SharedString, Subscription, Task, TextStyle, WeakEntity,
 };
 use language::{Buffer, Language, language_settings::InlayHintKind};
 use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
@@ -39,6 +39,7 @@ use zed_actions::agent::Chat;
 pub struct MessageEditor {
    mention_set: Entity<MentionSet>,
    editor: Entity<Editor>,
+    project: Entity<Project>,
    workspace: WeakEntity<Workspace>,
    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
@@ -97,7 +98,7 @@ impl PromptCompletionProviderDelegate for Entity<MessageEditor> {
 impl MessageEditor {
    pub fn new(
        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
+        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
@@ -123,7 +124,6 @@ impl MessageEditor {
            let mut editor = Editor::new(mode, buffer, None, window, cx);
            editor.set_placeholder_text(placeholder, window, cx);
            editor.set_show_indent_guides(false, cx);
-            editor.set_show_completions_on_input(Some(true));
            editor.set_soft_wrap();
            editor.set_use_modal_editing(true);
            editor.set_context_menu_options(ContextMenuOptions {
@@ -134,8 +134,13 @@ impl MessageEditor {
            editor.register_addon(MessageEditorAddon::new());
            editor
        });
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
+        let mention_set = cx.new(|_cx| {
+            MentionSet::new(
+                project.downgrade(),
+                history_store.clone(),
+                prompt_store.clone(),
+            )
+        });
        let completion_provider = Rc::new(PromptCompletionProvider::new(
            cx.entity(),
            editor.downgrade(),
@@ -193,6 +198,7 @@ impl MessageEditor {

        Self {
            editor,
+            project,
            mention_set,
            workspace,
            prompt_capabilities,
@@ -219,13 +225,8 @@ impl MessageEditor {
            .iter()
            .find(|command| command.name == command_name)?;

-        let acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput {
-            mut hint,
-            ..
-        }) = available_command.input.clone()?
-        else {
-            return None;
-        };
+        let acp::AvailableCommandInput::Unstructured { mut hint } =
+            available_command.input.clone()?;

        let mut hint_pos = MultiBufferOffset(parsed_command.source_range.end) + 1usize;
        if hint_pos > snapshot.len() {
@@ -402,27 +403,34 @@ impl MessageEditor {
                            } => {
                                all_tracked_buffers.extend(tracked_buffers.iter().cloned());
                                if supports_embedded_context {
-                                    acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                                        acp::EmbeddedResourceResource::TextResourceContents(
-                                            acp::TextResourceContents::new(
-                                                content.clone(),
-                                                uri.to_uri().to_string(),
+                                    acp::ContentBlock::Resource(acp::EmbeddedResource {
+                                        annotations: None,
+                                        resource:
+                                            acp::EmbeddedResourceResource::TextResourceContents(
+                                                acp::TextResourceContents {
+                                                    mime_type: None,
+                                                    text: content.clone(),
+                                                    uri: uri.to_uri().to_string(),
+                                                    meta: None,
+                                                },
                                            ),
-                                        ),
-                                    ))
+                                        meta: None,
+                                    })
                                } else {
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        uri.name(),
-                                        uri.to_uri().to_string(),
-                                    ))
+                                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                                        name: uri.name(),
+                                        uri: uri.to_uri().to_string(),
+                                        annotations: None,
+                                        description: None,
+                                        mime_type: None,
+                                        size: None,
+                                        title: None,
+                                        meta: None,
+                                    })
                                }
                            }
-                            Mention::Image(mention_image) => acp::ContentBlock::Image(
-                                acp::ImageContent::new(
-                                    mention_image.data.clone(),
-                                    mention_image.format.mime_type(),
-                                )
-                                .uri(match uri {
+                            Mention::Image(mention_image) => {
+                                let uri = match uri {
                                    MentionUri::File { .. } => Some(uri.to_uri().to_string()),
                                    MentionUri::PastedImage => None,
                                    other => {
@@ -432,11 +440,25 @@ impl MessageEditor {
                                        );
                                        None
                                    }
-                                }),
-                            ),
-                            Mention::Link => acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
-                            ),
+                                };
+                                acp::ContentBlock::Image(acp::ImageContent {
+                                    annotations: None,
+                                    data: mention_image.data.to_string(),
+                                    mime_type: mention_image.format.mime_type().into(),
+                                    uri,
+                                    meta: None,
+                                })
+                            }
+                            Mention::Link => acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                                name: uri.name(),
+                                uri: uri.to_uri().to_string(),
+                                annotations: None,
+                                description: None,
+                                mime_type: None,
+                                size: None,
+                                title: None,
+                                meta: None,
+                            }),
                        };
                        chunks.push(chunk);
                        ix = crease_range.end.0;
@@ -543,145 +565,6 @@ impl MessageEditor {
    }

    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some((workspace, selections)) =
-                self.workspace.upgrade().zip(editor_clipboard_selections)
-            {
-                let Some(first_selection) = selections.first() else {
-                    return;
-                };
-                if let Some(file_path) = &first_selection.file_path {
-                    // In case someone pastes selections from another window
-                    // with a different project, we don't want to insert the
-                    // crease (containing the absolute path) since the agent
-                    // cannot access files outside the project.
-                    let is_in_project = workspace
-                        .read(cx)
-                        .project()
-                        .read(cx)
-                        .project_path_for_absolute_path(file_path, cx)
-                        .is_some();
-                    if !is_in_project {
-                        return;
-                    }
-                }
-
-                cx.stop_propagation();
-                let insertion_target = self
-                    .editor
-                    .read(cx)
-                    .selections
-                    .newest_anchor()
-                    .start
-                    .text_anchor;
-
-                let project = workspace.read(cx).project().clone();
-                for selection in selections {
-                    if let (Some(file_path), Some(line_range)) =
-                        (selection.file_path, selection.line_range)
-                    {
-                        let crease_text =
-                            acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
-
-                        let mention_uri = MentionUri::Selection {
-                            abs_path: Some(file_path.clone()),
-                            line_range: line_range.clone(),
-                        };
-
-                        let mention_text = mention_uri.as_link().to_string();
-                        let (excerpt_id, text_anchor, content_len) =
-                            self.editor.update(cx, |editor, cx| {
-                                let buffer = editor.buffer().read(cx);
-                                let snapshot = buffer.snapshot(cx);
-                                let (excerpt_id, _, buffer_snapshot) =
-                                    snapshot.as_singleton().unwrap();
-                                let text_anchor = insertion_target.bias_left(&buffer_snapshot);
-
-                                editor.insert(&mention_text, window, cx);
-                                editor.insert(" ", window, cx);
-
-                                (*excerpt_id, text_anchor, mention_text.len())
-                            });
-
-                        let Some((crease_id, tx)) = insert_crease_for_mention(
-                            excerpt_id,
-                            text_anchor,
-                            content_len,
-                            crease_text.into(),
-                            mention_uri.icon_path(cx),
-                            None,
-                            self.editor.clone(),
-                            window,
-                            cx,
-                        ) else {
-                            continue;
-                        };
-                        drop(tx);
-
-                        let mention_task = cx
-                            .spawn({
-                                let project = project.clone();
-                                async move |_, cx| {
-                                    let project_path = project
-                                        .update(cx, |project, cx| {
-                                            project.project_path_for_absolute_path(&file_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .ok_or_else(|| "project path not found".to_string())?;
-
-                                    let buffer = project
-                                        .update(cx, |project, cx| {
-                                            project.open_buffer(project_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .await
-                                        .map_err(|e| e.to_string())?;
-
-                                    buffer
-                                        .update(cx, |buffer, cx| {
-                                            let start = Point::new(*line_range.start(), 0)
-                                                .min(buffer.max_point());
-                                            let end = Point::new(*line_range.end() + 1, 0)
-                                                .min(buffer.max_point());
-                                            let content =
-                                                buffer.text_for_range(start..end).collect();
-                                            Mention::Text {
-                                                content,
-                                                tracked_buffers: vec![cx.entity()],
-                                            }
-                                        })
-                                        .map_err(|e| e.to_string())
-                                }
-                            })
-                            .shared();
-
-                        self.mention_set.update(cx, |mention_set, _cx| {
-                            mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
-                        });
-                    }
-                }
-                return;
-            }
-        }
-
        if self.prompt_capabilities.borrow().image
            && let Some(task) =
                paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
@@ -700,18 +583,17 @@ impl MessageEditor {
        let Some(workspace) = self.workspace.upgrade() else {
            return;
        };
-        let project = workspace.read(cx).project().clone();
-        let path_style = project.read(cx).path_style(cx);
+        let path_style = self.project.read(cx).path_style(cx);
        let buffer = self.editor.read(cx).buffer().clone();
        let Some(buffer) = buffer.read(cx).as_singleton() else {
            return;
        };
        let mut tasks = Vec::new();
        for path in paths {
-            let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
+            let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
                continue;
            };
-            let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
+            let Some(worktree) = self.project.read(cx).worktree_for_id(path.worktree_id, cx) else {
                continue;
            };
            let abs_path = worktree.read(cx).absolutize(&path.path);
@@ -819,13 +701,9 @@ impl MessageEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
        self.clear(window, cx);

-        let path_style = workspace.read(cx).project().read(cx).path_style(cx);
+        let path_style = self.project.read(cx).path_style(cx);
        let mut text = String::new();
        let mut mentions = Vec::new();

@@ -868,7 +746,8 @@ impl MessageEditor {
                    uri,
                    data,
                    mime_type,
-                    ..
+                    annotations: _,
+                    meta: _,
                }) => {
                    let mention_uri = if let Some(uri) = uri {
                        MentionUri::parse(&uri, path_style)
@@ -894,7 +773,7 @@ impl MessageEditor {
                        }),
                    ));
                }
-                _ => {}
+                acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => {}
            }
        }

@@ -1068,7 +947,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -1179,7 +1058,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle.clone(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -1213,7 +1092,12 @@ mod tests {
        assert!(error_message.contains("Available commands: none"));

        // Now simulate Claude providing its list of available commands (which doesn't include file)
-        available_commands.replace(vec![acp::AvailableCommand::new("help", "Get help")]);
+        available_commands.replace(vec![acp::AvailableCommand {
+            name: "help".to_string(),
+            description: "Get help".to_string(),
+            input: None,
+            meta: None,
+        }]);

        // Test that unsupported slash commands trigger an error when we have a list of available commands
        editor.update_in(cx, |editor, window, cx| {
@@ -1327,12 +1211,20 @@ mod tests {
        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
        let available_commands = Rc::new(RefCell::new(vec![
-            acp::AvailableCommand::new("quick-math", "2 + 2 = 4 - 1 = 3"),
-            acp::AvailableCommand::new("say-hello", "Say hello to whoever you want").input(
-                acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput::new(
-                    "<name>",
-                )),
-            ),
+            acp::AvailableCommand {
+                name: "quick-math".to_string(),
+                description: "2 + 2 = 4 - 1 = 3".to_string(),
+                input: None,
+                meta: None,
+            },
+            acp::AvailableCommand {
+                name: "say-hello".to_string(),
+                description: "Say hello to whoever you want".to_string(),
+                input: Some(acp::AvailableCommandInput::Unstructured {
+                    hint: "<name>".to_string(),
+                }),
+                meta: None,
+            },
        ]));

        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
@@ -1340,7 +1232,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -1562,7 +1454,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    prompt_capabilities.clone(),
@@ -1612,12 +1504,12 @@ mod tests {
            editor.set_text("", window, cx);
        });

-        prompt_capabilities.replace(
-            acp::PromptCapabilities::new()
-                .image(true)
-                .audio(true)
-                .embedded_context(true),
-        );
+        prompt_capabilities.replace(acp::PromptCapabilities {
+            image: true,
+            audio: true,
+            embedded_context: true,
+            meta: None,
+        });

        cx.simulate_input("Lorem ");

@@ -2053,7 +1945,7 @@ mod tests {
            cx.new(|cx| {
                let editor = MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2068,9 +1960,11 @@ mod tests {
                    cx,
                );
                // Enable embedded context so files are actually included
-                editor
-                    .prompt_capabilities
-                    .replace(acp::PromptCapabilities::new().embedded_context(true));
+                editor.prompt_capabilities.replace(acp::PromptCapabilities {
+                    embedded_context: true,
+                    meta: None,
+                    ..Default::default()
+                });
                editor
            })
        });
@@ -2149,7 +2043,7 @@ mod tests {

        // Create a thread metadata to insert as summary
        let thread_metadata = agent::DbThreadMetadata {
-            id: acp::SessionId::new("thread-123"),
+            id: acp::SessionId("thread-123".into()),
            title: "Previous Conversation".into(),
            updated_at: chrono::Utc::now(),
        };
@@ -2158,7 +2052,7 @@ mod tests {
            cx.new(|cx| {
                let mut editor = MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2227,7 +2121,7 @@ mod tests {
            cx.new(|cx| {
                MessageEditor::new(
                    workspace.downgrade(),
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2256,7 +2150,14 @@ mod tests {
            .await
            .unwrap();

-        assert_eq!(content, vec!["してhello world".into()]);
+        assert_eq!(
+            content,
+            vec![acp::ContentBlock::Text(acp::TextContent {
+                text: "してhello world".into(),
+                annotations: None,
+                meta: None
+            })]
+        );
    }

    #[gpui::test]
@@ -2290,7 +2191,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
@@ -2335,24 +2236,38 @@ mod tests {
            .0;

        let main_rs_uri = if cfg!(windows) {
-            "file:///C:/project/src/main.rs"
+            "file:///C:/project/src/main.rs".to_string()
        } else {
-            "file:///project/src/main.rs"
+            "file:///project/src/main.rs".to_string()
        };

        // When embedded context is `false` we should get a resource link
        pretty_assertions::assert_eq!(
            content,
            vec![
-                "What is in ".into(),
-                acp::ContentBlock::ResourceLink(acp::ResourceLink::new("main.rs", main_rs_uri))
+                acp::ContentBlock::Text(acp::TextContent {
+                    text: "What is in ".to_string(),
+                    annotations: None,
+                    meta: None
+                }),
+                acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                    uri: main_rs_uri.clone(),
+                    name: "main.rs".to_string(),
+                    annotations: None,
+                    meta: None,
+                    description: None,
+                    mime_type: None,
+                    size: None,
+                    title: None,
+                })
            ]
        );

        message_editor.update(cx, |editor, _cx| {
-            editor
-                .prompt_capabilities
-                .replace(acp::PromptCapabilities::new().embedded_context(true))
+            editor.prompt_capabilities.replace(acp::PromptCapabilities {
+                embedded_context: true,
+                ..Default::default()
+            })
        });

        let content = message_editor
@@ -2365,12 +2280,23 @@ mod tests {
        pretty_assertions::assert_eq!(
            content,
            vec![
-                "What is in ".into(),
-                acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                    acp::EmbeddedResourceResource::TextResourceContents(
-                        acp::TextResourceContents::new(file_content, main_rs_uri)
-                    )
-                ))
+                acp::ContentBlock::Text(acp::TextContent {
+                    text: "What is in ".to_string(),
+                    annotations: None,
+                    meta: None
+                }),
+                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    resource: acp::EmbeddedResourceResource::TextResourceContents(
+                        acp::TextResourceContents {
+                            text: file_content.to_string(),
+                            uri: main_rs_uri,
+                            mime_type: None,
+                            meta: None
+                        }
+                    ),
+                    annotations: None,
+                    meta: None
+                })
            ]
        );
    }
@@ -2448,7 +2374,7 @@ mod tests {
            let message_editor = cx.new(|cx| {
                MessageEditor::new(
                    workspace_handle,
-                    project.downgrade(),
+                    project.clone(),
                    history_store.clone(),
                    None,
                    Default::default(),
--- a/crates/agent_ui/src/acp/mode_selector.rs
+++ b/crates/agent_ui/src/acp/mode_selector.rs
@@ -161,7 +161,7 @@ impl Render for ModeSelector {
            .map(|mode| mode.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let this = cx.weak_entity();
+        let this = cx.entity();

        let icon = if self.menu_handle.is_deployed() {
            IconName::ChevronUp
@@ -222,8 +222,7 @@ impl Render for ModeSelector {
                y: px(-2.0),
            })
            .menu(move |window, cx| {
-                this.update(cx, |this, cx| this.build_context_menu(window, cx))
-                    .ok()
+                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
            })
    }
 }
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -12,11 +12,14 @@ use gpui::{
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
-use ui::{DocumentationAside, DocumentationEdge, DocumentationSide, prelude::*};
+use ui::{
+    DocumentationAside, DocumentationEdge, DocumentationSide, IntoElement, KeyBinding, ListItem,
+    ListItemSpacing, prelude::*,
+};
 use util::ResultExt;
 use zed_actions::agent::OpenSettings;

-use crate::ui::{HoldForDefault, ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem};
+use crate::ui::HoldForDefault;

 pub type AcpModelSelector = Picker<AcpModelPickerDelegate>;

@@ -233,19 +236,39 @@ impl PickerDelegate for AcpModelPickerDelegate {
    fn render_match(
        &self,
        ix: usize,
-        is_focused: bool,
+        selected: bool,
        _: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        match self.filtered_entries.get(ix)? {
-            AcpModelPickerEntry::Separator(title) => {
-                Some(ModelSelectorHeader::new(title, ix > 1).into_any_element())
-            }
+            AcpModelPickerEntry::Separator(title) => Some(
+                div()
+                    .px_2()
+                    .pb_1()
+                    .when(ix > 1, |this| {
+                        this.mt_1()
+                            .pt_2()
+                            .border_t_1()
+                            .border_color(cx.theme().colors().border_variant)
+                    })
+                    .child(
+                        Label::new(title)
+                            .size(LabelSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .into_any_element(),
+            ),
            AcpModelPickerEntry::Model(model_info) => {
                let is_selected = Some(model_info) == self.selected_model.as_ref();
                let default_model = self.agent_server.default_model(cx);
                let is_default = default_model.as_ref() == Some(&model_info.id);

+                let model_icon_color = if is_selected {
+                    Color::Accent
+                } else {
+                    Color::Muted
+                };
+
                Some(
                    div()
                        .id(("model-picker-menu-child", ix))
@@ -261,10 +284,30 @@ impl PickerDelegate for AcpModelPickerDelegate {
                                }))
                        })
                        .child(
-                            ModelSelectorListItem::new(ix, model_info.name.clone())
-                                .is_focused(is_focused)
-                                .is_selected(is_selected)
-                                .when_some(model_info.icon, |this, icon| this.icon(icon)),
+                            ListItem::new(ix)
+                                .inset(true)
+                                .spacing(ListItemSpacing::Sparse)
+                                .toggle_state(selected)
+                                .child(
+                                    h_flex()
+                                        .w_full()
+                                        .gap_1p5()
+                                        .when_some(model_info.icon, |this, icon| {
+                                            this.child(
+                                                Icon::new(icon)
+                                                    .color(model_icon_color)
+                                                    .size(IconSize::Small)
+                                            )
+                                        })
+                                        .child(Label::new(model_info.name.clone()).truncate()),
+                                )
+                                .end_slot(div().pr_3().when(is_selected, |this| {
+                                    this.child(
+                                        Icon::new(IconName::Check)
+                                            .color(Color::Accent)
+                                            .size(IconSize::Small),
+                                    )
+                                })),
                        )
                        .into_any_element()
                )
@@ -300,7 +343,7 @@ impl PickerDelegate for AcpModelPickerDelegate {
    fn render_footer(
        &self,
        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
+        cx: &mut Context<Picker<Self>>,
    ) -> Option<AnyElement> {
        let focus_handle = self.focus_handle.clone();

@@ -308,7 +351,26 @@ impl PickerDelegate for AcpModelPickerDelegate {
            return None;
        }

-        Some(ModelSelectorFooter::new(OpenSettings.boxed_clone(), focus_handle).into_any_element())
+        Some(
+            h_flex()
+                .w_full()
+                .p_1p5()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(
+                    Button::new("configure", "Configure")
+                        .full_width()
+                        .style(ButtonStyle::Outlined)
+                        .key_binding(
+                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, cx)
+                                .map(|kb| kb.size(rems_from_px(12.))),
+                        )
+                        .on_click(|_, window, cx| {
+                            window.dispatch_action(OpenSettings.boxed_clone(), cx);
+                        }),
+                )
+                .into_any(),
+        )
    }
 }

@@ -341,7 +403,9 @@ async fn fuzzy_search(
        let candidates = model_list
            .iter()
            .enumerate()
-            .map(|(ix, model)| StringMatchCandidate::new(ix, model.name.as_ref()))
+            .map(|(ix, model)| {
+                StringMatchCandidate::new(ix, &format!("{}/{}", model.id, model.name))
+            })
            .collect::<Vec<_>>();
        let mut matches = match_strings(
            &candidates,
@@ -400,7 +464,7 @@ mod tests {
                    models
                        .into_iter()
                        .map(|model| acp_thread::AgentModelInfo {
-                            id: acp::ModelId::new(model.to_string()),
+                            id: acp::ModelId(model.to_string().into()),
                            name: model.to_string().into(),
                            description: None,
                            icon: None,
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -34,9 +34,9 @@ use project::{
 };
 use settings::{Settings, SettingsStore, update_settings_file};
 use ui::{
-    ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure, Divider,
-    DividerColor, ElevationIndex, Indicator, LabelSize, PopoverMenu, Switch, Tooltip,
-    WithScrollbar, prelude::*,
+    Button, ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure,
+    Divider, DividerColor, ElevationIndex, IconName, IconPosition, IconSize, Indicator, LabelSize,
+    PopoverMenu, Switch, SwitchColor, Tooltip, WithScrollbar, prelude::*,
 };
 use util::ResultExt as _;
 use workspace::{Workspace, create_and_open_local_file};
@@ -838,7 +838,7 @@ impl AgentConfiguration {
                            .min_w_0()
                            .child(
                                h_flex()
-                                    .id(format!("tooltip-{}", item_id))
+                                    .id(SharedString::from(format!("tooltip-{}", item_id)))
                                    .h_full()
                                    .w_3()
                                    .mr_2()
@@ -879,6 +879,7 @@ impl AgentConfiguration {
                            .child(context_server_configuration_menu)
                            .child(
                            Switch::new("context-server-switch", is_running.into())
+                                .color(SwitchColor::Accent)
                                .on_click({
                                    let context_server_manager = self.context_server_store.clone();
                                    let fs = self.fs.clone();
@@ -975,12 +976,9 @@ impl AgentConfiguration {
                let icon = if let Some(icon_path) = agent_server_store.agent_icon(&name) {
                    AgentIcon::Path(icon_path)
                } else {
-                    AgentIcon::Name(IconName::Sparkle)
+                    AgentIcon::Name(IconName::Ai)
                };
-                let display_name = agent_server_store
-                    .agent_display_name(&name)
-                    .unwrap_or_else(|| name.0.clone());
-                (name, icon, display_name)
+                (name, icon)
            })
            .collect();

@@ -1087,7 +1085,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiClaude),
                                "Claude Code",
-                                "Claude Code",
                                false,
                                cx,
                            ))
@@ -1095,7 +1092,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiOpenAi),
                                "Codex CLI",
-                                "Codex CLI",
                                false,
                                cx,
                            ))
@@ -1103,23 +1099,16 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiGemini),
                                "Gemini CLI",
-                                "Gemini CLI",
                                false,
                                cx,
                            ))
                            .map(|mut parent| {
-                                for (name, icon, display_name) in user_defined_agents {
+                                for (name, icon) in user_defined_agents {
                                    parent = parent
                                        .child(
                                            Divider::horizontal().color(DividerColor::BorderFaded),
                                        )
-                                        .child(self.render_agent_server(
-                                            icon,
-                                            name,
-                                            display_name,
-                                            true,
-                                            cx,
-                                        ));
+                                        .child(self.render_agent_server(icon, name, true, cx));
                                }
                                parent
                            }),
@@ -1130,14 +1119,11 @@ impl AgentConfiguration {
    fn render_agent_server(
        &self,
        icon: AgentIcon,
-        id: impl Into<SharedString>,
-        display_name: impl Into<SharedString>,
+        name: impl Into<SharedString>,
        external: bool,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let id = id.into();
-        let display_name = display_name.into();
-
+        let name = name.into();
        let icon = match icon {
            AgentIcon::Name(icon_name) => Icon::new(icon_name)
                .size(IconSize::Small)
@@ -1147,15 +1133,12 @@ impl AgentConfiguration {
                .color(Color::Muted),
        };

-        let tooltip_id = SharedString::new(format!("agent-source-{}", id));
-        let tooltip_message = format!(
-            "The {} agent was installed from an extension.",
-            display_name
-        );
+        let tooltip_id = SharedString::new(format!("agent-source-{}", name));
+        let tooltip_message = format!("The {} agent was installed from an extension.", name);

-        let agent_server_name = ExternalAgentServerName(id.clone());
+        let agent_server_name = ExternalAgentServerName(name.clone());

-        let uninstall_btn_id = SharedString::from(format!("uninstall-{}", id));
+        let uninstall_btn_id = SharedString::from(format!("uninstall-{}", name));
        let uninstall_button = IconButton::new(uninstall_btn_id, IconName::Trash)
            .icon_color(Color::Muted)
            .icon_size(IconSize::Small)
@@ -1179,7 +1162,7 @@ impl AgentConfiguration {
                h_flex()
                    .gap_1p5()
                    .child(icon)
-                    .child(Label::new(display_name))
+                    .child(Label::new(name))
                    .when(external, |this| {
                        this.child(
                            div()
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
@@ -87,7 +87,7 @@ impl ConfigureContextServerToolsModal {
                            v_flex()
                                .child(
                                    h_flex()
-                                        .id(format!("tool-header-{}", index))
+                                        .id(SharedString::from(format!("tool-header-{}", index)))
                                        .py_1()
                                        .pl_1()
                                        .pr_2()
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -8,7 +8,6 @@ use editor::Editor;
 use fs::Fs;
 use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, prelude::*};
 use language_model::{LanguageModel, LanguageModelRegistry};
-use settings::SettingsStore;
 use settings::{
    LanguageModelProviderSetting, LanguageModelSelection, Settings as _, update_settings_file,
 };
@@ -95,7 +94,6 @@ pub struct ViewProfileMode {
    configure_default_model: NavigableEntry,
    configure_tools: NavigableEntry,
    configure_mcps: NavigableEntry,
-    delete_profile: NavigableEntry,
    cancel_item: NavigableEntry,
 }

@@ -111,7 +109,6 @@ pub struct ManageProfilesModal {
    active_model: Option<Arc<dyn LanguageModel>>,
    focus_handle: FocusHandle,
    mode: Mode,
-    _settings_subscription: Subscription,
 }

 impl ManageProfilesModal {
@@ -151,23 +148,12 @@ impl ManageProfilesModal {
    ) -> Self {
        let focus_handle = cx.focus_handle();

-        // Keep this modal in sync with settings changes (including profile deletion).
-        let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, |this, window, cx| {
-                if matches!(this.mode, Mode::ChooseProfile(_)) {
-                    this.mode = Mode::choose_profile(window, cx);
-                    this.focus_handle(cx).focus(window);
-                    cx.notify();
-                }
-            });
-
        Self {
            fs,
            active_model,
            context_server_registry,
            focus_handle,
            mode: Mode::choose_profile(window, cx),
-            _settings_subscription: settings_subscription,
        }
    }

@@ -206,7 +192,6 @@ impl ManageProfilesModal {
            configure_default_model: NavigableEntry::focusable(cx),
            configure_tools: NavigableEntry::focusable(cx),
            configure_mcps: NavigableEntry::focusable(cx),
-            delete_profile: NavigableEntry::focusable(cx),
            cancel_item: NavigableEntry::focusable(cx),
        });
        self.focus_handle(cx).focus(window);
@@ -384,42 +369,6 @@ impl ManageProfilesModal {
        }
    }

-    fn delete_profile(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if builtin_profiles::is_builtin(&profile_id) {
-            self.view_profile(profile_id, window, cx);
-            return;
-        }
-
-        let fs = self.fs.clone();
-
-        update_settings_file(fs, cx, move |settings, _cx| {
-            let Some(agent_settings) = settings.agent.as_mut() else {
-                return;
-            };
-
-            let Some(profiles) = agent_settings.profiles.as_mut() else {
-                return;
-            };
-
-            profiles.shift_remove(profile_id.0.as_ref());
-
-            if agent_settings
-                .default_profile
-                .as_deref()
-                .is_some_and(|default_profile| default_profile == profile_id.0.as_ref())
-            {
-                agent_settings.default_profile = Some(AgentProfileId::default().0);
-            }
-        });
-
-        self.choose_profile(window, cx);
-    }
-
    fn cancel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        match &self.mode {
            Mode::ChooseProfile { .. } => {
@@ -473,7 +422,7 @@ impl ManageProfilesModal {
        let is_focused = profile.navigation.focus_handle.contains_focused(window, cx);

        div()
-            .id(format!("profile-{}", profile.id))
+            .id(SharedString::from(format!("profile-{}", profile.id)))
            .track_focus(&profile.navigation.focus_handle)
            .on_action({
                let profile_id = profile.id.clone();
@@ -482,7 +431,7 @@ impl ManageProfilesModal {
                })
            })
            .child(
-                ListItem::new(format!("profile-{}", profile.id))
+                ListItem::new(SharedString::from(format!("profile-{}", profile.id)))
                    .toggle_state(is_focused)
                    .inset(true)
                    .spacing(ListItemSpacing::Sparse)
@@ -807,40 +756,6 @@ impl ManageProfilesModal {
                                        }),
                                ),
                        )
-                        .child(
-                            div()
-                                .id("delete-profile")
-                                .track_focus(&mode.delete_profile.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.delete_profile(profile_id.clone(), window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("delete-profile")
-                                        .toggle_state(
-                                            mode.delete_profile
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Trash)
-                                                .size(IconSize::Small)
-                                                .color(Color::Error),
-                                        )
-                                        .child(Label::new("Delete Profile").color(Color::Error))
-                                        .disabled(builtin_profiles::is_builtin(&mode.profile_id))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.delete_profile(profile_id.clone(), window, cx);
-                                            })
-                                        }),
-                                ),
-                        )
                        .child(ListSeparator)
                        .child(
                            div()
@@ -890,7 +805,6 @@ impl ManageProfilesModal {
        .entry(mode.configure_default_model)
        .entry(mode.configure_tools)
        .entry(mode.configure_mcps)
-        .entry(mode.delete_profile)
        .entry(mode.cancel_item)
    }
 }
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -130,12 +130,7 @@ impl AgentDiffPane {
            .action_log()
            .read(cx)
            .changed_buffers(cx);
-        let mut paths_to_delete = self
-            .multibuffer
-            .read(cx)
-            .paths()
-            .cloned()
-            .collect::<HashSet<_>>();
+        let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::<HashSet<_>>();

        for (buffer, diff_handle) in changed_buffers {
            if buffer.read(cx).file().is_none() {
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -63,10 +63,6 @@ impl AgentModelSelector {
    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
        self.menu_handle.toggle(window, cx);
    }
-
-    pub fn active_model(&self, cx: &App) -> Option<language_model::ConfiguredModel> {
-        self.selector.read(cx).delegate.active_model(cx)
-    }
 }

 impl Render for AgentModelSelector {
@@ -102,7 +98,7 @@ impl Render for AgentModelSelector {
                .child(
                    Icon::new(IconName::ChevronDown)
                        .color(color)
-                        .size(IconSize::Small),
+                        .size(IconSize::XSmall),
                ),
            move |_window, cx| {
                Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -259,7 +259,7 @@ impl AgentType {
            Self::Gemini => Some(IconName::AiGemini),
            Self::ClaudeCode => Some(IconName::AiClaude),
            Self::Codex => Some(IconName::AiOpenAi),
-            Self::Custom { .. } => Some(IconName::Sparkle),
+            Self::Custom { .. } => Some(IconName::Terminal),
        }
    }
 }
@@ -305,7 +305,6 @@ impl ActiveView {
                project,
                history_store,
                prompt_store,
-                false,
                window,
                cx,
            )
@@ -886,6 +885,10 @@ impl AgentPanel {

            let server = ext_agent.server(fs, history);

+            if !loading {
+                telemetry::event!("Agent Thread Started", agent = server.telemetry_id());
+            }
+
            this.update_in(cx, |this, window, cx| {
                let selected_agent = ext_agent.into();
                if this.selected_agent != selected_agent {
@@ -902,7 +905,6 @@ impl AgentPanel {
                        project,
                        this.history_store.clone(),
                        this.prompt_store.clone(),
-                        !loading,
                        window,
                        cx,
                    )
@@ -1851,17 +1853,14 @@ impl AgentPanel {
        let agent_server_store = self.project.read(cx).agent_server_store().clone();
        let focus_handle = self.focus_handle(cx);

-        let (selected_agent_custom_icon, selected_agent_label) =
+        // Get custom icon path for selected agent before building menu (to avoid borrow issues)
+        let selected_agent_custom_icon =
            if let AgentType::Custom { name, .. } = &self.selected_agent {
-                let store = agent_server_store.read(cx);
-                let icon = store.agent_icon(&ExternalAgentServerName(name.clone()));
-
-                let label = store
-                    .agent_display_name(&ExternalAgentServerName(name.clone()))
-                    .unwrap_or_else(|| self.selected_agent.label());
-                (icon, label)
+                agent_server_store
+                    .read(cx)
+                    .agent_icon(&ExternalAgentServerName(name.clone()))
            } else {
-                (None, self.selected_agent.label())
+                None
            };

        let active_thread = match &self.active_view {
@@ -2084,16 +2083,13 @@ impl AgentPanel {

                                for agent_name in agent_names {
                                    let icon_path = agent_server_store.agent_icon(&agent_name);
-                                    let display_name = agent_server_store
-                                        .agent_display_name(&agent_name)
-                                        .unwrap_or_else(|| agent_name.0.clone());

-                                    let mut entry = ContextMenuEntry::new(display_name);
+                                    let mut entry = ContextMenuEntry::new(agent_name.clone());

                                    if let Some(icon_path) = icon_path {
                                        entry = entry.custom_icon_svg(icon_path);
                                    } else {
-                                        entry = entry.icon(IconName::Sparkle);
+                                        entry = entry.icon(IconName::Terminal);
                                    }
                                    entry = entry
                                        .when(
@@ -2157,6 +2153,8 @@ impl AgentPanel {
                }
            });

+        let selected_agent_label = self.selected_agent.label();
+
        let is_thread_loading = self
            .active_thread_view()
            .map(|thread| thread.read(cx).is_loading())
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,4 +1,4 @@
-pub mod acp;
+mod acp;
 mod agent_configuration;
 mod agent_diff;
 mod agent_model_selector;
@@ -7,6 +7,8 @@ mod buffer_codegen;
 mod completion_provider;
 mod context;
 mod context_server_configuration;
+#[cfg(test)]
+mod evals;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod language_model_selector;
@@ -26,7 +28,7 @@ use agent_settings::{AgentProfileId, AgentSettings};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
-use feature_flags::{AgentV2FeatureFlag, FeatureFlagAppExt as _};
+use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
 use gpui::{Action, App, Entity, SharedString, actions};
 use language::{
@@ -158,6 +160,16 @@ pub enum ExternalAgent {
 }

 impl ExternalAgent {
+    pub fn parse_built_in(server: &dyn agent_servers::AgentServer) -> Option<Self> {
+        match server.telemetry_id() {
+            "gemini-cli" => Some(Self::Gemini),
+            "claude-code" => Some(Self::ClaudeCode),
+            "codex" => Some(Self::Codex),
+            "zed" => Some(Self::NativeAgent),
+            _ => None,
+        }
+    }
+
    pub fn server(
        &self,
        fs: Arc<dyn fs::Fs>,
@@ -214,7 +226,7 @@ pub fn init(
    is_eval: bool,
    cx: &mut App,
 ) {
-    assistant_text_thread::init(client, cx);
+    assistant_text_thread::init(client.clone(), cx);
    rules_library::init(cx);
    if !is_eval {
        // Initializing the language model from the user settings messes with the eval, so we only initialize them when
@@ -227,8 +239,13 @@ pub fn init(
    TextThreadEditor::init(cx);

    register_slash_commands(cx);
-    inline_assistant::init(fs.clone(), prompt_builder.clone(), cx);
-    terminal_inline_assistant::init(fs.clone(), prompt_builder, cx);
+    inline_assistant::init(
+        fs.clone(),
+        prompt_builder.clone(),
+        client.telemetry().clone(),
+        cx,
+    );
+    terminal_inline_assistant::init(fs.clone(), prompt_builder, client.telemetry().clone(), cx);
    cx.observe_new(move |workspace, window, cx| {
        ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
    })
@@ -244,31 +261,23 @@ pub fn init(
        update_command_palette_filter(app_cx);
    })
    .detach();
-
-    cx.on_flags_ready(|_, cx| {
-        update_command_palette_filter(cx);
-    })
-    .detach();
 }

 fn update_command_palette_filter(cx: &mut App) {
    let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
    let agent_enabled = AgentSettings::get_global(cx).enabled;
-    let agent_v2_enabled = cx.has_flag::<AgentV2FeatureFlag>();
    let edit_prediction_provider = AllLanguageSettings::get_global(cx)
        .edit_predictions
        .provider;

    CommandPaletteFilter::update_global(cx, |filter, _| {
        use editor::actions::{
-            AcceptEditPrediction, AcceptNextLineEditPrediction, AcceptNextWordEditPrediction,
-            NextEditPrediction, PreviousEditPrediction, ShowEditPrediction, ToggleEditPrediction,
+            AcceptEditPrediction, AcceptPartialEditPrediction, NextEditPrediction,
+            PreviousEditPrediction, ShowEditPrediction, ToggleEditPrediction,
        };
        let edit_prediction_actions = [
            TypeId::of::<AcceptEditPrediction>(),
-            TypeId::of::<AcceptNextWordEditPrediction>(),
-            TypeId::of::<AcceptNextLineEditPrediction>(),
-            TypeId::of::<AcceptEditPrediction>(),
+            TypeId::of::<AcceptPartialEditPrediction>(),
            TypeId::of::<ShowEditPrediction>(),
            TypeId::of::<NextEditPrediction>(),
            TypeId::of::<PreviousEditPrediction>(),
@@ -277,7 +286,6 @@ fn update_command_palette_filter(cx: &mut App) {

        if disable_ai {
            filter.hide_namespace("agent");
-            filter.hide_namespace("agents");
            filter.hide_namespace("assistant");
            filter.hide_namespace("copilot");
            filter.hide_namespace("supermaven");
@@ -289,10 +297,8 @@ fn update_command_palette_filter(cx: &mut App) {
        } else {
            if agent_enabled {
                filter.show_namespace("agent");
-                filter.show_namespace("agents");
            } else {
                filter.hide_namespace("agent");
-                filter.hide_namespace("agents");
            }

            filter.show_namespace("assistant");
@@ -328,9 +334,6 @@ fn update_command_palette_filter(cx: &mut App) {

            filter.show_namespace("zed_predict_onboarding");
            filter.show_action_types(&[TypeId::of::<zed_actions::OpenZedPredictOnboarding>()]);
-            if !agent_v2_enabled {
-                filter.hide_action_types(&[TypeId::of::<zed_actions::agent::ToggleAgentPane>()]);
-            }
        }
    });
 }
@@ -429,7 +432,7 @@ mod tests {
    use gpui::{BorrowAppContext, TestAppContext, px};
    use project::DisableAiSettings;
    use settings::{
-        DefaultAgentView, DockPosition, DockSide, NotifyWhenAgentWaiting, Settings, SettingsStore,
+        DefaultAgentView, DockPosition, NotifyWhenAgentWaiting, Settings, SettingsStore,
    };

    #[gpui::test]
@@ -448,12 +451,10 @@ mod tests {
            enabled: true,
            button: true,
            dock: DockPosition::Right,
-            agents_panel_dock: DockSide::Left,
            default_width: px(300.),
            default_height: px(600.),
            default_model: None,
            inline_assistant_model: None,
-            inline_assistant_use_streaming_tools: false,
            commit_message_model: None,
            thread_summary_model: None,
            inline_alternatives: vec![],
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1,34 +1,33 @@
 use crate::{context::LoadedContext, inline_prompt_editor::CodegenStatus};
+use agent::{
+    AgentTool as _, FailureMessageInput, FailureMessageTool, RewriteSectionInput,
+    RewriteSectionTool, SystemPromptTemplate, Template, Templates,
+};
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
-use uuid::Uuid;
-
+use client::telemetry::Telemetry;
 use cloud_llm_client::CompletionIntent;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use feature_flags::{FeatureFlagAppExt as _, InlineAssistantUseToolFeatureFlag};
+use feature_flags::{FeatureFlagAppExt as _, InlineAssistantV2FeatureFlag};
 use futures::{
    SinkExt, Stream, StreamExt, TryStreamExt as _,
    channel::mpsc,
    future::{LocalBoxFuture, Shared},
    join,
-    stream::BoxStream,
 };
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
-use language::{Buffer, IndentKind, LanguageName, Point, TransactionId, line_diff};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
+use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
 use language_model::{
    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelRequestTool, LanguageModelTextStream, LanguageModelToolChoice,
-    LanguageModelToolUse, Role, TokenUsage,
+    LanguageModelRequestTool, LanguageModelTextStream, LanguageModelToolUse, Role,
+    report_assistant_event,
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use prompt_store::PromptBuilder;
+use prompt_store::{ProjectContext, PromptBuilder};
 use rope::Rope;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Settings as _;
 use smol::future::FutureExt;
 use std::{
    cmp,
@@ -41,26 +40,7 @@ use std::{
    time::Instant,
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
-
-/// Use this tool when you cannot or should not make a rewrite. This includes:
-/// - The user's request is unclear, ambiguous, or nonsensical
-/// - The requested change cannot be made by only editing the <rewrite_this> section
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct FailureMessageInput {
-    /// A brief message to the user explaining why you're unable to fulfill the request or to ask a question about the request.
-    #[serde(default)]
-    pub message: String,
-}
-
-/// Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.
-/// Only use this tool when you are confident you understand the user's request and can fulfill it
-/// by editing the marked section.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RewriteSectionInput {
-    /// The text to replace the section with.
-    #[serde(default)]
-    pub replacement_text: String,
-}
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};

 pub struct BufferCodegen {
    alternatives: Vec<Entity<CodegenAlternative>>,
@@ -70,9 +50,9 @@ pub struct BufferCodegen {
    buffer: Entity<MultiBuffer>,
    range: Range<Anchor>,
    initial_transaction_id: Option<TransactionId>,
+    telemetry: Arc<Telemetry>,
    builder: Arc<PromptBuilder>,
    pub is_insertion: bool,
-    session_id: Uuid,
 }

 impl BufferCodegen {
@@ -80,7 +60,7 @@ impl BufferCodegen {
        buffer: Entity<MultiBuffer>,
        range: Range<Anchor>,
        initial_transaction_id: Option<TransactionId>,
-        session_id: Uuid,
+        telemetry: Arc<Telemetry>,
        builder: Arc<PromptBuilder>,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -89,8 +69,8 @@ impl BufferCodegen {
                buffer.clone(),
                range.clone(),
                false,
+                Some(telemetry.clone()),
                builder.clone(),
-                session_id,
                cx,
            )
        });
@@ -103,8 +83,8 @@ impl BufferCodegen {
            buffer,
            range,
            initial_transaction_id,
+            telemetry,
            builder,
-            session_id,
        };
        this.activate(0, cx);
        this
@@ -119,18 +99,10 @@ impl BufferCodegen {
            .push(cx.subscribe(&codegen, |_, _, event, cx| cx.emit(*event)));
    }

-    pub fn active_completion(&self, cx: &App) -> Option<String> {
-        self.active_alternative().read(cx).current_completion()
-    }
-
    pub fn active_alternative(&self) -> &Entity<CodegenAlternative> {
        &self.alternatives[self.active_alternative]
    }

-    pub fn language_name(&self, cx: &App) -> Option<LanguageName> {
-        self.active_alternative().read(cx).language_name(cx)
-    }
-
    pub fn status<'a>(&self, cx: &'a App) -> &'a CodegenStatus {
        &self.active_alternative().read(cx).status
    }
@@ -189,8 +161,8 @@ impl BufferCodegen {
                    self.buffer.clone(),
                    self.range.clone(),
                    false,
+                    Some(self.telemetry.clone()),
                    self.builder.clone(),
-                    self.session_id,
                    cx,
                )
            }));
@@ -250,12 +222,11 @@ impl BufferCodegen {
        self.active_alternative().read(cx).last_equal_ranges()
    }

-    pub fn selected_text<'a>(&self, cx: &'a App) -> Option<&'a str> {
-        self.active_alternative().read(cx).selected_text()
-    }
-
-    pub fn session_id(&self) -> Uuid {
-        self.session_id
+    pub fn tool_description<'a>(&self, cx: &'a App) -> Option<&'a str> {
+        self.active_alternative()
+            .read(cx)
+            .tool_description
+            .as_deref()
    }
 }

@@ -272,6 +243,7 @@ pub struct CodegenAlternative {
    status: CodegenStatus,
    generation: Task<()>,
    diff: Diff,
+    telemetry: Option<Arc<Telemetry>>,
    _subscription: gpui::Subscription,
    builder: Arc<PromptBuilder>,
    active: bool,
@@ -279,11 +251,8 @@ pub struct CodegenAlternative {
    line_operations: Vec<LineOperation>,
    elapsed_time: Option<f64>,
    completion: Option<String>,
-    selected_text: Option<String>,
    pub message_id: Option<String>,
-    session_id: Uuid,
-    pub description: Option<String>,
-    pub failure: Option<String>,
+    pub tool_description: Option<String>,
 }

 impl EventEmitter<CodegenEvent> for CodegenAlternative {}
@@ -293,8 +262,8 @@ impl CodegenAlternative {
        buffer: Entity<MultiBuffer>,
        range: Range<Anchor>,
        active: bool,
+        telemetry: Option<Arc<Telemetry>>,
        builder: Arc<PromptBuilder>,
-        session_id: Uuid,
        cx: &mut Context<Self>,
    ) -> Self {
        let snapshot = buffer.read(cx).snapshot(cx);
@@ -333,28 +302,19 @@ impl CodegenAlternative {
            status: CodegenStatus::Idle,
            generation: Task::ready(()),
            diff: Diff::default(),
+            telemetry,
            builder,
-            active: active,
+            active: false,
            edits: Vec::new(),
            line_operations: Vec::new(),
            range,
            elapsed_time: None,
            completion: None,
-            selected_text: None,
-            session_id,
-            description: None,
-            failure: None,
+            tool_description: None,
            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
        }
    }

-    pub fn language_name(&self, cx: &App) -> Option<LanguageName> {
-        self.old_buffer
-            .read(cx)
-            .language()
-            .map(|language| language.name())
-    }
-
    pub fn set_active(&mut self, active: bool, cx: &mut Context<Self>) {
        if active != self.active {
            self.active = active;
@@ -396,12 +356,6 @@ impl CodegenAlternative {
        &self.last_equal_ranges
    }

-    pub fn use_streaming_tools(model: &dyn LanguageModel, cx: &App) -> bool {
-        model.supports_streaming_tools()
-            && cx.has_flag::<InlineAssistantUseToolFeatureFlag>()
-            && AgentSettings::get_global(cx).inline_assistant_use_streaming_tools
-    }
-
    pub fn start(
        &mut self,
        user_prompt: String,
@@ -409,9 +363,6 @@ impl CodegenAlternative {
        model: Arc<dyn LanguageModel>,
        cx: &mut Context<Self>,
    ) -> Result<()> {
-        // Clear the model explanation since the user has started a new generation.
-        self.description = None;
-
        if let Some(transformation_transaction_id) = self.transformation_transaction_id.take() {
            self.buffer.update(cx, |buffer, cx| {
                buffer.undo_transaction(transformation_transaction_id, cx);
@@ -420,34 +371,39 @@ impl CodegenAlternative {

        self.edit_position = Some(self.range.start.bias_right(&self.snapshot));

-        if Self::use_streaming_tools(model.as_ref(), cx) {
+        let api_key = model.api_key(cx);
+        let telemetry_id = model.telemetry_id();
+        let provider_id = model.provider_id();
+
+        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
+            // if false {
+            // let request = self.build_request_v2(&model, user_prompt, context_task, cx)?;
            let request = self.build_request(&model, user_prompt, context_task, cx)?;
-            let completion_events = cx.spawn({
-                let model = model.clone();
-                async move |_, cx| model.stream_completion(request.await, cx).await
-            });
-            self.generation = self.handle_completion(model, completion_events, cx);
+            let tool_use = cx
+                .spawn(async move |_, cx| {
+                    Ok(model.stream_completion_tool(request.await, cx).await?)
+                })
+                // .boxed_local();
+                ;
+            self.handle_tool_use(telemetry_id, provider_id.to_string(), api_key, tool_use, cx);
        } else {
            let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
                if user_prompt.trim().to_lowercase() == "delete" {
                    async { Ok(LanguageModelTextStream::default()) }.boxed_local()
                } else {
                    let request = self.build_request(&model, user_prompt, context_task, cx)?;
-                    cx.spawn({
-                        let model = model.clone();
-                        async move |_, cx| {
-                            Ok(model.stream_completion_text(request.await, cx).await?)
-                        }
+                    cx.spawn(async move |_, cx| {
+                        Ok(model.stream_completion_text(request.await, cx).await?)
                    })
                    .boxed_local()
                };
-            self.generation = self.handle_stream(model, stream, cx);
+            self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
        }

        Ok(())
    }

-    fn build_request_tools(
+    fn build_request_v2(
        &self,
        model: &Arc<dyn LanguageModel>,
        user_prompt: String,
@@ -483,7 +439,7 @@ impl CodegenAlternative {

        let system_prompt = self
            .builder
-            .generate_inline_transformation_prompt_tools(
+            .generate_inline_transformation_prompt_v2(
                language_name,
                buffer,
                range.start.0..range.end.0,
@@ -493,9 +449,6 @@ impl CodegenAlternative {
        let temperature = AgentSettings::temperature_for_model(model, cx);

        let tool_input_format = model.tool_input_format();
-        let tool_choice = model
-            .supports_tool_choice(LanguageModelToolChoice::Any)
-            .then_some(LanguageModelToolChoice::Any);

        Ok(cx.spawn(async move |_cx| {
            let mut messages = vec![LanguageModelRequestMessage {
@@ -518,32 +471,35 @@ impl CodegenAlternative {

            user_message.content.push(user_prompt.into());
            messages.push(user_message);
+            dbg!(&messages);

            let tools = vec![
                LanguageModelRequestTool {
-                    name: "rewrite_section".to_string(),
-                    description: "Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<RewriteSectionInput>(tool_input_format).to_value(),
+                    name: RewriteSectionTool::name().to_string(),
+                    description: RewriteSectionTool::description().to_string(),
+                    input_schema: RewriteSectionTool::input_schema(tool_input_format).to_value(),
                },
                LanguageModelRequestTool {
-                    name: "failure_message".to_string(),
-                    description: "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<FailureMessageInput>(tool_input_format).to_value(),
+                    name: FailureMessageTool::name().to_string(),
+                    description: FailureMessageTool::description().to_string(),
+                    input_schema: FailureMessageTool::input_schema(tool_input_format).to_value(),
                },
            ];

-            LanguageModelRequest {
+            let req = LanguageModelRequest {
                thread_id: None,
                prompt_id: None,
                intent: Some(CompletionIntent::InlineAssist),
                mode: None,
                tools,
-                tool_choice,
+                tool_choice: None,
                stop: Vec::new(),
                temperature,
                messages,
                thinking_allowed: false,
-            }
+            };
+            dbg!(&req);
+            req
        }))
    }

@@ -554,8 +510,8 @@ impl CodegenAlternative {
        context_task: Shared<Task<Option<LoadedContext>>>,
        cx: &mut App,
    ) -> Result<Task<LanguageModelRequest>> {
-        if Self::use_streaming_tools(model.as_ref(), cx) {
-            return self.build_request_tools(model, user_prompt, context_task, cx);
+        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
+            return self.build_request_v2(model, user_prompt, context_task, cx);
        }

        let buffer = self.buffer.read(cx).snapshot(cx);
@@ -594,6 +550,7 @@ impl CodegenAlternative {
                range.start.0..range.end.0,
            )
            .context("generating content prompt")?;
+        dbg!(&prompt);

        let temperature = AgentSettings::temperature_for_model(model, cx);

@@ -628,14 +585,12 @@ impl CodegenAlternative {

    pub fn handle_stream(
        &mut self,
-        model: Arc<dyn LanguageModel>,
+        model_telemetry_id: String,
+        model_provider_id: String,
+        model_api_key: Option<String>,
        stream: impl 'static + Future<Output = Result<LanguageModelTextStream>>,
        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let anthropic_reporter = language_model::AnthropicEventReporter::new(&model, cx);
-        let session_id = self.session_id;
-        let model_telemetry_id = model.telemetry_id();
-        let model_provider_id = model.provider_id().to_string();
+    ) {
        let start_time = Instant::now();

        // Make a new snapshot and re-resolve anchor in case the document was modified.
@@ -650,8 +605,6 @@ impl CodegenAlternative {
            .text_for_range(self.range.start..self.range.end)
            .collect::<Rope>();

-        self.selected_text = Some(selected_text.to_string());
-
        let selection_start = self.range.start.to_point(&snapshot);

        // Start with the indentation of the first line in the selection
@@ -673,6 +626,8 @@ impl CodegenAlternative {
            }
        }

+        let http_client = cx.http_client();
+        let telemetry = self.telemetry.clone();
        let language_name = {
            let multibuffer = self.buffer.read(cx);
            let snapshot = multibuffer.snapshot(cx);
@@ -689,9 +644,15 @@ impl CodegenAlternative {
        let completion = Arc::new(Mutex::new(String::new()));
        let completion_clone = completion.clone();

-        cx.notify();
-        cx.spawn(async move |codegen, cx| {
+        dbg!("AAA 0");
+        self.generation = cx.spawn(async move |codegen, cx| {
+            dbg!("AAA 1");
            let stream = stream.await;
+            dbg!("AAA 2");
+
+            // use futures::stream::StreamExt;
+            // let all_chunks: Vec<Result<String, _>> = stream.unwrap().collect().await;
+            // dbg!(&all_chunks);

            let token_usage = stream
                .as_ref()
@@ -701,23 +662,24 @@ impl CodegenAlternative {
                .as_ref()
                .ok()
                .and_then(|stream| stream.message_id.clone());
+            dbg!("AAA 3");
            let generate = async {
                let model_telemetry_id = model_telemetry_id.clone();
                let model_provider_id = model_provider_id.clone();
                let (mut diff_tx, mut diff_rx) = mpsc::channel(1);
+                let executor = cx.background_executor().clone();
                let message_id = message_id.clone();
-                let line_based_stream_diff: Task<anyhow::Result<()>> = cx.background_spawn({
-                    let anthropic_reporter = anthropic_reporter.clone();
-                    let language_name = language_name.clone();
-                    async move {
+                dbg!("AAA 4");
+                let line_based_stream_diff: Task<anyhow::Result<()>> =
+                    cx.background_spawn(async move {
                        let mut response_latency = None;
                        let request_start = Instant::now();
+                        dbg!("AAA 5");
                        let diff = async {
                            let chunks = StripInvalidSpans::new(
                                stream?.stream.map_err(|error| error.into()),
                            );
                            futures::pin_mut!(chunks);
-
                            let mut diff = StreamingDiff::new(selected_text.to_string());
                            let mut line_diff = LineDiff::default();

@@ -726,11 +688,14 @@ impl CodegenAlternative {
                            let mut line_indent = None;
                            let mut first_line = true;

+                            dbg!("AAA 6");
                            while let Some(chunk) = chunks.next().await {
+                                dbg!("AAA 7");
                                if response_latency.is_none() {
                                    response_latency = Some(request_start.elapsed());
                                }
                                let chunk = chunk?;
+                                dbg!(&chunk);
                                completion_clone.lock().push_str(&chunk);

                                let mut lines = chunk.split('\n').peekable();
@@ -806,30 +771,27 @@ impl CodegenAlternative {
                        let result = diff.await;

                        let error_message = result.as_ref().err().map(|error| error.to_string());
-                        telemetry::event!(
-                            "Assistant Responded",
-                            kind = "inline",
-                            phase = "response",
-                            session_id = session_id.to_string(),
-                            model = model_telemetry_id,
-                            model_provider = model_provider_id,
-                            language_name = language_name.as_ref().map(|n| n.to_string()),
-                            message_id = message_id.as_deref(),
-                            response_latency = response_latency,
-                            error_message = error_message.as_deref(),
+                        report_assistant_event(
+                            AssistantEventData {
+                                conversation_id: None,
+                                message_id,
+                                kind: AssistantKind::Inline,
+                                phase: AssistantPhase::Response,
+                                model: model_telemetry_id,
+                                model_provider: model_provider_id,
+                                response_latency,
+                                error_message,
+                                language_name: language_name.map(|name| name.to_proto()),
+                            },
+                            telemetry,
+                            http_client,
+                            model_api_key,
+                            &executor,
                        );

-                        anthropic_reporter.report(language_model::AnthropicEventData {
-                            completion_type: language_model::AnthropicCompletionType::Editor,
-                            event: language_model::AnthropicEventType::Response,
-                            language_name: language_name.map(|n| n.to_string()),
-                            message_id,
-                        });
-
                        result?;
                        Ok(())
-                    }
-                });
+                    });

                while let Some((char_ops, line_ops)) = diff_rx.next().await {
                    codegen.update(cx, |codegen, cx| {
@@ -912,25 +874,8 @@ impl CodegenAlternative {
                    cx.notify();
                })
                .ok();
-        })
-    }
-
-    pub fn current_completion(&self) -> Option<String> {
-        self.completion.clone()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn current_description(&self) -> Option<String> {
-        self.description.clone()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn current_failure(&self) -> Option<String> {
-        self.failure.clone()
-    }
-
-    pub fn selected_text(&self) -> Option<&str> {
-        self.selected_text.as_deref()
+        });
+        cx.notify();
    }

    pub fn stop(&mut self, cx: &mut Context<Self>) {
@@ -1105,217 +1050,124 @@ impl CodegenAlternative {
        })
    }

-    fn handle_completion(
+    fn handle_tool_use(
        &mut self,
-        model: Arc<dyn LanguageModel>,
-        completion_stream: Task<
-            Result<
-                BoxStream<
-                    'static,
-                    Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-                >,
-                LanguageModelCompletionError,
-            >,
+        _telemetry_id: String,
+        _provider_id: String,
+        _api_key: Option<String>,
+        tool_use: impl 'static
+        + Future<
+            Output = Result<language_model::LanguageModelToolUse, LanguageModelCompletionError>,
        >,
        cx: &mut Context<Self>,
-    ) -> Task<()> {
+    ) {
        self.diff = Diff::default();
        self.status = CodegenStatus::Pending;

-        cx.notify();
-        // Leaving this in generation so that STOP equivalent events are respected even
-        // while we're still pre-processing the completion event
-        cx.spawn(async move |codegen, cx| {
-            let finish_with_status = |status: CodegenStatus, cx: &mut AsyncApp| {
-                let _ = codegen.update(cx, |this, cx| {
-                    this.status = status;
-                    cx.emit(CodegenEvent::Finished);
-                    cx.notify();
-                });
-            };
+        self.generation = cx.spawn(async move |codegen, cx| {
+            let tool_use = tool_use.await;
+            dbg!(&tool_use);

-            let mut completion_events = match completion_stream.await {
-                Ok(events) => events,
-                Err(err) => {
-                    finish_with_status(CodegenStatus::Error(err.into()), cx);
-                    return;
-                }
-            };
+            match tool_use {
+                Ok(tool_use) if tool_use.name.as_ref() == "rewrite_section" => {
+                    eprintln!("Received tool use: {:?}", tool_use);

-            enum ToolUseOutput {
-                Rewrite {
-                    text: String,
-                    description: Option<String>,
-                },
-                Failure(String),
-            }
+                    // Parse the input JSON into RewriteSectionInput
+                    match serde_json::from_value::<RewriteSectionInput>(tool_use.input) {
+                        Ok(input) => {
+                            eprintln!("Description: {}", input.description);
+                            eprintln!("Replacement text length: {}", input.replacement_text.len());

-            enum ModelUpdate {
-                Description(String),
-                Failure(String),
-            }
+                            // Store the description if non-empty
+                            let description = if !input.description.trim().is_empty() {
+                                Some(input.description.clone())
+                            } else {
+                                None
+                            };

-            let chars_read_so_far = Arc::new(Mutex::new(0usize));
-            let process_tool_use = move |tool_use: LanguageModelToolUse| -> Option<ToolUseOutput> {
-                let mut chars_read_so_far = chars_read_so_far.lock();
-                match tool_use.name.as_ref() {
-                    "rewrite_section" => {
-                        let Ok(input) =
-                            serde_json::from_value::<RewriteSectionInput>(tool_use.input)
-                        else {
-                            return None;
-                        };
-                        let text = input.replacement_text[*chars_read_so_far..].to_string();
-                        *chars_read_so_far = input.replacement_text.len();
-                        Some(ToolUseOutput::Rewrite {
-                            text,
-                            description: None,
-                        })
-                    }
-                    "failure_message" => {
-                        let Ok(mut input) =
-                            serde_json::from_value::<FailureMessageInput>(tool_use.input)
-                        else {
-                            return None;
-                        };
-                        Some(ToolUseOutput::Failure(std::mem::take(&mut input.message)))
-                    }
-                    _ => None,
-                }
-            };
+                            // Apply the replacement text to the buffer and compute diff
+                            let batch_diff_task = codegen
+                                .update(cx, |this, cx| {
+                                    this.tool_description = description;
+                                    let range = this.range.clone();
+                                    this.apply_edits(
+                                        std::iter::once((range, input.replacement_text)),
+                                        cx,
+                                    );
+                                    this.reapply_batch_diff(cx)
+                                })
+                                .ok();

-            let (message_tx, mut message_rx) = futures::channel::mpsc::unbounded::<ModelUpdate>();
-
-            cx.spawn({
-                let codegen = codegen.clone();
-                async move |cx| {
-                    while let Some(update) = message_rx.next().await {
-                        let _ = codegen.update(cx, |this, _cx| match update {
-                            ModelUpdate::Description(d) => this.description = Some(d),
-                            ModelUpdate::Failure(f) => this.failure = Some(f),
-                        });
-                    }
-                }
-            })
-            .detach();
-
-            let mut message_id = None;
-            let mut first_text = None;
-            let last_token_usage = Arc::new(Mutex::new(TokenUsage::default()));
-            let total_text = Arc::new(Mutex::new(String::new()));
-
-            loop {
-                if let Some(first_event) = completion_events.next().await {
-                    match first_event {
-                        Ok(LanguageModelCompletionEvent::StartMessage { message_id: id }) => {
-                            message_id = Some(id);
-                        }
-                        Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                            if let Some(output) = process_tool_use(tool_use) {
-                                let (text, update) = match output {
-                                    ToolUseOutput::Rewrite { text, description } => {
-                                        (Some(text), description.map(ModelUpdate::Description))
-                                    }
-                                    ToolUseOutput::Failure(message) => {
-                                        (None, Some(ModelUpdate::Failure(message)))
-                                    }
-                                };
-                                if let Some(update) = update {
-                                    let _ = message_tx.unbounded_send(update);
-                                }
-                                first_text = text;
-                                if first_text.is_some() {
-                                    break;
-                                }
+                            // Wait for the diff computation to complete
+                            if let Some(diff_task) = batch_diff_task {
+                                diff_task.await;
                            }
-                        }
-                        Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
-                            *last_token_usage.lock() = token_usage;
-                        }
-                        Ok(LanguageModelCompletionEvent::Text(text)) => {
-                            let mut lock = total_text.lock();
-                            lock.push_str(&text);
-                        }
-                        Ok(e) => {
-                            log::warn!("Unexpected event: {:?}", e);
-                            break;
+
+                            let _ = codegen.update(cx, |this, cx| {
+                                this.status = CodegenStatus::Done;
+                                cx.emit(CodegenEvent::Finished);
+                                cx.notify();
+                            });
+                            return;
                        }
                        Err(e) => {
-                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            break;
+                            eprintln!("Failed to parse RewriteSectionInput: {:?}", e);
+                            let _ = codegen.update(cx, |this, cx| {
+                                this.status = CodegenStatus::Error(e.into());
+                                cx.emit(CodegenEvent::Finished);
+                                cx.notify();
+                            });
+                            return;
                        }
                    }
                }
-            }
+                Ok(tool_use) if tool_use.name.as_ref() == "failure_message" => {
+                    // Handle failure message tool use
+                    match serde_json::from_value::<FailureMessageInput>(tool_use.input) {
+                        Ok(input) => {
+                            eprintln!("Failure message: {}", input.message);

-            let Some(first_text) = first_text else {
-                finish_with_status(CodegenStatus::Done, cx);
-                return;
-            };
-
-            let move_last_token_usage = last_token_usage.clone();
-
-            let text_stream = Box::pin(futures::stream::once(async { Ok(first_text) }).chain(
-                completion_events.filter_map(move |e| {
-                    let process_tool_use = process_tool_use.clone();
-                    let last_token_usage = move_last_token_usage.clone();
-                    let total_text = total_text.clone();
-                    let mut message_tx = message_tx.clone();
-                    async move {
-                        match e {
-                            Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                                let Some(output) = process_tool_use(tool_use) else {
-                                    return None;
-                                };
-                                let (text, update) = match output {
-                                    ToolUseOutput::Rewrite { text, description } => {
-                                        (Some(text), description.map(ModelUpdate::Description))
-                                    }
-                                    ToolUseOutput::Failure(message) => {
-                                        (None, Some(ModelUpdate::Failure(message)))
-                                    }
-                                };
-                                if let Some(update) = update {
-                                    let _ = message_tx.send(update).await;
-                                }
-                                text.map(Ok)
-                            }
-                            Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
-                                *last_token_usage.lock() = token_usage;
-                                None
-                            }
-                            Ok(LanguageModelCompletionEvent::Text(text)) => {
-                                let mut lock = total_text.lock();
-                                lock.push_str(&text);
-                                None
-                            }
-                            Ok(LanguageModelCompletionEvent::Stop(_reason)) => None,
-                            e => {
-                                log::error!("UNEXPECTED EVENT {:?}", e);
-                                None
-                            }
+                            let _ = codegen.update(cx, |this, cx| {
+                                // Store the failure message as the tool description
+                                this.tool_description = Some(input.message);
+                                this.status = CodegenStatus::Done;
+                                cx.emit(CodegenEvent::Finished);
+                                cx.notify();
+                            });
+                            return;
+                        }
+                        Err(e) => {
+                            eprintln!("Failed to parse FailureMessageInput: {:?}", e);
+                            let _ = codegen.update(cx, |this, cx| {
+                                this.status = CodegenStatus::Error(e.into());
+                                cx.emit(CodegenEvent::Finished);
+                                cx.notify();
+                            });
+                            return;
                        }
                    }
-                }),
-            ));
+                }
+                Ok(tool_use) => {
+                    eprintln!("Unexpected tool {}", tool_use.name);

-            let language_model_text_stream = LanguageModelTextStream {
-                message_id: message_id,
-                stream: text_stream,
-                last_token_usage,
-            };
-
-            let Some(task) = codegen
-                .update(cx, move |codegen, cx| {
-                    codegen.handle_stream(model, async { Ok(language_model_text_stream) }, cx)
-                })
-                .ok()
-            else {
-                return;
-            };
-
-            task.await;
-        })
+                    let _ = codegen.update(cx, |this, cx| {
+                        this.status = CodegenStatus::Done;
+                        cx.emit(CodegenEvent::Finished);
+                    });
+                    return;
+                }
+                Err(e) => {
+                    eprintln!("Failed to get tool use: {:?}", e);
+                    let _ = codegen.update(cx, |this, cx| {
+                        this.status = CodegenStatus::Error(e.into());
+                        cx.emit(CodegenEvent::Finished);
+                        cx.notify();
+                    });
+                    return;
+                }
+            }
+        });
+        cx.notify();
    }
 }

@@ -1478,10 +1330,8 @@ mod tests {
    };
    use gpui::TestAppContext;
    use indoc::indoc;
-    use language::{Buffer, Point};
-    use language_model::fake_provider::FakeLanguageModel;
+    use language::{Buffer, Language, LanguageConfig, LanguageMatcher, Point, tree_sitter_rust};
    use language_model::{LanguageModelRegistry, TokenUsage};
-    use languages::rust_lang;
    use rand::prelude::*;
    use settings::SettingsStore;
    use std::{future, sync::Arc};
@@ -1498,7 +1348,7 @@ mod tests {
                }
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1510,8 +1360,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1560,7 +1410,7 @@ mod tests {
                le
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1572,8 +1422,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1624,7 +1474,7 @@ mod tests {
            "  \n",
            "}\n" //
        );
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1636,8 +1486,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1700,8 +1550,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1740,7 +1590,7 @@ mod tests {
                let x = 0;
            }
        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
+        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let range = buffer.read_with(cx, |buffer, cx| {
            let snapshot = buffer.snapshot(cx);
@@ -1752,8 +1602,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                false,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1842,10 +1692,11 @@ mod tests {
        cx: &mut TestAppContext,
    ) -> mpsc::UnboundedSender<String> {
        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        let model = Arc::new(FakeLanguageModel::default());
        codegen.update(cx, |codegen, cx| {
-            codegen.generation = codegen.handle_stream(
-                model,
+            codegen.handle_stream(
+                String::new(),
+                String::new(),
+                None,
                future::ready(Ok(LanguageModelTextStream {
                    message_id: None,
                    stream: chunks_rx.map(Ok).boxed(),
@@ -1856,4 +1707,27 @@ mod tests {
        });
        chunks_tx
    }
+
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+            (call_expression) @indent
+            (field_expression) @indent
+            (_ "(" ")" @end) @indent
+            (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap()
+    }
 }
--- a/crates/agent_ui/src/evals.rs
+++ b/crates/agent_ui/src/evals.rs
@@ -0,0 +1,88 @@
+use std::{str::FromStr, sync::Arc};
+// use std::sync::Arc;
+
+use crate::inline_assistant::test::run_inline_assistant_test;
+
+use eval_utils::EvalOutput;
+use gpui::TestAppContext;
+use language_model::{LanguageModelRegistry, SelectedModel};
+use rand::{SeedableRng as _, rngs::StdRng};
+
+#[test]
+#[cfg_attr(not(feature = "unit-eval"), ignore)]
+fn eval_single_cursor_edit() {
+    eval_utils::eval(
+        1,
+        1.0,
+        0.0,
+        Arc::new(|tx| {
+            run_eval(
+                &EvalInput {
+                    prompt: "Rename this variable to buffer_text".to_string(),
+                    text: indoc::indoc! {"
+                        struct EvalExampleStruct {
+                            text: Strˇing,
+                            prompt: String,
+                        }
+                    "}
+                    .to_string(),
+                },
+                tx,
+                &|_, output| {
+                    EvalOutput::assert(
+                        format!("Failed to rename variable, output: {}", output),
+                        output
+                            == indoc::indoc! {"
+                            struct EvalExampleStruct {
+                                buffer_text: String,
+                                prompt: String,
+                            }
+                        "},
+                    )
+                },
+            );
+        }),
+    );
+}
+
+struct EvalInput {
+    text: String,
+    prompt: String,
+}
+
+fn run_eval(
+    input: &EvalInput,
+    tx: std::sync::mpsc::Sender<eval_utils::EvalOutput>,
+    judge: &dyn Fn(&EvalInput, &str) -> eval_utils::EvalOutput,
+) {
+    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
+    let mut cx = TestAppContext::build(dispatcher, None);
+
+    let buffer_text = run_inline_assistant_test(
+        input.text.clone(),
+        input.prompt.clone(),
+        |cx| {
+            // Reconfigure to use a real model instead of the fake one
+            let model_name = std::env::var("ZED_AGENT_MODEL")
+                .unwrap_or("anthropic/claude-sonnet-4-latest".into());
+
+            let selected_model = SelectedModel::from_str(&model_name)
+                .expect("Invalid model format. Use 'provider/model-id'");
+
+            log::info!("Selected model: {selected_model:?}");
+
+            cx.update(|_, cx| {
+                LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                    registry.select_inline_assistant_model(Some(&selected_model), cx);
+                });
+            });
+        },
+        |_cx| {
+            log::info!("Waiting for actual response from the LLM...");
+        },
+        &mut cx,
+    );
+
+    let output = judge(input, &buffer_text);
+    tx.send(output).ok();
+}
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -1,11 +1,8 @@
-use language_model::AnthropicEventData;
-use language_model::report_anthropic_event;
 use std::cmp;
 use std::mem;
 use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
-use uuid::Uuid;

 use crate::context::load_context;
 use crate::mention_set::MentionSet;
@@ -18,6 +15,7 @@ use crate::{
 use agent::HistoryStore;
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
+use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
 use editor::EditorSnapshot;
 use editor::MultiBufferOffset;
@@ -40,13 +38,15 @@ use gpui::{
    WeakEntity, Window, point,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};
+use language_model::{
+    ConfigurationError, ConfiguredModel, LanguageModelRegistry, report_assistant_event,
+};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, DisableAiSettings, LspAction, Project, ProjectTransaction};
 use prompt_store::{PromptBuilder, PromptStore};
 use settings::{Settings, SettingsStore};
-
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
@@ -54,8 +54,13 @@ use util::{RangeExt, ResultExt, maybe};
 use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
 use zed_actions::agent::OpenSettings;

-pub fn init(fs: Arc<dyn Fs>, prompt_builder: Arc<PromptBuilder>, cx: &mut App) {
-    cx.set_global(InlineAssistant::new(fs, prompt_builder));
+pub fn init(
+    fs: Arc<dyn Fs>,
+    prompt_builder: Arc<PromptBuilder>,
+    telemetry: Arc<Telemetry>,
+    cx: &mut App,
+) {
+    cx.set_global(InlineAssistant::new(fs, prompt_builder, telemetry));

    cx.observe_global::<SettingsStore>(|cx| {
        if DisableAiSettings::get_global(cx).disable_ai {
@@ -95,6 +100,7 @@ pub struct InlineAssistant {
    confirmed_assists: HashMap<InlineAssistId, Entity<CodegenAlternative>>,
    prompt_history: VecDeque<String>,
    prompt_builder: Arc<PromptBuilder>,
+    telemetry: Arc<Telemetry>,
    fs: Arc<dyn Fs>,
    _inline_assistant_completions: Option<mpsc::UnboundedSender<anyhow::Result<InlineAssistId>>>,
 }
@@ -102,7 +108,11 @@ pub struct InlineAssistant {
 impl Global for InlineAssistant {}

 impl InlineAssistant {
-    pub fn new(fs: Arc<dyn Fs>, prompt_builder: Arc<PromptBuilder>) -> Self {
+    pub fn new(
+        fs: Arc<dyn Fs>,
+        prompt_builder: Arc<PromptBuilder>,
+        telemetry: Arc<Telemetry>,
+    ) -> Self {
        Self {
            next_assist_id: InlineAssistId::default(),
            next_assist_group_id: InlineAssistGroupId::default(),
@@ -112,11 +122,20 @@ impl InlineAssistant {
            confirmed_assists: HashMap::default(),
            prompt_history: VecDeque::default(),
            prompt_builder,
+            telemetry,
            fs,
            _inline_assistant_completions: None,
        }
    }

+    #[cfg(any(test, feature = "test-support"))]
+    pub fn set_completion_receiver(
+        &mut self,
+        sender: mpsc::UnboundedSender<anyhow::Result<InlineAssistId>>,
+    ) {
+        self._inline_assistant_completions = Some(sender);
+    }
+
    pub fn register_workspace(
        &mut self,
        workspace: &Entity<Workspace>,
@@ -438,25 +457,17 @@ impl InlineAssistant {
            codegen_ranges.push(anchor_range);

            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
-                telemetry::event!(
-                    "Assistant Invoked",
-                    kind = "inline",
-                    phase = "invoked",
-                    model = model.model.telemetry_id(),
-                    model_provider = model.provider.id().to_string(),
-                    language_name = buffer.language().map(|language| language.name().to_proto())
-                );
-
-                report_anthropic_event(
-                    &model.model,
-                    AnthropicEventData {
-                        completion_type: language_model::AnthropicCompletionType::Editor,
-                        event: language_model::AnthropicEventType::Invoked,
-                        language_name: buffer.language().map(|language| language.name().to_proto()),
-                        message_id: None,
-                    },
-                    cx,
-                );
+                self.telemetry.report_assistant_event(AssistantEventData {
+                    conversation_id: None,
+                    kind: AssistantKind::Inline,
+                    phase: AssistantPhase::Invoked,
+                    message_id: None,
+                    model: model.model.telemetry_id(),
+                    model_provider: model.provider.id().to_string(),
+                    response_latency: None,
+                    error_message: None,
+                    language_name: buffer.language().map(|language| language.name().to_proto()),
+                });
            }
        }

@@ -480,7 +491,6 @@ impl InlineAssistant {
        let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));

        let assist_group_id = self.next_assist_group_id.post_inc();
-        let session_id = Uuid::new_v4();
        let prompt_buffer = cx.new(|cx| {
            MultiBuffer::singleton(
                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
@@ -498,7 +508,7 @@ impl InlineAssistant {
                    editor.read(cx).buffer().clone(),
                    range.clone(),
                    initial_transaction_id,
-                    session_id,
+                    self.telemetry.clone(),
                    self.prompt_builder.clone(),
                    cx,
                )
@@ -512,7 +522,6 @@ impl InlineAssistant {
                    self.prompt_history.clone(),
                    prompt_buffer.clone(),
                    codegen.clone(),
-                    session_id,
                    self.fs.clone(),
                    thread_store.clone(),
                    prompt_store.clone(),
@@ -1060,6 +1069,8 @@ impl InlineAssistant {
            }

            let active_alternative = assist.codegen.read(cx).active_alternative().clone();
+            let message_id = active_alternative.read(cx).message_id.clone();
+
            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
                let language_name = assist.editor.upgrade().and_then(|editor| {
                    let multibuffer = editor.read(cx).buffer().read(cx);
@@ -1068,49 +1079,28 @@ impl InlineAssistant {
                    ranges
                        .first()
                        .and_then(|(buffer, _, _)| buffer.language())
-                        .map(|language| language.name().0.to_string())
+                        .map(|language| language.name())
                });
-
-                let codegen = assist.codegen.read(cx);
-                let session_id = codegen.session_id();
-                let message_id = active_alternative.read(cx).message_id.clone();
-                let model_telemetry_id = model.model.telemetry_id();
-                let model_provider_id = model.model.provider_id().to_string();
-
-                let (phase, event_type, anthropic_event_type) = if undo {
-                    (
-                        "rejected",
-                        "Assistant Response Rejected",
-                        language_model::AnthropicEventType::Reject,
-                    )
-                } else {
-                    (
-                        "accepted",
-                        "Assistant Response Accepted",
-                        language_model::AnthropicEventType::Accept,
-                    )
-                };
-
-                telemetry::event!(
-                    event_type,
-                    phase,
-                    session_id = session_id.to_string(),
-                    kind = "inline",
-                    model = model_telemetry_id,
-                    model_provider = model_provider_id,
-                    language_name = language_name,
-                    message_id = message_id.as_deref(),
-                );
-
-                report_anthropic_event(
-                    &model.model,
-                    language_model::AnthropicEventData {
-                        completion_type: language_model::AnthropicCompletionType::Editor,
-                        event: anthropic_event_type,
-                        language_name,
+                report_assistant_event(
+                    AssistantEventData {
+                        conversation_id: None,
+                        kind: AssistantKind::Inline,
                        message_id,
+                        phase: if undo {
+                            AssistantPhase::Rejected
+                        } else {
+                            AssistantPhase::Accepted
+                        },
+                        model: model.model.telemetry_id(),
+                        model_provider: model.model.provider_id().to_string(),
+                        response_latency: None,
+                        error_message: None,
+                        language_name: language_name.map(|name| name.to_proto()),
                    },
-                    cx,
+                    Some(self.telemetry.clone()),
+                    cx.http_client(),
+                    model.model.api_key(cx),
+                    cx.background_executor(),
                );
            }

@@ -1142,7 +1132,7 @@ impl InlineAssistant {
            let mut to_remove = decorations.removed_line_block_ids;
            to_remove.insert(decorations.prompt_block_id);
            to_remove.insert(decorations.end_block_id);
-            if let Some(tool_description_block_id) = decorations.model_explanation {
+            if let Some(tool_description_block_id) = decorations.tool_description_block_id {
                to_remove.insert(tool_description_block_id);
            }
            editor.remove_blocks(to_remove, None, cx);
@@ -1465,8 +1455,60 @@ impl InlineAssistant {
        let old_snapshot = codegen.snapshot(cx);
        let old_buffer = codegen.old_buffer(cx);
        let deleted_row_ranges = codegen.diff(cx).deleted_row_ranges.clone();
+        let tool_description = codegen.tool_description(cx).map(|s| s.to_string());

        editor.update(cx, |editor, cx| {
+            // Update tool description block
+            if let Some(description) = tool_description {
+                if let Some(block_id) = decorations.tool_description_block_id {
+                    editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
+                    let new_block_id = editor.insert_blocks(
+                        [BlockProperties {
+                            style: BlockStyle::Flex,
+                            placement: BlockPlacement::Below(assist.range.end),
+                            height: Some(1),
+                            render: Arc::new({
+                                let description = description.clone();
+                                move |cx| {
+                                    div()
+                                        .w_full()
+                                        .py_1()
+                                        .px_2()
+                                        .bg(cx.theme().colors().editor_background)
+                                        .border_y_1()
+                                        .border_color(cx.theme().status().info_border)
+                                        .child(
+                                            Label::new(description.clone())
+                                                .color(Color::Muted)
+                                                .size(LabelSize::Small),
+                                        )
+                                        .into_any_element()
+                                }
+                            }),
+                            priority: 0,
+                        }],
+                        None,
+                        cx,
+                    );
+                    decorations.tool_description_block_id = new_block_id.into_iter().next();
+                }
+            } else if let Some(block_id) = decorations.tool_description_block_id {
+                // Hide the block if there's no description
+                editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
+                let new_block_id = editor.insert_blocks(
+                    [BlockProperties {
+                        style: BlockStyle::Flex,
+                        placement: BlockPlacement::Below(assist.range.end),
+                        height: Some(0),
+                        render: Arc::new(|_cx| div().into_any_element()),
+                        priority: 0,
+                    }],
+                    None,
+                    cx,
+                );
+                decorations.tool_description_block_id = new_block_id.into_iter().next();
+            }
+
            let old_blocks = mem::take(&mut decorations.removed_line_block_ids);
            editor.remove_blocks(old_blocks, None, cx);

@@ -1585,27 +1627,6 @@ impl InlineAssistant {
                .map(InlineAssistTarget::Terminal)
        }
    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn set_completion_receiver(
-        &mut self,
-        sender: mpsc::UnboundedSender<anyhow::Result<InlineAssistId>>,
-    ) {
-        self._inline_assistant_completions = Some(sender);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn get_codegen(
-        &mut self,
-        assist_id: InlineAssistId,
-        cx: &mut App,
-    ) -> Option<Entity<CodegenAlternative>> {
-        self.assists.get(&assist_id).map(|inline_assist| {
-            inline_assist
-                .codegen
-                .update(cx, |codegen, _cx| codegen.active_alternative().clone())
-        })
-    }
 }

 struct EditorInlineAssists {
@@ -1755,7 +1776,7 @@ impl InlineAssist {
                prompt_block_id,
                prompt_editor: prompt_editor.clone(),
                removed_line_block_ids: Default::default(),
-                model_explanation: Some(tool_description_block_id),
+                tool_description_block_id: Some(tool_description_block_id),
                end_block_id,
            }),
            range,
@@ -1859,7 +1880,7 @@ struct InlineAssistDecorations {
    prompt_block_id: CustomBlockId,
    prompt_editor: Entity<PromptEditor<BufferCodegen>>,
    removed_line_block_ids: HashSet<CustomBlockId>,
-    model_explanation: Option<CustomBlockId>,
+    tool_description_block_id: Option<CustomBlockId>,
    end_block_id: CustomBlockId,
 }

@@ -2027,10 +2048,8 @@ fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
    }
 }

-#[cfg(any(test, feature = "unit-eval"))]
-#[cfg_attr(not(test), allow(dead_code))]
+#[cfg(any(test, feature = "test-support"))]
 pub mod test {
-
    use std::sync::Arc;

    use agent::HistoryStore;
@@ -2041,6 +2060,7 @@ pub mod test {
    use futures::channel::mpsc;
    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
    use language::Buffer;
+    use language_model::LanguageModelRegistry;
    use project::Project;
    use prompt_store::PromptBuilder;
    use smol::stream::StreamExt as _;
@@ -2049,32 +2069,13 @@ pub mod test {

    use crate::InlineAssistant;

-    #[derive(Debug)]
-    pub enum InlineAssistantOutput {
-        Success {
-            completion: Option<String>,
-            description: Option<String>,
-            full_buffer_text: String,
-        },
-        Failure {
-            failure: String,
-        },
-        // These fields are used for logging
-        #[allow(unused)]
-        Malformed {
-            completion: Option<String>,
-            description: Option<String>,
-            failure: Option<String>,
-        },
-    }
-
    pub fn run_inline_assistant_test<SetupF, TestF>(
        base_buffer: String,
        prompt: String,
        setup: SetupF,
        test: TestF,
        cx: &mut TestAppContext,
-    ) -> InlineAssistantOutput
+    ) -> String
    where
        SetupF: FnOnce(&mut gpui::VisualTestContext),
        TestF: FnOnce(&mut gpui::VisualTestContext),
@@ -2087,7 +2088,8 @@ pub mod test {
            cx.set_http_client(http);
            Client::production(cx)
        });
-        let mut inline_assistant = InlineAssistant::new(fs.clone(), prompt_builder);
+        let mut inline_assistant =
+            InlineAssistant::new(fs.clone(), prompt_builder, client.telemetry().clone());

        let (tx, mut completion_rx) = mpsc::unbounded();
        inline_assistant.set_completion_receiver(tx);
@@ -2155,7 +2157,6 @@ pub mod test {
                        cx,
                    )
                    .unwrap();
-
                inline_assistant.start_assist(assist_id, window, cx);
            });

@@ -2166,217 +2167,39 @@ pub mod test {

        test(cx);

-        let assist_id = cx
-            .executor()
-            .block_test(async { completion_rx.next().await })
-            .unwrap()
-            .unwrap();
+        cx.executor()
+            .block_test(async { completion_rx.next().await });

-        let (completion, description, failure) = cx.update(|_, cx| {
-            InlineAssistant::update_global(cx, |inline_assistant, cx| {
-                let codegen = inline_assistant.get_codegen(assist_id, cx).unwrap();
+        buffer.read_with(cx, |buffer, _| buffer.text())
+    }

-                let completion = codegen.read(cx).current_completion();
-                let description = codegen.read(cx).current_description();
-                let failure = codegen.read(cx).current_failure();
+    #[allow(unused)]
+    fn test_inline_assistant(
+        base_buffer: &'static str,
+        llm_output: &'static str, // vec<&'static str>
+        cx: &mut TestAppContext,
+    ) -> String {
+        run_inline_assistant_test(
+            base_buffer.to_string(),
+            "Prompt doesn't matter because we're using a fake model".to_string(),
+            |cx| {
+                cx.update(|_, cx| LanguageModelRegistry::test(cx));
+            },
+            |cx| {
+                let fake_model = cx.update(|_, cx| {
+                    LanguageModelRegistry::global(cx)
+                        .update(cx, |registry, _| registry.fake_model())
+                });
+                let fake = fake_model.as_fake();

-                (completion, description, failure)
-            })
-        });
+                // let fake = fake_model;
+                fake.send_last_completion_stream_text_chunk(llm_output.to_string());
+                fake.end_last_completion_stream();

-        if failure.is_some() && (completion.is_some() || description.is_some()) {
-            InlineAssistantOutput::Malformed {
-                completion,
-                description,
-                failure,
-            }
-        } else if let Some(failure) = failure {
-            InlineAssistantOutput::Failure { failure }
-        } else {
-            InlineAssistantOutput::Success {
-                completion,
-                description,
-                full_buffer_text: buffer.read_with(cx, |buffer, _| buffer.text()),
-            }
-        }
-    }
-}
-
-#[cfg(any(test, feature = "unit-eval"))]
-#[cfg_attr(not(test), allow(dead_code))]
-pub mod evals {
-    use std::str::FromStr;
-
-    use eval_utils::{EvalOutput, NoProcessor};
-    use gpui::TestAppContext;
-    use language_model::{LanguageModelRegistry, SelectedModel};
-    use rand::{SeedableRng as _, rngs::StdRng};
-
-    use crate::inline_assistant::test::{InlineAssistantOutput, run_inline_assistant_test};
-
-    #[test]
-    #[cfg_attr(not(feature = "unit-eval"), ignore)]
-    fn eval_single_cursor_edit() {
-        run_eval(
-            20,
-            1.0,
-            "Rename this variable to buffer_text".to_string(),
-            indoc::indoc! {"
-                struct EvalExampleStruct {
-                    text: Strˇing,
-                    prompt: String,
-                }
-            "}
-            .to_string(),
-            exact_buffer_match(indoc::indoc! {"
-                struct EvalExampleStruct {
-                    buffer_text: String,
-                    prompt: String,
-                }
-            "}),
-        );
-    }
-
-    #[test]
-    #[cfg_attr(not(feature = "unit-eval"), ignore)]
-    fn eval_cant_do() {
-        run_eval(
-            20,
-            0.95,
-            "Rename the struct to EvalExampleStructNope",
-            indoc::indoc! {"
-                struct EvalExampleStruct {
-                    text: Strˇing,
-                    prompt: String,
-                }
-            "},
-            uncertain_output,
-        );
-    }
-
-    #[test]
-    #[cfg_attr(not(feature = "unit-eval"), ignore)]
-    fn eval_unclear() {
-        run_eval(
-            20,
-            0.95,
-            "Make exactly the change I want you to make",
-            indoc::indoc! {"
-                struct EvalExampleStruct {
-                    text: Strˇing,
-                    prompt: String,
-                }
-            "},
-            uncertain_output,
-        );
-    }
-
-    fn run_eval(
-        iterations: usize,
-        expected_pass_ratio: f32,
-        prompt: impl Into<String>,
-        buffer: impl Into<String>,
-        judge: impl Fn(InlineAssistantOutput) -> eval_utils::EvalOutput<()> + Send + Sync + 'static,
-    ) {
-        let buffer = buffer.into();
-        let prompt = prompt.into();
-
-        eval_utils::eval(iterations, expected_pass_ratio, NoProcessor, move || {
-            let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
-            let mut cx = TestAppContext::build(dispatcher, None);
-            cx.skip_drawing();
-
-            let output = run_inline_assistant_test(
-                buffer.clone(),
-                prompt.clone(),
-                |cx| {
-                    // Reconfigure to use a real model instead of the fake one
-                    let model_name = std::env::var("ZED_AGENT_MODEL")
-                        .unwrap_or("anthropic/claude-sonnet-4-latest".into());
-
-                    let selected_model = SelectedModel::from_str(&model_name)
-                        .expect("Invalid model format. Use 'provider/model-id'");
-
-                    log::info!("Selected model: {selected_model:?}");
-
-                    cx.update(|_, cx| {
-                        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                            registry.select_inline_assistant_model(Some(&selected_model), cx);
-                        });
-                    });
-                },
-                |_cx| {
-                    log::info!("Waiting for actual response from the LLM...");
-                },
-                &mut cx,
-            );
-
-            cx.quit();
-
-            judge(output)
-        });
-    }
-
-    fn uncertain_output(output: InlineAssistantOutput) -> EvalOutput<()> {
-        match &output {
-            o @ InlineAssistantOutput::Success {
-                completion,
-                description,
-                ..
-            } => {
-                if description.is_some() && completion.is_none() {
-                    EvalOutput::passed(format!(
-                        "Assistant produced no completion, but a description:\n{}",
-                        description.as_ref().unwrap()
-                    ))
-                } else {
-                    EvalOutput::failed(format!("Assistant produced a completion:\n{:?}", o))
-                }
-            }
-            InlineAssistantOutput::Failure {
-                failure: error_message,
-            } => EvalOutput::passed(format!(
-                "Assistant produced a failure message: {}",
-                error_message
-            )),
-            o @ InlineAssistantOutput::Malformed { .. } => {
-                EvalOutput::failed(format!("Assistant produced a malformed response:\n{:?}", o))
-            }
-        }
-    }
-
-    fn exact_buffer_match(
-        correct_output: impl Into<String>,
-    ) -> impl Fn(InlineAssistantOutput) -> EvalOutput<()> {
-        let correct_output = correct_output.into();
-        move |output| match output {
-            InlineAssistantOutput::Success {
-                description,
-                full_buffer_text,
-                ..
-            } => {
-                if full_buffer_text == correct_output && description.is_none() {
-                    EvalOutput::passed("Assistant output matches")
-                } else if full_buffer_text == correct_output {
-                    EvalOutput::failed(format!(
-                        "Assistant output produced an unescessary description description:\n{:?}",
-                        description
-                    ))
-                } else {
-                    EvalOutput::failed(format!(
-                        "Assistant output does not match expected output:\n{:?}\ndescription:\n{:?}",
-                        full_buffer_text, description
-                    ))
-                }
-            }
-            o @ InlineAssistantOutput::Failure { .. } => EvalOutput::failed(format!(
-                "Assistant output does not match expected output: {:?}",
-                o
-            )),
-            o @ InlineAssistantOutput::Malformed { .. } => EvalOutput::failed(format!(
-                "Assistant output does not match expected output: {:?}",
-                o
-            )),
-        }
+                // Run again to process the model's response
+                cx.run_until_parked();
+            },
+            cx,
+        )
    }
 }
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -8,14 +8,12 @@ use editor::{
    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
    actions::{MoveDown, MoveUp},
 };
-use feature_flags::{FeatureFlagAppExt, InlineAssistantUseToolFeatureFlag};
 use fs::Fs;
 use gpui::{
-    AnyElement, App, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, TextStyle, TextStyleRefinement, WeakEntity, Window, actions,
+    AnyElement, App, Context, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable,
+    Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
 use parking_lot::Mutex;
 use project::Project;
 use prompt_store::PromptStore;
@@ -27,13 +25,11 @@ use std::sync::Arc;
 use theme::ThemeSettings;
 use ui::utils::WithRemSize;
 use ui::{IconButtonShape, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
-use uuid::Uuid;
-use workspace::notifications::NotificationId;
-use workspace::{Toast, Workspace};
+use workspace::Workspace;
 use zed_actions::agent::ToggleModelSelector;

 use crate::agent_model_selector::AgentModelSelector;
-use crate::buffer_codegen::{BufferCodegen, CodegenAlternative};
+use crate::buffer_codegen::BufferCodegen;
 use crate::completion_provider::{
    PromptCompletionProvider, PromptCompletionProviderDelegate, PromptContextType,
 };
@@ -42,19 +38,6 @@ use crate::mention_set::{MentionSet, crease_for_mention};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};

-actions!(inline_assistant, [ThumbsUpResult, ThumbsDownResult]);
-
-enum CompletionState {
-    Pending,
-    Generated { completion_text: Option<String> },
-    Rated,
-}
-
-struct SessionState {
-    session_id: Uuid,
-    completion: CompletionState,
-}
-
 pub struct PromptEditor<T> {
    pub editor: Entity<Editor>,
    mode: PromptEditorMode,
@@ -70,7 +53,6 @@ pub struct PromptEditor<T> {
    _codegen_subscription: Subscription,
    editor_subscriptions: Vec<Subscription>,
    show_rate_limit_notice: bool,
-    session_state: SessionState,
    _phantom: std::marker::PhantomData<T>,
 }

@@ -83,7 +65,7 @@ impl<T: 'static> Render for PromptEditor<T> {

        const RIGHT_PADDING: Pixels = px(9.);

-        let (left_gutter_width, right_padding, explanation) = match &self.mode {
+        let (left_gutter_width, right_padding) = match &self.mode {
            PromptEditorMode::Buffer {
                id: _,
                codegen,
@@ -101,23 +83,17 @@ impl<T: 'static> Render for PromptEditor<T> {
                let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
                let right_padding = editor_margins.right + RIGHT_PADDING;

-                let active_alternative = codegen.active_alternative().read(cx);
-                let explanation = active_alternative
-                    .description
-                    .clone()
-                    .or_else(|| active_alternative.failure.clone());
-
-                (left_gutter_width, right_padding, explanation)
+                (left_gutter_width, right_padding)
            }
            PromptEditorMode::Terminal { .. } => {
                // Give the equivalent of the same left-padding that we're using on the right
-                (Pixels::from(40.0), Pixels::from(24.), None)
+                (Pixels::from(40.0), Pixels::from(24.))
            }
        };

        let bottom_padding = match &self.mode {
            PromptEditorMode::Buffer { .. } => rems_from_px(2.0),
-            PromptEditorMode::Terminal { .. } => rems_from_px(4.0),
+            PromptEditorMode::Terminal { .. } => rems_from_px(8.0),
        };

        buttons.extend(self.render_buttons(window, cx));
@@ -135,33 +111,22 @@ impl<T: 'static> Render for PromptEditor<T> {
                this.trigger_completion_menu(window, cx);
            }));

-        let markdown = window.use_state(cx, |_, cx| Markdown::new("".into(), None, None, cx));
-
-        if let Some(explanation) = &explanation {
-            markdown.update(cx, |markdown, cx| {
-                markdown.reset(SharedString::from(explanation), cx);
-            });
-        }
-
-        let explanation_label = self
-            .render_markdown(markdown, markdown_style(window, cx))
-            .into_any_element();
-
        v_flex()
            .key_context("PromptEditor")
            .capture_action(cx.listener(Self::paste))
+            .bg(cx.theme().colors().editor_background)
            .block_mouse_except_scroll()
+            .gap_0p5()
+            .border_y_1()
+            .border_color(cx.theme().status().info_border)
            .size_full()
            .pt_0p5()
            .pb(bottom_padding)
            .pr(right_padding)
-            .gap_0p5()
-            .justify_center()
-            .border_y_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
            .child(
                h_flex()
+                    .items_start()
+                    .cursor(CursorStyle::Arrow)
                    .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
                        this.model_selector
                            .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
@@ -170,20 +135,18 @@ impl<T: 'static> Render for PromptEditor<T> {
                    .on_action(cx.listener(Self::cancel))
                    .on_action(cx.listener(Self::move_up))
                    .on_action(cx.listener(Self::move_down))
-                    .on_action(cx.listener(Self::thumbs_up))
-                    .on_action(cx.listener(Self::thumbs_down))
                    .capture_action(cx.listener(Self::cycle_prev))
                    .capture_action(cx.listener(Self::cycle_next))
                    .child(
                        WithRemSize::new(ui_font_size)
-                            .h_full()
-                            .w(left_gutter_width)
                            .flex()
                            .flex_row()
                            .flex_shrink_0()
                            .items_center()
+                            .h_full()
+                            .w(left_gutter_width)
                            .justify_center()
-                            .gap_1()
+                            .gap_2()
                            .child(self.render_close_button(cx))
                            .map(|el| {
                                let CodegenStatus::Error(error) = self.codegen_status(cx) else {
@@ -214,83 +177,26 @@ impl<T: 'static> Render for PromptEditor<T> {
                                    .flex_row()
                                    .items_center()
                                    .gap_1()
-                                    .child(add_context_button)
-                                    .child(self.model_selector.clone())
                                    .children(buttons),
                            ),
                    ),
            )
-            .when_some(explanation, |this, _| {
-                this.child(
-                    h_flex()
-                        .size_full()
-                        .justify_center()
-                        .child(div().w(left_gutter_width + px(6.)))
-                        .child(
-                            div()
-                                .size_full()
-                                .min_w_0()
-                                .pt(rems_from_px(3.))
-                                .pl_0p5()
-                                .flex_1()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(explanation_label),
-                        ),
-                )
-            })
-    }
-}
-
-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        color: Some(colors.text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: colors.element_selection_background,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            background_color: Some(colors.editor_foreground.opacity(0.08)),
-            ..Default::default()
-        },
-        ..Default::default()
+            .child(
+                WithRemSize::new(ui_font_size)
+                    .flex()
+                    .flex_row()
+                    .items_center()
+                    .child(h_flex().flex_shrink_0().w(left_gutter_width))
+                    .child(
+                        h_flex()
+                            .w_full()
+                            .pl_1()
+                            .items_start()
+                            .justify_between()
+                            .child(add_context_button)
+                            .child(self.model_selector.clone()),
+                    ),
+            )
    }
 }

@@ -448,7 +354,6 @@ impl<T: 'static> PromptEditor<T> {
                }

                self.edited_since_done = true;
-                self.session_state.completion = CompletionState::Pending;
                cx.notify();
            }
            EditorEvent::Blurred => {
@@ -520,207 +425,22 @@ impl<T: 'static> PromptEditor<T> {
    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
        match self.codegen_status(cx) {
            CodegenStatus::Idle => {
-                self.fire_started_telemetry(cx);
                cx.emit(PromptEditorEvent::StartRequested);
            }
            CodegenStatus::Pending => {}
            CodegenStatus::Done => {
                if self.edited_since_done {
-                    self.fire_started_telemetry(cx);
                    cx.emit(PromptEditorEvent::StartRequested);
                } else {
                    cx.emit(PromptEditorEvent::ConfirmRequested { execute: false });
                }
            }
            CodegenStatus::Error(_) => {
-                self.fire_started_telemetry(cx);
                cx.emit(PromptEditorEvent::StartRequested);
            }
        }
    }

-    fn fire_started_telemetry(&self, cx: &Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() else {
-            return;
-        };
-
-        let model_telemetry_id = model.model.telemetry_id();
-        let model_provider_id = model.provider.id().to_string();
-
-        let (kind, language_name) = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                let codegen = codegen.read(cx);
-                (
-                    "inline",
-                    codegen.language_name(cx).map(|name| name.to_string()),
-                )
-            }
-            PromptEditorMode::Terminal { .. } => ("inline_terminal", None),
-        };
-
-        telemetry::event!(
-            "Assistant Started",
-            session_id = self.session_state.session_id.to_string(),
-            kind = kind,
-            phase = "started",
-            model = model_telemetry_id,
-            model_provider = model_provider_id,
-            language_name = language_name,
-        );
-    }
-
-    fn thumbs_up(&mut self, _: &ThumbsUpResult, _window: &mut Window, cx: &mut Context<Self>) {
-        match &self.session_state.completion {
-            CompletionState::Pending => {
-                self.toast("Can't rate, still generating...", None, cx);
-                return;
-            }
-            CompletionState::Rated => {
-                self.toast(
-                    "Already rated this completion",
-                    Some(self.session_state.session_id),
-                    cx,
-                );
-                return;
-            }
-            CompletionState::Generated { completion_text } => {
-                let model_info = self.model_selector.read(cx).active_model(cx);
-                let (model_id, use_streaming_tools) = {
-                    let Some(configured_model) = model_info else {
-                        self.toast("No configured model", None, cx);
-                        return;
-                    };
-                    (
-                        configured_model.model.telemetry_id(),
-                        CodegenAlternative::use_streaming_tools(
-                            configured_model.model.as_ref(),
-                            cx,
-                        ),
-                    )
-                };
-
-                let selected_text = match &self.mode {
-                    PromptEditorMode::Buffer { codegen, .. } => {
-                        codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-                    }
-                    PromptEditorMode::Terminal { .. } => None,
-                };
-
-                let prompt = self.editor.read(cx).text(cx);
-
-                let kind = match &self.mode {
-                    PromptEditorMode::Buffer { .. } => "inline",
-                    PromptEditorMode::Terminal { .. } => "inline_terminal",
-                };
-
-                telemetry::event!(
-                    "Inline Assistant Rated",
-                    rating = "positive",
-                    session_id = self.session_state.session_id.to_string(),
-                    kind = kind,
-                    model = model_id,
-                    prompt = prompt,
-                    completion = completion_text,
-                    selected_text = selected_text,
-                    use_streaming_tools
-                );
-
-                self.session_state.completion = CompletionState::Rated;
-
-                cx.notify();
-            }
-        }
-    }
-
-    fn thumbs_down(&mut self, _: &ThumbsDownResult, _window: &mut Window, cx: &mut Context<Self>) {
-        match &self.session_state.completion {
-            CompletionState::Pending => {
-                self.toast("Can't rate, still generating...", None, cx);
-                return;
-            }
-            CompletionState::Rated => {
-                self.toast(
-                    "Already rated this completion",
-                    Some(self.session_state.session_id),
-                    cx,
-                );
-                return;
-            }
-            CompletionState::Generated { completion_text } => {
-                let model_info = self.model_selector.read(cx).active_model(cx);
-                let (model_telemetry_id, use_streaming_tools) = {
-                    let Some(configured_model) = model_info else {
-                        self.toast("No configured model", None, cx);
-                        return;
-                    };
-                    (
-                        configured_model.model.telemetry_id(),
-                        CodegenAlternative::use_streaming_tools(
-                            configured_model.model.as_ref(),
-                            cx,
-                        ),
-                    )
-                };
-
-                let selected_text = match &self.mode {
-                    PromptEditorMode::Buffer { codegen, .. } => {
-                        codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-                    }
-                    PromptEditorMode::Terminal { .. } => None,
-                };
-
-                let prompt = self.editor.read(cx).text(cx);
-
-                let kind = match &self.mode {
-                    PromptEditorMode::Buffer { .. } => "inline",
-                    PromptEditorMode::Terminal { .. } => "inline_terminal",
-                };
-
-                telemetry::event!(
-                    "Inline Assistant Rated",
-                    rating = "negative",
-                    session_id = self.session_state.session_id.to_string(),
-                    kind = kind,
-                    model = model_telemetry_id,
-                    prompt = prompt,
-                    completion = completion_text,
-                    selected_text = selected_text,
-                    use_streaming_tools
-                );
-
-                self.session_state.completion = CompletionState::Rated;
-
-                cx.notify();
-            }
-        }
-    }
-
-    fn toast(&mut self, msg: &str, uuid: Option<Uuid>, cx: &mut Context<'_, PromptEditor<T>>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                enum InlinePromptRating {}
-                workspace.show_toast(
-                    {
-                        let mut toast = Toast::new(
-                            NotificationId::unique::<InlinePromptRating>(),
-                            msg.to_string(),
-                        )
-                        .autohide();
-
-                        if let Some(uuid) = uuid {
-                            toast = toast.on_click("Click to copy rating ID", move |_, cx| {
-                                cx.write_to_clipboard(ClipboardItem::new_string(uuid.to_string()));
-                            });
-                        };
-
-                        toast
-                    },
-                    cx,
-                );
-            })
-            .ok();
-    }
-
    fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
        if let Some(ix) = self.prompt_history_ix {
            if ix > 0 {
@@ -826,9 +546,6 @@ impl<T: 'static> PromptEditor<T> {
                            .into_any_element(),
                    ]
                } else {
-                    let show_rating_buttons = cx.has_flag::<InlineAssistantUseToolFeatureFlag>();
-                    let rated = matches!(self.session_state.completion, CompletionState::Rated);
-
                    let accept = IconButton::new("accept", IconName::Check)
                        .icon_color(Color::Info)
                        .shape(IconButtonShape::Square)
@@ -840,59 +557,25 @@ impl<T: 'static> PromptEditor<T> {
                        }))
                        .into_any_element();

-                    let mut buttons = Vec::new();
-
-                    if show_rating_buttons {
-                        buttons.push(
-                            IconButton::new("thumbs-down", IconName::ThumbsDown)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Bad result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_down(&ThumbsDownResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-
-                        buttons.push(
-                            IconButton::new("thumbs-up", IconName::ThumbsUp)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Good result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_up(&ThumbsUpResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-                    }
-
-                    buttons.push(accept);
-
                    match &self.mode {
-                        PromptEditorMode::Terminal { .. } => {
-                            buttons.push(
-                                IconButton::new("confirm", IconName::PlayFilled)
-                                    .icon_color(Color::Info)
-                                    .shape(IconButtonShape::Square)
-                                    .tooltip(|_window, cx| {
-                                        Tooltip::for_action(
-                                            "Execute Generated Command",
-                                            &menu::SecondaryConfirm,
-                                            cx,
-                                        )
-                                    })
-                                    .on_click(cx.listener(|_, _, _, cx| {
-                                        cx.emit(PromptEditorEvent::ConfirmRequested {
-                                            execute: true,
-                                        });
-                                    }))
-                                    .into_any_element(),
-                            );
-                            buttons
-                        }
-                        PromptEditorMode::Buffer { .. } => buttons,
+                        PromptEditorMode::Terminal { .. } => vec![
+                            accept,
+                            IconButton::new("confirm", IconName::PlayFilled)
+                                .icon_color(Color::Info)
+                                .shape(IconButtonShape::Square)
+                                .tooltip(|_window, cx| {
+                                    Tooltip::for_action(
+                                        "Execute Generated Command",
+                                        &menu::SecondaryConfirm,
+                                        cx,
+                                    )
+                                })
+                                .on_click(cx.listener(|_, _, _, cx| {
+                                    cx.emit(PromptEditorEvent::ConfirmRequested { execute: true });
+                                }))
+                                .into_any_element(),
+                        ],
+                        PromptEditorMode::Buffer { .. } => vec![accept],
                    }
                }
            }
@@ -1076,10 +759,6 @@ impl<T: 'static> PromptEditor<T> {
            })
            .into_any_element()
    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        MarkdownElement::new(markdown, style)
-    }
 }

 pub enum PromptEditorMode {
@@ -1151,7 +830,6 @@ impl PromptEditor<BufferCodegen> {
        prompt_history: VecDeque<String>,
        prompt_buffer: Entity<MultiBuffer>,
        codegen: Entity<BufferCodegen>,
-        session_id: Uuid,
        fs: Arc<dyn Fs>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
@@ -1222,10 +900,6 @@ impl PromptEditor<BufferCodegen> {
            editor_subscriptions: Vec::new(),
            show_rate_limit_notice: false,
            mode,
-            session_state: SessionState {
-                session_id,
-                completion: CompletionState::Pending,
-            },
            _phantom: Default::default(),
        };

@@ -1236,7 +910,7 @@ impl PromptEditor<BufferCodegen> {

    fn handle_codegen_changed(
        &mut self,
-        codegen: Entity<BufferCodegen>,
+        _: Entity<BufferCodegen>,
        cx: &mut Context<PromptEditor<BufferCodegen>>,
    ) {
        match self.codegen_status(cx) {
@@ -1245,15 +919,10 @@ impl PromptEditor<BufferCodegen> {
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Pending => {
-                self.session_state.completion = CompletionState::Pending;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(true));
            }
            CodegenStatus::Done => {
-                let completion = codegen.read(cx).active_completion(cx);
-                self.session_state.completion = CompletionState::Generated {
-                    completion_text: completion,
-                };
                self.edited_since_done = false;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
@@ -1309,7 +978,6 @@ impl PromptEditor<TerminalCodegen> {
        prompt_history: VecDeque<String>,
        prompt_buffer: Entity<MultiBuffer>,
        codegen: Entity<TerminalCodegen>,
-        session_id: Uuid,
        fs: Arc<dyn Fs>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
@@ -1375,10 +1043,6 @@ impl PromptEditor<TerminalCodegen> {
            editor_subscriptions: Vec::new(),
            mode,
            show_rate_limit_notice: false,
-            session_state: SessionState {
-                session_id,
-                completion: CompletionState::Pending,
-            },
            _phantom: Default::default(),
        };
        this.count_lines(cx);
@@ -1411,21 +1075,17 @@ impl PromptEditor<TerminalCodegen> {
        }
    }

-    fn handle_codegen_changed(&mut self, codegen: Entity<TerminalCodegen>, cx: &mut Context<Self>) {
+    fn handle_codegen_changed(&mut self, _: Entity<TerminalCodegen>, cx: &mut Context<Self>) {
        match &self.codegen().read(cx).status {
            CodegenStatus::Idle => {
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Pending => {
-                self.session_state.completion = CompletionState::Pending;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(true));
            }
            CodegenStatus::Done | CodegenStatus::Error(_) => {
-                self.session_state.completion = CompletionState::Generated {
-                    completion_text: codegen.read(cx).completion(),
-                };
                self.edited_since_done = false;
                self.editor
                    .update(cx, |editor, _| editor.set_read_only(false));
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -11,11 +11,9 @@ use language_model::{
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
-use ui::prelude::*;
+use ui::{KeyBinding, ListItem, ListItemSpacing, prelude::*};
 use zed_actions::agent::OpenSettings;

-use crate::ui::{ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem};
-
 type OnModelChanged = Arc<dyn Fn(Arc<dyn LanguageModel>, &mut App) + 'static>;
 type GetActiveModel = Arc<dyn Fn(&App) -> Option<ConfiguredModel> + 'static>;

@@ -461,14 +459,28 @@ impl PickerDelegate for LanguageModelPickerDelegate {
    fn render_match(
        &self,
        ix: usize,
-        is_focused: bool,
+        selected: bool,
        _: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        match self.filtered_entries.get(ix)? {
-            LanguageModelPickerEntry::Separator(title) => {
-                Some(ModelSelectorHeader::new(title, ix > 1).into_any_element())
-            }
+            LanguageModelPickerEntry::Separator(title) => Some(
+                div()
+                    .px_2()
+                    .pb_1()
+                    .when(ix > 1, |this| {
+                        this.mt_1()
+                            .pt_2()
+                            .border_t_1()
+                            .border_color(cx.theme().colors().border_variant)
+                    })
+                    .child(
+                        Label::new(title)
+                            .size(LabelSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .into_any_element(),
+            ),
            LanguageModelPickerEntry::Model(model_info) => {
                let active_model = (self.get_active_model)(cx);
                let active_provider_id = active_model.as_ref().map(|m| m.provider.id());
@@ -477,11 +489,35 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                let is_selected = Some(model_info.model.provider_id()) == active_provider_id
                    && Some(model_info.model.id()) == active_model_id;

+                let model_icon_color = if is_selected {
+                    Color::Accent
+                } else {
+                    Color::Muted
+                };
+
                Some(
-                    ModelSelectorListItem::new(ix, model_info.model.name().0)
-                        .is_focused(is_focused)
-                        .is_selected(is_selected)
-                        .icon(model_info.icon)
+                    ListItem::new(ix)
+                        .inset(true)
+                        .spacing(ListItemSpacing::Sparse)
+                        .toggle_state(selected)
+                        .child(
+                            h_flex()
+                                .w_full()
+                                .gap_1p5()
+                                .child(
+                                    Icon::new(model_info.icon)
+                                        .color(model_icon_color)
+                                        .size(IconSize::Small),
+                                )
+                                .child(Label::new(model_info.model.name().0).truncate()),
+                        )
+                        .end_slot(div().pr_3().when(is_selected, |this| {
+                            this.child(
+                                Icon::new(IconName::Check)
+                                    .color(Color::Accent)
+                                    .size(IconSize::Small),
+                            )
+                        }))
                        .into_any_element(),
                )
            }
@@ -491,15 +527,34 @@ impl PickerDelegate for LanguageModelPickerDelegate {
    fn render_footer(
        &self,
        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
+        cx: &mut Context<Picker<Self>>,
    ) -> Option<gpui::AnyElement> {
+        let focus_handle = self.focus_handle.clone();
+
        if !self.popover_styles {
            return None;
        }

-        let focus_handle = self.focus_handle.clone();
-
-        Some(ModelSelectorFooter::new(OpenSettings.boxed_clone(), focus_handle).into_any_element())
+        Some(
+            h_flex()
+                .w_full()
+                .p_1p5()
+                .border_t_1()
+                .border_color(cx.theme().colors().border_variant)
+                .child(
+                    Button::new("configure", "Configure")
+                        .full_width()
+                        .style(ButtonStyle::Outlined)
+                        .key_binding(
+                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, cx)
+                                .map(|kb| kb.size(rems_from_px(12.))),
+                        )
+                        .on_click(|_, window, cx| {
+                            window.dispatch_action(OpenSettings.boxed_clone(), cx);
+                        }),
+                )
+                .into_any(),
+        )
    }
 }

--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -1,4 +1,4 @@
-use crate::{CycleModeSelector, ManageProfiles, ToggleProfileSelector};
+use crate::{ManageProfiles, ToggleProfileSelector};
 use agent_settings::{
    AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles, builtin_profiles,
 };
@@ -70,29 +70,6 @@ impl ProfileSelector {
        self.picker_handle.clone()
    }

-    pub fn cycle_profile(&mut self, cx: &mut Context<Self>) {
-        if !self.provider.profiles_supported(cx) {
-            return;
-        }
-
-        let profiles = AgentProfile::available_profiles(cx);
-        if profiles.is_empty() {
-            return;
-        }
-
-        let current_profile_id = self.provider.profile_id(cx);
-        let current_index = profiles
-            .keys()
-            .position(|id| id == &current_profile_id)
-            .unwrap_or(0);
-
-        let next_index = (current_index + 1) % profiles.len();
-
-        if let Some((next_profile_id, _)) = profiles.get_index(next_index) {
-            self.provider.set_profile(next_profile_id.clone(), cx);
-        }
-    }
-
    fn ensure_picker(
        &mut self,
        window: &mut Window,
@@ -186,29 +163,14 @@ impl Render for ProfileSelector {
        PickerPopoverMenu::new(
            picker,
            trigger_button,
-            Tooltip::element({
-                move |_window, cx| {
-                    let container = || h_flex().gap_1().justify_between();
-                    v_flex()
-                        .gap_1()
-                        .child(
-                            container()
-                                .pb_1()
-                                .border_b_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(Label::new("Cycle Through Profiles"))
-                                .child(KeyBinding::for_action_in(
-                                    &CycleModeSelector,
-                                    &focus_handle,
-                                    cx,
-                                )),
-                        )
-                        .child(container().child(Label::new("Toggle Profile Menu")).child(
-                            KeyBinding::for_action_in(&ToggleProfileSelector, &focus_handle, cx),
-                        ))
-                        .into_any()
-                }
-            }),
+            move |_window, cx| {
+                Tooltip::for_action_in(
+                    "Toggle Profile Menu",
+                    &ToggleProfileSelector,
+                    &focus_handle,
+                    cx,
+                )
+            },
            gpui::Corner::BottomRight,
            cx,
        )
@@ -580,7 +542,7 @@ impl PickerDelegate for ProfilePickerDelegate {
                let is_active = active_id == candidate.id;

                Some(
-                    ListItem::new(candidate.id.0.clone())
+                    ListItem::new(SharedString::from(candidate.id.0.clone()))
                        .inset(true)
                        .spacing(ListItemSpacing::Sparse)
                        .toggle_state(selected)
--- a/crates/agent_ui/src/terminal_codegen.rs
+++ b/crates/agent_ui/src/terminal_codegen.rs
@@ -1,38 +1,37 @@
 use crate::inline_prompt_editor::CodegenStatus;
+use client::telemetry::Telemetry;
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
-use language_model::{ConfiguredModel, LanguageModelRegistry, LanguageModelRequest};
-use std::time::Instant;
+use language_model::{
+    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, report_assistant_event,
+};
+use std::{sync::Arc, time::Instant};
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal::Terminal;
-use uuid::Uuid;

 pub struct TerminalCodegen {
    pub status: CodegenStatus,
+    pub telemetry: Option<Arc<Telemetry>>,
    terminal: Entity<Terminal>,
    generation: Task<()>,
    pub message_id: Option<String>,
    transaction: Option<TerminalTransaction>,
-    session_id: Uuid,
 }

 impl EventEmitter<CodegenEvent> for TerminalCodegen {}

 impl TerminalCodegen {
-    pub fn new(terminal: Entity<Terminal>, session_id: Uuid) -> Self {
+    pub fn new(terminal: Entity<Terminal>, telemetry: Option<Arc<Telemetry>>) -> Self {
        Self {
            terminal,
+            telemetry,
            status: CodegenStatus::Idle,
            generation: Task::ready(()),
            message_id: None,
            transaction: None,
-            session_id,
        }
    }

-    pub fn session_id(&self) -> Uuid {
-        self.session_id
-    }
-
    pub fn start(&mut self, prompt_task: Task<LanguageModelRequest>, cx: &mut Context<Self>) {
        let Some(ConfiguredModel { model, .. }) =
            LanguageModelRegistry::read_global(cx).inline_assistant_model()
@@ -40,15 +39,15 @@ impl TerminalCodegen {
            return;
        };

-        let anthropic_reporter = language_model::AnthropicEventReporter::new(&model, cx);
-        let session_id = self.session_id;
-        let model_telemetry_id = model.telemetry_id();
-        let model_provider_id = model.provider_id().to_string();
-
+        let model_api_key = model.api_key(cx);
+        let http_client = cx.http_client();
+        let telemetry = self.telemetry.clone();
        self.status = CodegenStatus::Pending;
        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
        self.generation = cx.spawn(async move |this, cx| {
            let prompt = prompt_task.await;
+            let model_telemetry_id = model.telemetry_id();
+            let model_provider_id = model.provider_id();
            let response = model.stream_completion_text(prompt, cx).await;
            let generate = async {
                let message_id = response
@@ -60,7 +59,7 @@ impl TerminalCodegen {

                let task = cx.background_spawn({
                    let message_id = message_id.clone();
-                    let anthropic_reporter = anthropic_reporter.clone();
+                    let executor = cx.background_executor().clone();
                    async move {
                        let mut response_latency = None;
                        let request_start = Instant::now();
@@ -80,27 +79,24 @@ impl TerminalCodegen {
                        let result = task.await;

                        let error_message = result.as_ref().err().map(|error| error.to_string());
-
-                        telemetry::event!(
-                            "Assistant Responded",
-                            session_id = session_id.to_string(),
-                            kind = "inline_terminal",
-                            phase = "response",
-                            model = model_telemetry_id,
-                            model_provider = model_provider_id,
-                            language_name = Option::<&str>::None,
-                            message_id = message_id,
-                            response_latency = response_latency,
-                            error_message = error_message,
+                        report_assistant_event(
+                            AssistantEventData {
+                                conversation_id: None,
+                                kind: AssistantKind::InlineTerminal,
+                                message_id,
+                                phase: AssistantPhase::Response,
+                                model: model_telemetry_id,
+                                model_provider: model_provider_id.to_string(),
+                                response_latency,
+                                error_message,
+                                language_name: None,
+                            },
+                            telemetry,
+                            http_client,
+                            model_api_key,
+                            &executor,
                        );

-                        anthropic_reporter.report(language_model::AnthropicEventData {
-                            completion_type: language_model::AnthropicCompletionType::Terminal,
-                            event: language_model::AnthropicEventType::Response,
-                            language_name: None,
-                            message_id,
-                        });
-
                        result?;
                        anyhow::Ok(())
                    }
@@ -139,12 +135,6 @@ impl TerminalCodegen {
        cx.notify();
    }

-    pub fn completion(&self) -> Option<String> {
-        self.transaction
-            .as_ref()
-            .map(|transaction| transaction.completion.clone())
-    }
-
    pub fn stop(&mut self, cx: &mut Context<Self>) {
        self.status = CodegenStatus::Done;
        self.generation = Task::ready(());
@@ -177,32 +167,27 @@ pub const CLEAR_INPUT: &str = "\x03";
 const CARRIAGE_RETURN: &str = "\x0d";

 struct TerminalTransaction {
-    completion: String,
    terminal: Entity<Terminal>,
 }

 impl TerminalTransaction {
    pub fn start(terminal: Entity<Terminal>) -> Self {
-        Self {
-            completion: String::new(),
-            terminal,
-        }
+        Self { terminal }
    }

    pub fn push(&mut self, hunk: String, cx: &mut App) {
        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
        let input = Self::sanitize_input(hunk);
-        self.completion.push_str(&input);
        self.terminal
            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
    }

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

-    pub fn complete(self, cx: &mut App) {
+    pub fn complete(&self, cx: &mut App) {
        self.terminal
            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
    }
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -8,7 +8,7 @@ use crate::{
 use agent::HistoryStore;
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
-
+use client::telemetry::Telemetry;
 use cloud_llm_client::CompletionIntent;
 use collections::{HashMap, VecDeque};
 use editor::{MultiBuffer, actions::SelectAll};
@@ -17,19 +17,24 @@ use gpui::{App, Entity, Focusable, Global, Subscription, Task, UpdateGlobal, Wea
 use language::Buffer;
 use language_model::{
    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    Role, report_anthropic_event,
+    Role, report_assistant_event,
 };
 use project::Project;
 use prompt_store::{PromptBuilder, PromptStore};
 use std::sync::Arc;
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::TerminalView;
 use ui::prelude::*;
 use util::ResultExt;
-use uuid::Uuid;
 use workspace::{Toast, Workspace, notifications::NotificationId};

-pub fn init(fs: Arc<dyn Fs>, prompt_builder: Arc<PromptBuilder>, cx: &mut App) {
-    cx.set_global(TerminalInlineAssistant::new(fs, prompt_builder));
+pub fn init(
+    fs: Arc<dyn Fs>,
+    prompt_builder: Arc<PromptBuilder>,
+    telemetry: Arc<Telemetry>,
+    cx: &mut App,
+) {
+    cx.set_global(TerminalInlineAssistant::new(fs, prompt_builder, telemetry));
 }

 const DEFAULT_CONTEXT_LINES: usize = 50;
@@ -39,6 +44,7 @@ pub struct TerminalInlineAssistant {
    next_assist_id: TerminalInlineAssistId,
    assists: HashMap<TerminalInlineAssistId, TerminalInlineAssist>,
    prompt_history: VecDeque<String>,
+    telemetry: Option<Arc<Telemetry>>,
    fs: Arc<dyn Fs>,
    prompt_builder: Arc<PromptBuilder>,
 }
@@ -46,11 +52,16 @@ pub struct TerminalInlineAssistant {
 impl Global for TerminalInlineAssistant {}

 impl TerminalInlineAssistant {
-    pub fn new(fs: Arc<dyn Fs>, prompt_builder: Arc<PromptBuilder>) -> Self {
+    pub fn new(
+        fs: Arc<dyn Fs>,
+        prompt_builder: Arc<PromptBuilder>,
+        telemetry: Arc<Telemetry>,
+    ) -> Self {
        Self {
            next_assist_id: TerminalInlineAssistId::default(),
            assists: HashMap::default(),
            prompt_history: VecDeque::default(),
+            telemetry: Some(telemetry),
            fs,
            prompt_builder,
        }
@@ -69,14 +80,13 @@ impl TerminalInlineAssistant {
    ) {
        let terminal = terminal_view.read(cx).terminal().clone();
        let assist_id = self.next_assist_id.post_inc();
-        let session_id = Uuid::new_v4();
        let prompt_buffer = cx.new(|cx| {
            MultiBuffer::singleton(
                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
                cx,
            )
        });
-        let codegen = cx.new(|_| TerminalCodegen::new(terminal, session_id));
+        let codegen = cx.new(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));

        let prompt_editor = cx.new(|cx| {
            PromptEditor::new_terminal(
@@ -84,7 +94,6 @@ impl TerminalInlineAssistant {
                self.prompt_history.clone(),
                prompt_buffer.clone(),
                codegen,
-                session_id,
                self.fs.clone(),
                thread_store.clone(),
                prompt_store.clone(),
@@ -300,45 +309,27 @@ impl TerminalInlineAssistant {
                LanguageModelRegistry::read_global(cx).inline_assistant_model()
            {
                let codegen = assist.codegen.read(cx);
-                let session_id = codegen.session_id();
-                let message_id = codegen.message_id.clone();
-                let model_telemetry_id = model.telemetry_id();
-                let model_provider_id = model.provider_id().to_string();
-
-                let (phase, event_type, anthropic_event_type) = if undo {
-                    (
-                        "rejected",
-                        "Assistant Response Rejected",
-                        language_model::AnthropicEventType::Reject,
-                    )
-                } else {
-                    (
-                        "accepted",
-                        "Assistant Response Accepted",
-                        language_model::AnthropicEventType::Accept,
-                    )
-                };
-
-                // Fire Zed telemetry
-                telemetry::event!(
-                    event_type,
-                    kind = "inline_terminal",
-                    phase = phase,
-                    model = model_telemetry_id,
-                    model_provider = model_provider_id,
-                    message_id = message_id,
-                    session_id = session_id,
-                );
-
-                report_anthropic_event(
-                    &model,
-                    language_model::AnthropicEventData {
-                        completion_type: language_model::AnthropicCompletionType::Terminal,
-                        event: anthropic_event_type,
+                let executor = cx.background_executor().clone();
+                report_assistant_event(
+                    AssistantEventData {
+                        conversation_id: None,
+                        kind: AssistantKind::InlineTerminal,
+                        message_id: codegen.message_id.clone(),
+                        phase: if undo {
+                            AssistantPhase::Rejected
+                        } else {
+                            AssistantPhase::Accepted
+                        },
+                        model: model.telemetry_id(),
+                        model_provider: model.provider_id().to_string(),
+                        response_latency: None,
+                        error_message: None,
                        language_name: None,
-                        message_id,
                    },
-                    cx,
+                    codegen.telemetry.clone(),
+                    cx.http_client(),
+                    model.api_key(cx),
+                    &executor,
                );
            }

--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1682,98 +1682,6 @@ impl TextThreadEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some(clipboard_item) = cx.read_from_clipboard() {
-                if let Some(ClipboardEntry::String(clipboard_text)) =
-                    clipboard_item.entries().first()
-                {
-                    if let Some(selections) = editor_clipboard_selections {
-                        cx.stop_propagation();
-
-                        let text = clipboard_text.text();
-                        self.editor.update(cx, |editor, cx| {
-                            let mut current_offset = 0;
-                            let weak_editor = cx.entity().downgrade();
-
-                            for selection in selections {
-                                if let (Some(file_path), Some(line_range)) =
-                                    (selection.file_path, selection.line_range)
-                                {
-                                    let selected_text =
-                                        &text[current_offset..current_offset + selection.len];
-                                    let fence = assistant_slash_commands::codeblock_fence_for_path(
-                                        file_path.to_str(),
-                                        Some(line_range.clone()),
-                                    );
-                                    let formatted_text = format!("{fence}{selected_text}\n```");
-
-                                    let insert_point = editor
-                                        .selections
-                                        .newest::<Point>(&editor.display_snapshot(cx))
-                                        .head();
-                                    let start_row = MultiBufferRow(insert_point.row);
-
-                                    editor.insert(&formatted_text, window, cx);
-
-                                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                                    let anchor_before = snapshot.anchor_after(insert_point);
-                                    let anchor_after = editor
-                                        .selections
-                                        .newest_anchor()
-                                        .head()
-                                        .bias_left(&snapshot);
-
-                                    editor.insert("\n", window, cx);
-
-                                    let crease_text = acp_thread::selection_name(
-                                        Some(file_path.as_ref()),
-                                        &line_range,
-                                    );
-
-                                    let fold_placeholder = quote_selection_fold_placeholder(
-                                        crease_text,
-                                        weak_editor.clone(),
-                                    );
-                                    let crease = Crease::inline(
-                                        anchor_before..anchor_after,
-                                        fold_placeholder,
-                                        render_quote_selection_output_toggle,
-                                        |_, _, _, _| Empty.into_any(),
-                                    );
-                                    editor.insert_creases(vec![crease], cx);
-                                    editor.fold_at(start_row, window, cx);
-
-                                    current_offset += selection.len;
-                                    if !selection.is_entire_line && current_offset < text.len() {
-                                        current_offset += 1;
-                                    }
-                                }
-                            }
-                        });
-                        return;
-                    }
-                }
-            }
-        }
-
        cx.stop_propagation();

        let mut images = if let Some(item) = cx.read_from_clipboard() {
@@ -2714,13 +2622,11 @@ impl SearchableItem for TextThreadEditor {
    fn update_matches(
        &mut self,
        matches: &[Self::Match],
-        active_match_index: Option<usize>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.update_matches(matches, active_match_index, window, cx)
-        });
+        self.editor
+            .update(cx, |editor, cx| editor.update_matches(matches, window, cx));
    }

    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String {
@@ -3324,6 +3230,7 @@ mod tests {
            let mut text_thread = TextThread::local(
                registry,
                None,
+                None,
                prompt_builder.clone(),
                Arc::new(SlashCommandWorkingSet::default()),
                cx,
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -4,8 +4,8 @@ mod burn_mode_tooltip;
 mod claude_code_onboarding_modal;
 mod end_trial_upsell;
 mod hold_for_default;
-mod model_selector_components;
 mod onboarding_modal;
+mod unavailable_editing_tooltip;
 mod usage_callout;

 pub use acp_onboarding_modal::*;
@@ -14,6 +14,6 @@ pub use burn_mode_tooltip::*;
 pub use claude_code_onboarding_modal::*;
 pub use end_trial_upsell::*;
 pub use hold_for_default::*;
-pub use model_selector_components::*;
 pub use onboarding_modal::*;
+pub use unavailable_editing_tooltip::*;
 pub use usage_callout::*;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Benfield	e8d44ce267	comments	2025-12-03 10:09:22 -08:00
Michael Benfield	08d89254d1	select better and use tools for inline assistant	2025-12-03 09:51:16 -08:00
Mikayla Maki	d7cc949e61	fix license	2025-12-02 17:13:52 -08:00
Mikayla Maki	a3f9dffb04	Clippy	2025-12-02 17:13:52 -08:00
Mikayla Maki	78b32840c3	Feature gate eval	2025-12-02 17:13:52 -08:00
Mikayla Maki	a636b59d72	Clean up PR for merging	2025-12-02 17:13:52 -08:00
Mikayla Maki	983c3a02a8	Clean up dbg	2025-12-02 17:13:52 -08:00
Mikayla Maki	5bc7b11a6a	Fix a miscompilation	2025-12-02 17:13:52 -08:00
Michael Benfield	2a5e8c62a7	Add eval utils to workspace and inline assistant test Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>	2025-12-02 17:13:52 -08:00
Michael Benfield	4efeef564c	evals uses eval_utils	2025-12-02 17:13:52 -08:00
Michael Benfield	514cb933d1	eval_utils crate	2025-12-02 17:13:52 -08:00
Michael Benfield	06f65b29ab	working on thread_store thing	2025-12-02 17:13:52 -08:00
Michael Benfield	cd9242c544	Progress towards an eval for inline assistants. Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>	2025-12-02 17:13:52 -08:00