Fix errors after merge conflicts

Merge branch 'main' into agent-paste-context
Fix abs_path, wrong line numbers
2025-12-08 17:20:50 +01:00 · 2025-12-08 17:09:13 +01:00 · 2025-12-08 17:08:47 +01:00 · 2025-12-05 13:11:50 +01:00 · 2025-11-22 16:11:19 +03:00 · 2025-11-22 15:52:19 +03:00
679 changed files with 15277 additions and 30955 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
@@ -113,7 +113,6 @@ jobs:
        delete-branch: true
        token: ${{ steps.generate-token.outputs.token }}
        sign-commits: true
-        assignees: ${{ github.actor }}
    timeout-minutes: 1
  create_version_label:
    needs:
--- 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
@@ -42,4 +41,4 @@ xcuserdata/
 .env.secret.toml

 # `nix build` output
-/result
+/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
@@ -388,6 +388,7 @@ dependencies = [
 "streaming_diff",
 "task",
 "telemetry",
+ "telemetry_events",
 "terminal",
 "terminal_view",
 "text",
@@ -400,43 +401,11 @@ dependencies = [
 "unindent",
 "url",
 "util",
- "uuid",
 "watch",
 "workspace",
 "zed_actions",
 ]

-[[package]]
-name = "agent_ui_v2"
-version = "0.1.0"
-dependencies = [
- "agent",
- "agent_servers",
- "agent_settings",
- "agent_ui",
- "anyhow",
- "assistant_text_thread",
- "chrono",
- "db",
- "editor",
- "feature_flags",
- "fs",
- "fuzzy",
- "gpui",
- "menu",
- "project",
- "prompt_store",
- "serde",
- "serde_json",
- "settings",
- "text",
- "time",
- "time_format",
- "ui",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -865,6 +834,7 @@ dependencies = [
 "fs",
 "futures 0.3.31",
 "fuzzy",
+ "globset",
 "gpui",
 "html_to_markdown",
 "http_client",
@@ -923,7 +893,7 @@ dependencies = [
 "settings",
 "smallvec",
 "smol",
- "telemetry",
+ "telemetry_events",
 "text",
 "ui",
 "unindent",
@@ -2799,9 +2769,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.49"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -3140,11 +3110,21 @@ dependencies = [
 "uuid",
 ]

+[[package]]
+name = "cloud_zeta2_prompt"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "cloud_llm_client",
+ "indoc",
+ "serde",
+]
+
 [[package]]
 name = "cmake"
-version = "0.1.56"
+version = "0.1.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
 dependencies = [
 "cc",
 ]
@@ -3614,7 +3594,6 @@ dependencies = [
 "settings",
 "smol",
 "tempfile",
- "terminal",
 "url",
 "util",
 ]
@@ -3672,7 +3651,6 @@ dependencies = [
 "task",
 "theme",
 "ui",
- "url",
 "util",
 "workspace",
 "zlog",
@@ -5139,8 +5117,10 @@ dependencies = [
 "clock",
 "cloud_api_types",
 "cloud_llm_client",
+ "cloud_zeta2_prompt",
 "collections",
 "copilot",
+ "credentials_provider",
 "ctor",
 "db",
 "edit_prediction_context",
@@ -5161,7 +5141,6 @@ dependencies = [
 "postage",
 "pretty_assertions",
 "project",
- "pulldown-cmark 0.12.2",
 "rand 0.9.2",
 "regex",
 "release_channel",
@@ -5169,6 +5148,8 @@ dependencies = [
 "serde",
 "serde_json",
 "settings",
+ "smol",
+ "strsim",
 "strum 0.27.2",
 "telemetry",
 "telemetry_events",
@@ -5179,7 +5160,6 @@ dependencies = [
 "workspace",
 "worktree",
 "zed_actions",
- "zeta_prompt",
 "zlog",
 ]

@@ -5193,10 +5173,11 @@ dependencies = [
 "clap",
 "client",
 "cloud_llm_client",
+ "cloud_zeta2_prompt",
 "collections",
 "debug_adapter_extension",
- "dirs 4.0.0",
 "edit_prediction",
+ "edit_prediction_context",
 "extension",
 "fs",
 "futures 0.3.31",
@@ -5209,13 +5190,13 @@ dependencies = [
 "language_model",
 "language_models",
 "languages",
- "libc",
 "log",
 "node_runtime",
 "paths",
 "pretty_assertions",
 "project",
 "prompt_store",
+ "pulldown-cmark 0.12.2",
 "release_channel",
 "reqwest_client",
 "serde",
@@ -5226,10 +5207,10 @@ dependencies = [
 "sqlez",
 "sqlez_macros",
 "terminal_view",
+ "toml 0.8.23",
 "util",
- "wasmtime",
 "watch",
- "zeta_prompt",
+ "zlog",
 ]

 [[package]]
@@ -5256,7 +5237,6 @@ dependencies = [
 "text",
 "tree-sitter",
 "util",
- "zeta_prompt",
 "zlog",
 ]

@@ -5267,7 +5247,6 @@ dependencies = [
 "client",
 "gpui",
 "language",
- "text",
 ]

 [[package]]
@@ -5278,6 +5257,7 @@ dependencies = [
 "buffer_diff",
 "client",
 "cloud_llm_client",
+ "cloud_zeta2_prompt",
 "codestral",
 "command_palette_hooks",
 "copilot",
@@ -5287,11 +5267,9 @@ dependencies = [
 "feature_flags",
 "fs",
 "futures 0.3.31",
- "git",
 "gpui",
 "indoc",
 "language",
- "log",
 "lsp",
 "markdown",
 "menu",
@@ -5305,12 +5283,11 @@ dependencies = [
 "telemetry",
 "text",
 "theme",
- "time",
 "ui",
+ "ui_input",
 "util",
 "workspace",
 "zed_actions",
- "zeta_prompt",
 ]

 [[package]]
@@ -5822,7 +5799,6 @@ dependencies = [
 "gpui",
 "heck 0.5.0",
 "http_client",
- "indoc",
 "language",
 "log",
 "lsp",
@@ -6124,9 +6100,9 @@ dependencies = [

 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"

 [[package]]
 name = "fixedbitset"
@@ -7032,7 +7008,6 @@ dependencies = [
 "gpui",
 "http_client",
 "indoc",
- "itertools 0.14.0",
 "pretty_assertions",
 "regex",
 "serde",
@@ -7078,8 +7053,6 @@ dependencies = [
 "picker",
 "pretty_assertions",
 "project",
- "prompt_store",
- "rand 0.9.2",
 "recent_projects",
 "remote",
 "schemars",
@@ -7272,7 +7245,6 @@ dependencies = [
 "libc",
 "log",
 "lyon",
- "mach2 0.5.0",
 "media",
 "metal",
 "naga",
@@ -7781,6 +7753,7 @@ dependencies = [
 "tempfile",
 "url",
 "util",
+ "zed-reqwest",
 ]

 [[package]]
@@ -8835,7 +8808,6 @@ dependencies = [
 "cloud_api_types",
 "cloud_llm_client",
 "collections",
- "credentials_provider",
 "futures 0.3.31",
 "gpui",
 "http_client",
@@ -8851,9 +8823,9 @@ dependencies = [
 "serde_json",
 "settings",
 "smol",
+ "telemetry_events",
 "thiserror 2.0.17",
 "util",
- "zed_env_vars",
 ]

 [[package]]
@@ -8910,6 +8882,7 @@ dependencies = [
 "util",
 "vercel",
 "x_ai",
+ "zed_env_vars",
 ]

 [[package]]
@@ -10843,6 +10816,7 @@ dependencies = [
 "documented",
 "fs",
 "fuzzy",
+ "git",
 "gpui",
 "menu",
 "notifications",
@@ -13179,7 +13153,6 @@ dependencies = [
 "askpass",
 "auto_update",
 "dap",
- "db",
 "editor",
 "extension_host",
 "file_finder",
@@ -13191,7 +13164,6 @@ dependencies = [
 "log",
 "markdown",
 "menu",
- "node_runtime",
 "ordered-float 2.10.1",
 "paths",
 "picker",
@@ -13210,7 +13182,6 @@ dependencies = [
 "util",
 "windows-registry 0.6.1",
 "workspace",
- "worktree",
 "zed_actions",
 ]

@@ -14478,14 +14449,12 @@ dependencies = [
 "settings",
 "smol",
 "theme",
- "tracing",
 "ui",
 "unindent",
 "util",
 "util_macros",
 "workspace",
 "zed_actions",
- "ztracing",
 ]

 [[package]]
@@ -14810,8 +14779,6 @@ dependencies = [
 "assets",
 "bm25",
 "client",
- "copilot",
- "edit_prediction",
 "editor",
 "feature_flags",
 "fs",
@@ -14820,7 +14787,6 @@ dependencies = [
 "gpui",
 "heck 0.5.0",
 "language",
- "language_models",
 "log",
 "menu",
 "node_runtime",
@@ -16401,13 +16367,13 @@ dependencies = [
 "alacritty_terminal",
 "anyhow",
 "collections",
+ "fancy-regex",
 "futures 0.3.31",
 "gpui",
 "itertools 0.14.0",
 "libc",
 "log",
 "rand 0.9.2",
- "regex",
 "release_channel",
 "schemars",
 "serde",
@@ -18135,11 +18101,9 @@ dependencies = [
 "language",
 "log",
 "lsp",
- "markdown_preview",
 "menu",
 "multi_buffer",
 "nvim-rs",
- "outline_panel",
 "parking_lot",
 "perf",
 "picker",
@@ -20092,16 +20056,13 @@ dependencies = [
 "component",
 "dap",
 "db",
- "feature_flags",
 "fs",
 "futures 0.3.31",
- "git",
 "gpui",
 "http_client",
 "itertools 0.14.0",
 "language",
 "log",
- "markdown",
 "menu",
 "node_runtime",
 "parking_lot",
@@ -20505,13 +20466,12 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.218.0"
+version = "0.217.0"
 dependencies = [
 "acp_tools",
 "activity_indicator",
 "agent_settings",
 "agent_ui",
- "agent_ui_v2",
 "anyhow",
 "ashpd 0.11.0",
 "askpass",
@@ -20823,16 +20783,16 @@ dependencies = [

 [[package]]
 name = "zed_html"
-version = "0.3.0"
+version = "0.2.3"
 dependencies = [
 "zed_extension_api 0.7.0",
 ]

 [[package]]
 name = "zed_proto"
-version = "0.3.0"
+version = "0.2.3"
 dependencies = [
- "zed_extension_api 0.7.0",
+ "zed_extension_api 0.1.0",
 ]

 [[package]]
@@ -20966,13 +20926,6 @@ dependencies = [
 "syn 2.0.106",
 ]

-[[package]]
-name = "zeta_prompt"
-version = "0.1.0"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "zip"
 version = "0.6.6"
@@ -21065,7 +21018,6 @@ dependencies = [
 "tracing",
 "tracing-subscriber",
 "tracing-tracy",
- "zlog",
 "ztracing_macro",
 ]

--- 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",
@@ -202,7 +202,6 @@ members = [
    "crates/zed_actions",
    "crates/zed_env_vars",
    "crates/edit_prediction_cli",
-    "crates/zeta_prompt",
    "crates/zlog",
    "crates/zlog_settings",
    "crates/ztracing",
@@ -243,7 +242,6 @@ 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_onboarding = { path = "crates/ai_onboarding" }
@@ -268,6 +266,7 @@ 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_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
@@ -426,7 +425,6 @@ 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" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
 ztracing = { path = "crates/ztracing" }
@@ -633,7 +631,7 @@ shellexpand = "2.1.0"
 shlex = "1.3.0"
 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"
@@ -659,7 +657,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"
@@ -857,6 +854,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/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,6 @@ 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.
+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. It is an error if
+you simply 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.
--- 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/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -71,33 +71,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",
@@ -478,33 +478,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",
@@ -885,33 +885,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",
@@ -1295,30 +1295,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",
@@ -1702,30 +1702,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",
@@ -2109,30 +2109,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
@@ -68,34 +68,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",
@@ -473,33 +473,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/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1372,7 +1372,7 @@ impl AcpThread {
        let path_style = self.project.read(cx).path_style(cx);
        let id = update.tool_call_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 +1380,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) {
@@ -3561,8 +3556,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] {
--- 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] {
--- 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/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -187,10 +187,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,
 }
@@ -936,8 +947,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 +1219,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)]
--- a/crates/agent/src/edit_agent/evals.rs
+++ b/crates/agent/src/edit_agent/evals.rs
@@ -1343,7 +1343,6 @@ fn run_eval(eval: EvalInput) -> eval_utils::EvalOutput<EditEvalMetadata> {
        let test = EditAgentTest::new(&mut cx).await;
        test.eval(eval, &mut cx).await
    });
-    cx.quit();
    match result {
        Ok(output) => eval_utils::EvalOutput {
            data: output.to_string(),
--- 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;
--- 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 {
@@ -2659,6 +2658,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/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 {
@@ -122,26 +116,7 @@ impl AgentTool for TerminalTool {
                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,
-            };
-
+            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_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,
@@ -81,6 +81,7 @@ const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::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())
@@ -200,13 +199,6 @@ impl AcpConnection {
            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 +233,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(
--- 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()
    }
@@ -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()
    }
@@ -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()
    }
@@ -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/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/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -565,33 +565,7 @@ impl MessageEditor {
            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 {
@@ -613,7 +587,8 @@ impl MessageEditor {
                                let snapshot = buffer.snapshot(cx);
                                let (excerpt_id, _, buffer_snapshot) =
                                    snapshot.as_singleton().unwrap();
-                                let text_anchor = insertion_target.bias_left(&buffer_snapshot);
+                                let start_offset = buffer_snapshot.len();
+                                let text_anchor = buffer_snapshot.anchor_before(start_offset);

                                editor.insert(&mention_text, window, cx);
                                editor.insert(" ", window, cx);
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -403,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,
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -170,7 +170,7 @@ impl ThreadFeedbackState {
            }
        }
        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
+        let agent = thread.read(cx).connection().telemetry_id();
        let task = telemetry.thread_data(&session_id, cx);
        let rating = match feedback {
            ThreadFeedback::Positive => "positive",
@@ -180,7 +180,7 @@ impl ThreadFeedbackState {
            let thread = task.await?;
            telemetry::event!(
                "Agent Thread Rated",
-                agent = agent_telemetry_id,
+                agent = agent,
                session_id = session_id,
                rating = rating,
                thread = thread
@@ -207,13 +207,13 @@ impl ThreadFeedbackState {
        self.comments_editor.take();

        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
+        let agent = thread.read(cx).connection().telemetry_id();
        let task = telemetry.thread_data(&session_id, cx);
        cx.background_spawn(async move {
            let thread = task.await?;
            telemetry::event!(
                "Agent Thread Feedback Comments",
-                agent = agent_telemetry_id,
+                agent = agent,
                session_id = session_id,
                comments = comments,
                thread = thread
@@ -333,7 +333,6 @@ impl AcpThreadView {
        project: Entity<Project>,
        history_store: Entity<HistoryStore>,
        prompt_store: Option<Entity<PromptStore>>,
-        track_load_event: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -392,9 +391,8 @@ impl AcpThreadView {
            ),
        ];

-        let show_codex_windows_warning = cfg!(windows)
-            && project.read(cx).is_local()
-            && agent.clone().downcast::<agent_servers::Codex>().is_some();
+        let show_codex_windows_warning = crate::ExternalAgent::parse_built_in(agent.as_ref())
+            == Some(crate::ExternalAgent::Codex);

        Self {
            agent: agent.clone(),
@@ -406,7 +404,6 @@ impl AcpThreadView {
                resume_thread.clone(),
                workspace.clone(),
                project.clone(),
-                track_load_event,
                window,
                cx,
            ),
@@ -451,7 +448,6 @@ impl AcpThreadView {
            self.resume_thread_metadata.clone(),
            self.workspace.clone(),
            self.project.clone(),
-            true,
            window,
            cx,
        );
@@ -465,7 +461,6 @@ impl AcpThreadView {
        resume_thread: Option<DbThreadMetadata>,
        workspace: WeakEntity<Workspace>,
        project: Entity<Project>,
-        track_load_event: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> ThreadState {
@@ -524,10 +519,6 @@ impl AcpThreadView {
                }
            };

-            if track_load_event {
-                telemetry::event!("Agent Thread Started", agent = connection.telemetry_id());
-            }
-
            let result = if let Some(native_agent) = connection
                .clone()
                .downcast::<agent::NativeAgentConnection>()
@@ -693,7 +684,7 @@ impl AcpThreadView {
                        this.new_server_version_available = Some(new_version.into());
                        cx.notify();
                    })
-                    .ok();
+                    .log_err();
                }
            }
        })
@@ -1142,8 +1133,8 @@ impl AcpThreadView {
        let Some(thread) = self.thread() else {
            return;
        };
+        let agent_telemetry_id = self.agent.telemetry_id();
        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
        let thread = thread.downgrade();
        if self.should_be_following {
            self.workspace
@@ -1521,7 +1512,6 @@ impl AcpThreadView {
        else {
            return;
        };
-        let agent_telemetry_id = connection.telemetry_id();

        // Check for the experimental "terminal-auth" _meta field
        let auth_method = connection.auth_methods().iter().find(|m| m.id == method);
@@ -1589,18 +1579,19 @@ impl AcpThreadView {
                            );
                            cx.notify();
                            self.auth_task = Some(cx.spawn_in(window, {
+                                let agent = self.agent.clone();
                                async move |this, cx| {
                                    let result = authenticate.await;

                                    match &result {
                                        Ok(_) => telemetry::event!(
                                            "Authenticate Agent Succeeded",
-                                            agent = agent_telemetry_id
+                                            agent = agent.telemetry_id()
                                        ),
                                        Err(_) => {
                                            telemetry::event!(
                                                "Authenticate Agent Failed",
-                                                agent = agent_telemetry_id,
+                                                agent = agent.telemetry_id(),
                                            )
                                        }
                                    }
@@ -1684,7 +1675,6 @@ impl AcpThreadView {
                            None,
                            this.workspace.clone(),
                            this.project.clone(),
-                            true,
                            window,
                            cx,
                        )
@@ -1740,38 +1730,43 @@ impl AcpThreadView {
            connection.authenticate(method, cx)
        };
        cx.notify();
-        self.auth_task = Some(cx.spawn_in(window, {
-            async move |this, cx| {
-                let result = authenticate.await;
+        self.auth_task =
+            Some(cx.spawn_in(window, {
+                let agent = self.agent.clone();
+                async move |this, cx| {
+                    let result = authenticate.await;

-                match &result {
-                    Ok(_) => telemetry::event!(
-                        "Authenticate Agent Succeeded",
-                        agent = agent_telemetry_id
-                    ),
-                    Err(_) => {
-                        telemetry::event!("Authenticate Agent Failed", agent = agent_telemetry_id,)
-                    }
-                }
-
-                this.update_in(cx, |this, window, cx| {
-                    if let Err(err) = result {
-                        if let ThreadState::Unauthenticated {
-                            pending_auth_method,
-                            ..
-                        } = &mut this.thread_state
-                        {
-                            pending_auth_method.take();
+                    match &result {
+                        Ok(_) => telemetry::event!(
+                            "Authenticate Agent Succeeded",
+                            agent = agent.telemetry_id()
+                        ),
+                        Err(_) => {
+                            telemetry::event!(
+                                "Authenticate Agent Failed",
+                                agent = agent.telemetry_id(),
+                            )
                        }
-                        this.handle_thread_error(err, cx);
-                    } else {
-                        this.reset(window, cx);
                    }
-                    this.auth_task.take()
-                })
-                .ok();
-            }
-        }));
+
+                    this.update_in(cx, |this, window, cx| {
+                        if let Err(err) = result {
+                            if let ThreadState::Unauthenticated {
+                                pending_auth_method,
+                                ..
+                            } = &mut this.thread_state
+                            {
+                                pending_auth_method.take();
+                            }
+                            this.handle_thread_error(err, cx);
+                        } else {
+                            this.reset(window, cx);
+                        }
+                        this.auth_task.take()
+                    })
+                    .ok();
+                }
+            }));
    }

    fn spawn_external_agent_login(
@@ -1901,11 +1896,10 @@ impl AcpThreadView {
        let Some(thread) = self.thread() else {
            return;
        };
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();

        telemetry::event!(
            "Agent Tool Call Authorized",
-            agent = agent_telemetry_id,
+            agent = self.agent.telemetry_id(),
            session = thread.read(cx).session_id(),
            option = option_kind
        );
@@ -3515,9 +3509,7 @@ impl AcpThreadView {
                                        (method.id.0.clone(), method.name.clone())
                                    };

-                                    let agent_telemetry_id = connection.telemetry_id();
-
-                                    Button::new(method_id.clone(), name)
+                                    Button::new(SharedString::from(method_id.clone()), name)
                                        .label_size(LabelSize::Small)
                                        .map(|this| {
                                            if ix == 0 {
@@ -3536,7 +3528,7 @@ impl AcpThreadView {
                                            cx.listener(move |this, _, window, cx| {
                                                telemetry::event!(
                                                    "Authenticate Agent Started",
-                                                    agent = agent_telemetry_id,
+                                                    agent = this.agent.telemetry_id(),
                                                    method = method_id
                                                );

@@ -4208,11 +4200,7 @@ impl AcpThreadView {
                }
            }))
            .on_action(cx.listener(|this, _: &CycleModeSelector, window, cx| {
-                if let Some(profile_selector) = this.profile_selector.as_ref() {
-                    profile_selector.update(cx, |profile_selector, cx| {
-                        profile_selector.cycle_profile(cx);
-                    });
-                } else if let Some(mode_selector) = this.mode_selector() {
+                if let Some(mode_selector) = this.mode_selector() {
                    mode_selector.update(cx, |mode_selector, cx| {
                        mode_selector.cycle_mode(window, cx);
                    });
@@ -4863,32 +4851,6 @@ impl AcpThreadView {
        cx.notify();
    }

-    fn scroll_to_most_recent_user_prompt(&mut self, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-
-        let entries = thread.read(cx).entries();
-        if entries.is_empty() {
-            return;
-        }
-
-        // Find the most recent user message and scroll it to the top of the viewport.
-        // (Fallback: if no user message exists, scroll to the bottom.)
-        if let Some(ix) = entries
-            .iter()
-            .rposition(|entry| matches!(entry, AgentThreadEntry::UserMessage(_)))
-        {
-            self.list_state.scroll_to(ListOffset {
-                item_ix: ix,
-                offset_in_item: px(0.0),
-            });
-            cx.notify();
-        } else {
-            self.scroll_to_bottom(cx);
-        }
-    }
-
    pub fn scroll_to_bottom(&mut self, cx: &mut Context<Self>) {
        if let Some(thread) = self.thread() {
            let entry_count = thread.read(cx).entries().len();
@@ -5107,16 +5069,6 @@ impl AcpThreadView {
                }
            }));

-        let scroll_to_recent_user_prompt =
-            IconButton::new("scroll_to_recent_user_prompt", IconName::ForwardArrow)
-                .shape(ui::IconButtonShape::Square)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Ignored)
-                .tooltip(Tooltip::text("Scroll To Most Recent User Prompt"))
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.scroll_to_most_recent_user_prompt(cx);
-                }));
-
        let scroll_to_top = IconButton::new("scroll_to_top", IconName::ArrowUp)
            .shape(ui::IconButtonShape::Square)
            .icon_size(IconSize::Small)
@@ -5193,7 +5145,6 @@ impl AcpThreadView {

        container
            .child(open_as_markdown)
-            .child(scroll_to_recent_user_prompt)
            .child(scroll_to_top)
            .into_any_element()
    }
@@ -5425,39 +5376,47 @@ impl AcpThreadView {
        )
    }

-    fn render_codex_windows_warning(&self, cx: &mut Context<Self>) -> Callout {
-        Callout::new()
-            .icon(IconName::Warning)
-            .severity(Severity::Warning)
-            .title("Codex on Windows")
-            .description("For best performance, run Codex in Windows Subsystem for Linux (WSL2)")
-            .actions_slot(
-                Button::new("open-wsl-modal", "Open in WSL")
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .on_click(cx.listener({
-                        move |_, _, _window, cx| {
-                            #[cfg(windows)]
-                            _window.dispatch_action(
-                                zed_actions::wsl_actions::OpenWsl::default().boxed_clone(),
-                                cx,
-                            );
-                            cx.notify();
-                        }
-                    })),
-            )
-            .dismiss_action(
-                IconButton::new("dismiss", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .tooltip(Tooltip::text("Dismiss Warning"))
-                    .on_click(cx.listener({
-                        move |this, _, _, cx| {
-                            this.show_codex_windows_warning = false;
-                            cx.notify();
-                        }
-                    })),
+    fn render_codex_windows_warning(&self, cx: &mut Context<Self>) -> Option<Callout> {
+        if self.show_codex_windows_warning {
+            Some(
+                Callout::new()
+                    .icon(IconName::Warning)
+                    .severity(Severity::Warning)
+                    .title("Codex on Windows")
+                    .description(
+                        "For best performance, run Codex in Windows Subsystem for Linux (WSL2)",
+                    )
+                    .actions_slot(
+                        Button::new("open-wsl-modal", "Open in WSL")
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .on_click(cx.listener({
+                                move |_, _, _window, cx| {
+                                    #[cfg(windows)]
+                                    _window.dispatch_action(
+                                        zed_actions::wsl_actions::OpenWsl::default().boxed_clone(),
+                                        cx,
+                                    );
+                                    cx.notify();
+                                }
+                            })),
+                    )
+                    .dismiss_action(
+                        IconButton::new("dismiss", IconName::Close)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .tooltip(Tooltip::text("Dismiss Warning"))
+                            .on_click(cx.listener({
+                                move |this, _, _, cx| {
+                                    this.show_codex_windows_warning = false;
+                                    cx.notify();
+                                }
+                            })),
+                    ),
            )
+        } else {
+            None
+        }
    }

    fn render_thread_error(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
@@ -5977,8 +5936,12 @@ impl Render for AcpThreadView {
                _ => this,
            })
            .children(self.render_thread_retry_status_callout(window, cx))
-            .when(self.show_codex_windows_warning, |this| {
-                this.child(self.render_codex_windows_warning(cx))
+            .children({
+                if cfg!(windows) && self.project.read(cx).is_local() {
+                    self.render_codex_windows_warning(cx)
+                } else {
+                    None
+                }
            })
            .children(self.render_thread_error(window, cx))
            .when_some(
@@ -6094,13 +6057,13 @@ fn default_markdown_style(
            },
            border_color: Some(colors.border_variant),
            background: Some(colors.editor_background.into()),
-            text: TextStyleRefinement {
+            text: Some(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()),
                font_size: Some(buffer_font_size.into()),
                ..Default::default()
-            },
+            }),
            ..Default::default()
        },
        inline_code: TextStyleRefinement {
@@ -6435,7 +6398,6 @@ pub(crate) mod tests {
                    project,
                    history_store,
                    None,
-                    false,
                    window,
                    cx,
                )
@@ -6513,6 +6475,10 @@ pub(crate) mod tests {
    where
        C: 'static + AgentConnection + Send + Clone,
    {
+        fn telemetry_id(&self) -> &'static str {
+            "test"
+        }
+
        fn logo(&self) -> ui::IconName {
            ui::IconName::Ai
        }
@@ -6539,8 +6505,8 @@ pub(crate) mod tests {
    struct SaboteurAgentConnection;

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

        fn new_thread(
@@ -6603,8 +6569,8 @@ pub(crate) mod tests {
    struct RefusalAgentConnection;

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

        fn new_thread(
@@ -6705,7 +6671,6 @@ pub(crate) mod tests {
                    project.clone(),
                    history_store.clone(),
                    None,
-                    false,
                    window,
                    cx,
                )
@@ -6826,70 +6791,6 @@ pub(crate) mod tests {
        });
    }

-    #[gpui::test]
-    async fn test_scroll_to_most_recent_user_prompt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        // Each user prompt will result in a user message entry plus an agent message entry.
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response 1".into()),
-        )]);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-
-        let thread = thread_view
-            .read_with(cx, |view, _| view.thread().cloned())
-            .unwrap();
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Prompt 1", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response 2".into()),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Prompt 2", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        // Move somewhere else first so we're not trivially already on the last user prompt.
-        thread_view.update(cx, |view, cx| {
-            view.scroll_to_top(cx);
-        });
-        cx.run_until_parked();
-
-        thread_view.update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
-            let scroll_top = view.list_state.logical_scroll_top();
-            // Entries layout is: [User1, Assistant1, User2, Assistant2]
-            assert_eq!(scroll_top.item_ix, 2);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_scroll_to_most_recent_user_prompt_falls_back_to_bottom_without_user_messages(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        // With no entries, scrolling should be a no-op and must not panic.
-        thread_view.update(cx, |view, cx| {
-            view.scroll_to_most_recent_user_prompt(cx);
-            let scroll_top = view.list_state.logical_scroll_top();
-            assert_eq!(scroll_top.item_ix, 0);
-        });
-    }
-
    #[gpui::test]
    async fn test_message_editing_cancel(cx: &mut TestAppContext) {
        init_test(cx);
--- 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, 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()
@@ -975,12 +975,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 +1084,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiClaude),
                                "Claude Code",
-                                "Claude Code",
                                false,
                                cx,
                            ))
@@ -1095,7 +1091,6 @@ impl AgentConfiguration {
                            .child(self.render_agent_server(
                                AgentIcon::Name(IconName::AiOpenAi),
                                "Codex CLI",
-                                "Codex CLI",
                                false,
                                cx,
                            ))
@@ -1103,23 +1098,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 +1118,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 +1132,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 +1161,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 {
--- 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,26 +1,23 @@
 use crate::{context::LoadedContext, inline_prompt_editor::CodegenStatus};
 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 language::{Buffer, IndentKind, Point, TransactionId, line_diff};
 use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelRequestTool, LanguageModelTextStream, LanguageModelToolChoice,
-    LanguageModelToolUse, Role, TokenUsage,
+    LanguageModel, LanguageModelCompletionError, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelTextStream, Role,
+    report_assistant_event,
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
@@ -28,7 +25,6 @@ use prompt_store::PromptBuilder;
 use rope::Rope;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::Settings as _;
 use smol::future::FutureExt;
 use std::{
    cmp,
@@ -41,24 +37,28 @@ use std::{
    time::Instant,
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use ui::SharedString;

-/// 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
+/// 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 or to ask a question about the request.
-    #[serde(default)]
+    ///
+    /// The message may use markdown formatting if you wish.
    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 {
+    /// A brief description of the edit you have made.
+    ///
+    /// The description may use markdown formatting if you wish.
+    /// 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.
-    #[serde(default)]
    pub replacement_text: String,
 }

@@ -70,9 +70,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 +80,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 +89,8 @@ impl BufferCodegen {
                buffer.clone(),
                range.clone(),
                false,
+                Some(telemetry.clone()),
                builder.clone(),
-                session_id,
                cx,
            )
        });
@@ -103,8 +103,8 @@ impl BufferCodegen {
            buffer,
            range,
            initial_transaction_id,
+            telemetry,
            builder,
-            session_id,
        };
        this.activate(0, cx);
        this
@@ -119,18 +119,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 +181,8 @@ impl BufferCodegen {
                    self.buffer.clone(),
                    self.range.clone(),
                    false,
+                    Some(self.telemetry.clone()),
                    self.builder.clone(),
-                    self.session_id,
                    cx,
                )
            }));
@@ -249,14 +241,6 @@ impl BufferCodegen {
    pub fn last_equal_ranges<'a>(&self, cx: &'a App) -> &'a [Range<Anchor>] {
        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
-    }
 }

 impl EventEmitter<CodegenEvent> for BufferCodegen {}
@@ -272,6 +256,7 @@ pub struct CodegenAlternative {
    status: CodegenStatus,
    generation: Task<()>,
    diff: Diff,
+    telemetry: Option<Arc<Telemetry>>,
    _subscription: gpui::Subscription,
    builder: Arc<PromptBuilder>,
    active: bool,
@@ -279,11 +264,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 model_explanation: Option<SharedString>,
 }

 impl EventEmitter<CodegenEvent> for CodegenAlternative {}
@@ -293,8 +275,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,6 +315,7 @@ impl CodegenAlternative {
            status: CodegenStatus::Idle,
            generation: Task::ready(()),
            diff: Diff::default(),
+            telemetry,
            builder,
            active: active,
            edits: Vec::new(),
@@ -340,21 +323,11 @@ impl CodegenAlternative {
            range,
            elapsed_time: None,
            completion: None,
-            selected_text: None,
-            session_id,
-            description: None,
-            failure: None,
+            model_explanation: 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 +369,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 +376,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 +384,33 @@ 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>() {
            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| model.stream_completion_tool(request.await, cx).await);
+            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 +446,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 +456,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 {
@@ -538,7 +498,7 @@ impl CodegenAlternative {
                intent: Some(CompletionIntent::InlineAssist),
                mode: None,
                tools,
-                tool_choice,
+                tool_choice: None,
                stop: Vec::new(),
                temperature,
                messages,
@@ -554,8 +514,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);
@@ -628,14 +588,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 +608,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 +629,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,8 +647,7 @@ impl CodegenAlternative {
        let completion = Arc::new(Mutex::new(String::new()));
        let completion_clone = completion.clone();

-        cx.notify();
-        cx.spawn(async move |codegen, cx| {
+        self.generation = cx.spawn(async move |codegen, cx| {
            let stream = stream.await;

            let token_usage = stream
@@ -705,11 +662,10 @@ impl CodegenAlternative {
                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 {
+                let line_based_stream_diff: Task<anyhow::Result<()>> =
+                    cx.background_spawn(async move {
                        let mut response_latency = None;
                        let request_start = Instant::now();
                        let diff = async {
@@ -717,7 +673,6 @@ impl CodegenAlternative {
                                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();

@@ -806,30 +761,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 +864,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,27 +1040,21 @@ 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| {
+        self.generation = cx.spawn(async move |codegen, cx| {
            let finish_with_status = |status: CodegenStatus, cx: &mut AsyncApp| {
                let _ = codegen.update(cx, |this, cx| {
                    this.status = status;
@@ -1134,188 +1063,76 @@ impl CodegenAlternative {
                });
            };

-            let mut completion_events = match completion_stream.await {
-                Ok(events) => events,
-                Err(err) => {
-                    finish_with_status(CodegenStatus::Error(err.into()), cx);
-                    return;
-                }
-            };
+            let tool_use = tool_use.await;

-            enum ToolUseOutput {
-                Rewrite {
-                    text: String,
-                    description: Option<String>,
-                },
-                Failure(String),
-            }
+            match tool_use {
+                Ok(tool_use) if tool_use.name.as_ref() == "rewrite_section" => {
+                    // Parse the input JSON into RewriteSectionInput
+                    match serde_json::from_value::<RewriteSectionInput>(tool_use.input) {
+                        Ok(input) => {
+                            // Store the description if non-empty
+                            let description = if !input.description.trim().is_empty() {
+                                Some(input.description.clone())
+                            } else {
+                                None
+                            };

-            enum ModelUpdate {
-                Description(String),
-                Failure(String),
-            }
+                            // Apply the replacement text to the buffer and compute diff
+                            let batch_diff_task = codegen
+                                .update(cx, |this, cx| {
+                                    this.model_explanation = description.map(Into::into);
+                                    let range = this.range.clone();
+                                    this.apply_edits(
+                                        std::iter::once((range, input.replacement_text)),
+                                        cx,
+                                    );
+                                    this.reapply_batch_diff(cx)
+                                })
+                                .ok();

-            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,
-                }
-            };
-
-            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;
+
+                            finish_with_status(CodegenStatus::Done, cx);
+                            return;
                        }
                        Err(e) => {
                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            break;
+                            return;
                        }
                    }
                }
-            }
-
-            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
-                            }
+                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) => {
+                            let _ = codegen.update(cx, |this, _cx| {
+                                // Store the failure message as the tool description
+                                this.model_explanation = Some(input.message.into());
+                            });
+                            finish_with_status(CodegenStatus::Done, cx);
+                            return;
+                        }
+                        Err(e) => {
+                            finish_with_status(CodegenStatus::Error(e.into()), cx);
+                            return;
                        }
                    }
-                }),
-            ));
-
-            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;
-        })
+                }
+                Ok(_tool_use) => {
+                    // Unexpected tool.
+                    finish_with_status(CodegenStatus::Done, cx);
+                    return;
+                }
+                Err(e) => {
+                    finish_with_status(CodegenStatus::Error(e.into()), cx);
+                    return;
+                }
+            }
+        });
+        cx.notify();
    }
 }

@@ -1479,7 +1296,6 @@ mod tests {
    use gpui::TestAppContext;
    use indoc::indoc;
    use language::{Buffer, Point};
-    use language_model::fake_provider::FakeLanguageModel;
    use language_model::{LanguageModelRegistry, TokenUsage};
    use languages::rust_lang;
    use rand::prelude::*;
@@ -1510,8 +1326,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1572,8 +1388,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1636,8 +1452,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1700,8 +1516,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                true,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1752,8 +1568,8 @@ mod tests {
                buffer.clone(),
                range.clone(),
                false,
+                None,
                prompt_builder,
-                Uuid::new_v4(),
                cx,
            )
        });
@@ -1842,10 +1658,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(),
--- a/crates/agent_ui/src/evals.rs
+++ b/crates/agent_ui/src/evals.rs
@@ -0,0 +1,89 @@
+use std::str::FromStr;
+
+use crate::inline_assistant::test::run_inline_assistant_test;
+
+use eval_utils::{EvalOutput, NoProcessor};
+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(20, 1.0, NoProcessor, move || {
+        run_eval(
+            &EvalInput {
+                prompt: "Rename this variable to buffer_text".to_string(),
+                buffer: indoc::indoc! {"
+                    struct EvalExampleStruct {
+                        text: Strˇing,
+                        prompt: String,
+                    }
+                "}
+                .to_string(),
+            },
+            &|_, output| {
+                let expected = indoc::indoc! {"
+                    struct EvalExampleStruct {
+                        buffer_text: String,
+                        prompt: String,
+                    }
+                    "};
+                if output == expected {
+                    EvalOutput {
+                        outcome: eval_utils::OutcomeKind::Passed,
+                        data: "Passed!".to_string(),
+                        metadata: (),
+                    }
+                } else {
+                    EvalOutput {
+                        outcome: eval_utils::OutcomeKind::Failed,
+                        data: format!("Failed to rename variable, output: {}", output),
+                        metadata: (),
+                    }
+                }
+            },
+        )
+    });
+}
+
+struct EvalInput {
+    buffer: String,
+    prompt: String,
+}
+
+fn run_eval(
+    input: &EvalInput,
+    judge: &dyn Fn(&EvalInput, &str) -> eval_utils::EvalOutput<()>,
+) -> eval_utils::EvalOutput<()> {
+    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
+    let mut cx = TestAppContext::build(dispatcher, None);
+    cx.skip_drawing();
+
+    let buffer_text = run_inline_assistant_test(
+        input.buffer.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,
+    );
+
+    judge(input, &buffer_text)
+}
--- 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(),
                );
            }

@@ -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 model_explanation = codegen.model_explanation(cx);

        editor.update(cx, |editor, cx| {
+            // Update tool description block
+            // if let Some(description) = model_explanation {
+            //     if let Some(block_id) = decorations.model_explanation {
+            //         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.model_explanation = new_block_id.into_iter().next();
+            //     }
+            // } else if let Some(block_id) = decorations.model_explanation {
+            //     // 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.model_explanation = 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 {
@@ -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);
@@ -2166,217 +2168,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)]
+    pub fn test_inline_assistant(
+        base_buffer: &'static str,
+        llm_output: &'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,11 +8,10 @@ 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, Entity, EventEmitter, FocusHandle, Focusable, Subscription,
+    TextStyle, TextStyleRefinement, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
@@ -27,13 +26,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 +39,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 +54,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>,
 }

@@ -101,11 +84,11 @@ 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());
+                let explanation = codegen
+                    .active_alternative()
+                    .read(cx)
+                    .model_explanation
+                    .clone();

                (left_gutter_width, right_padding, explanation)
            }
@@ -139,7 +122,7 @@ impl<T: 'static> Render for PromptEditor<T> {

        if let Some(explanation) = &explanation {
            markdown.update(cx, |markdown, cx| {
-                markdown.reset(SharedString::from(explanation), cx);
+                markdown.reset(explanation.clone(), cx);
            });
        }

@@ -170,8 +153,6 @@ 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(
@@ -448,7 +429,6 @@ impl<T: 'static> PromptEditor<T> {
                }

                self.edited_since_done = true;
-                self.session_state.completion = CompletionState::Pending;
                cx.notify();
            }
            EditorEvent::Blurred => {
@@ -520,207 +500,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 +621,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 +632,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],
                    }
                }
            }
@@ -1151,7 +909,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 +979,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 +989,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 +998,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 +1057,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 +1122,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 +1154,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/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
@@ -3324,6 +3324,7 @@ mod tests {
            let mut text_thread = TextThread::local(
                registry,
                None,
+                None,
                prompt_builder.clone(),
                Arc::new(SlashCommandWorkingSet::default()),
                cx,
--- a/crates/agent_ui_v2/Cargo.toml
+++ b/crates/agent_ui_v2/Cargo.toml
@@ -1,40 +0,0 @@
-[package]
-name = "agent_ui_v2"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_ui_v2.rs"
-doctest = false
-
-[dependencies]
-agent.workspace = true
-agent_servers.workspace = true
-agent_settings.workspace = true
-agent_ui.workspace = true
-anyhow.workspace = true
-assistant_text_thread.workspace = true
-chrono.workspace = true
-db.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-menu.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-text.workspace = true
-time.workspace = true
-time_format.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
--- a/crates/agent_ui_v2/LICENSE-GPL
+++ b/crates/agent_ui_v2/LICENSE-GPL
@@ -1 +0,0 @@
-LICENSE-GPL
--- a/crates/agent_ui_v2/src/agent_thread_pane.rs
+++ b/crates/agent_ui_v2/src/agent_thread_pane.rs
@@ -1,287 +0,0 @@
-use agent::{HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
-use agent_servers::AgentServer;
-use agent_settings::AgentSettings;
-use agent_ui::acp::AcpThreadView;
-use fs::Fs;
-use gpui::{
-    Entity, EventEmitter, Focusable, Pixels, SharedString, Subscription, WeakEntity, prelude::*,
-};
-use project::Project;
-use prompt_store::PromptStore;
-use serde::{Deserialize, Serialize};
-use settings::DockSide;
-use settings::Settings as _;
-use std::rc::Rc;
-use std::sync::Arc;
-use ui::{Tab, Tooltip, prelude::*};
-use workspace::{
-    Workspace,
-    dock::{ClosePane, MinimizePane, UtilityPane, UtilityPanePosition},
-    utility_pane::UtilityPaneSlot,
-};
-
-pub const DEFAULT_UTILITY_PANE_WIDTH: Pixels = gpui::px(400.0);
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum SerializedHistoryEntryId {
-    AcpThread(String),
-    TextThread(String),
-}
-
-impl From<HistoryEntryId> for SerializedHistoryEntryId {
-    fn from(id: HistoryEntryId) -> Self {
-        match id {
-            HistoryEntryId::AcpThread(session_id) => {
-                SerializedHistoryEntryId::AcpThread(session_id.0.to_string())
-            }
-            HistoryEntryId::TextThread(path) => {
-                SerializedHistoryEntryId::TextThread(path.to_string_lossy().to_string())
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct SerializedAgentThreadPane {
-    pub expanded: bool,
-    pub width: Option<Pixels>,
-    pub thread_id: Option<SerializedHistoryEntryId>,
-}
-
-pub enum AgentsUtilityPaneEvent {
-    StateChanged,
-}
-
-impl EventEmitter<AgentsUtilityPaneEvent> for AgentThreadPane {}
-impl EventEmitter<MinimizePane> for AgentThreadPane {}
-impl EventEmitter<ClosePane> for AgentThreadPane {}
-
-struct ActiveThreadView {
-    view: Entity<AcpThreadView>,
-    thread_id: HistoryEntryId,
-    _notify: Subscription,
-}
-
-pub struct AgentThreadPane {
-    focus_handle: gpui::FocusHandle,
-    expanded: bool,
-    width: Option<Pixels>,
-    thread_view: Option<ActiveThreadView>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl AgentThreadPane {
-    pub fn new(workspace: WeakEntity<Workspace>, cx: &mut ui::Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-        Self {
-            focus_handle,
-            expanded: false,
-            width: None,
-            thread_view: None,
-            workspace,
-        }
-    }
-
-    pub fn thread_id(&self) -> Option<HistoryEntryId> {
-        self.thread_view.as_ref().map(|tv| tv.thread_id.clone())
-    }
-
-    pub fn serialize(&self) -> SerializedAgentThreadPane {
-        SerializedAgentThreadPane {
-            expanded: self.expanded,
-            width: self.width,
-            thread_id: self.thread_id().map(SerializedHistoryEntryId::from),
-        }
-    }
-
-    pub fn open_thread(
-        &mut self,
-        entry: HistoryEntry,
-        fs: Arc<dyn Fs>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let thread_id = entry.id();
-
-        let resume_thread = match &entry {
-            HistoryEntry::AcpThread(thread) => Some(thread.clone()),
-            HistoryEntry::TextThread(_) => None,
-        };
-
-        let agent: Rc<dyn AgentServer> = Rc::new(NativeAgentServer::new(fs, history_store.clone()));
-
-        let thread_view = cx.new(|cx| {
-            AcpThreadView::new(
-                agent,
-                resume_thread,
-                None,
-                workspace,
-                project,
-                history_store,
-                prompt_store,
-                true,
-                window,
-                cx,
-            )
-        });
-
-        let notify = cx.observe(&thread_view, |_, _, cx| {
-            cx.notify();
-        });
-
-        self.thread_view = Some(ActiveThreadView {
-            view: thread_view,
-            thread_id,
-            _notify: notify,
-        });
-
-        cx.notify();
-    }
-
-    fn title(&self, cx: &App) -> SharedString {
-        if let Some(active_thread_view) = &self.thread_view {
-            let thread_view = active_thread_view.view.read(cx);
-            if let Some(thread) = thread_view.thread() {
-                let title = thread.read(cx).title();
-                if !title.is_empty() {
-                    return title;
-                }
-            }
-            thread_view.title(cx)
-        } else {
-            "Thread".into()
-        }
-    }
-
-    fn render_header(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let position = self.position(window, cx);
-        let slot = match position {
-            UtilityPanePosition::Left => UtilityPaneSlot::Left,
-            UtilityPanePosition::Right => UtilityPaneSlot::Right,
-        };
-
-        let workspace = self.workspace.clone();
-        let toggle_icon = self.toggle_icon(cx);
-        let title = self.title(cx);
-
-        let pane_toggle_button = |workspace: WeakEntity<Workspace>| {
-            IconButton::new("toggle_utility_pane", toggle_icon)
-                .icon_size(IconSize::Small)
-                .tooltip(Tooltip::text("Toggle Agent Pane"))
-                .on_click(move |_, window, cx| {
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.toggle_utility_pane(slot, window, cx)
-                        })
-                        .ok();
-                })
-        };
-
-        h_flex()
-            .id("utility-pane-header")
-            .w_full()
-            .h(Tab::container_height(cx))
-            .px_1p5()
-            .gap(DynamicSpacing::Base06.rems(cx))
-            .when(slot == UtilityPaneSlot::Right, |this| {
-                this.flex_row_reverse()
-            })
-            .flex_none()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(pane_toggle_button(workspace))
-            .child(
-                h_flex()
-                    .size_full()
-                    .min_w_0()
-                    .gap_1()
-                    .map(|this| {
-                        if slot == UtilityPaneSlot::Right {
-                            this.flex_row_reverse().justify_start()
-                        } else {
-                            this.justify_between()
-                        }
-                    })
-                    .child(Label::new(title).truncate())
-                    .child(
-                        IconButton::new("close_btn", IconName::Close)
-                            .icon_size(IconSize::Small)
-                            .tooltip(Tooltip::text("Close Agent Pane"))
-                            .on_click(cx.listener(|this, _: &gpui::ClickEvent, _window, cx| {
-                                cx.emit(ClosePane);
-                                this.thread_view = None;
-                                cx.notify()
-                            })),
-                    ),
-            )
-    }
-}
-
-impl Focusable for AgentThreadPane {
-    fn focus_handle(&self, cx: &ui::App) -> gpui::FocusHandle {
-        if let Some(thread_view) = &self.thread_view {
-            thread_view.view.focus_handle(cx)
-        } else {
-            self.focus_handle.clone()
-        }
-    }
-}
-
-impl UtilityPane for AgentThreadPane {
-    fn position(&self, _window: &Window, cx: &App) -> UtilityPanePosition {
-        match AgentSettings::get_global(cx).agents_panel_dock {
-            DockSide::Left => UtilityPanePosition::Left,
-            DockSide::Right => UtilityPanePosition::Right,
-        }
-    }
-
-    fn toggle_icon(&self, _cx: &App) -> IconName {
-        IconName::Thread
-    }
-
-    fn expanded(&self, _cx: &App) -> bool {
-        self.expanded
-    }
-
-    fn set_expanded(&mut self, expanded: bool, cx: &mut Context<Self>) {
-        self.expanded = expanded;
-        cx.emit(AgentsUtilityPaneEvent::StateChanged);
-        cx.notify();
-    }
-
-    fn width(&self, _cx: &App) -> Pixels {
-        self.width.unwrap_or(DEFAULT_UTILITY_PANE_WIDTH)
-    }
-
-    fn set_width(&mut self, width: Option<Pixels>, cx: &mut Context<Self>) {
-        self.width = width;
-        cx.emit(AgentsUtilityPaneEvent::StateChanged);
-        cx.notify();
-    }
-}
-
-impl Render for AgentThreadPane {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let content = if let Some(thread_view) = &self.thread_view {
-            div().size_full().child(thread_view.view.clone())
-        } else {
-            div()
-                .size_full()
-                .flex()
-                .items_center()
-                .justify_center()
-                .child(Label::new("Select a thread to view details").size(LabelSize::Default))
-        };
-
-        div()
-            .size_full()
-            .flex()
-            .flex_col()
-            .child(self.render_header(window, cx))
-            .child(content)
-    }
-}
--- a/crates/agent_ui_v2/src/agent_ui_v2.rs
+++ b/crates/agent_ui_v2/src/agent_ui_v2.rs
@@ -1,4 +0,0 @@
-mod agent_thread_pane;
-mod thread_history;
-
-pub mod agents_panel;
--- a/crates/agent_ui_v2/src/agents_panel.rs
+++ b/crates/agent_ui_v2/src/agents_panel.rs
@@ -1,437 +0,0 @@
-use agent::{HistoryEntry, HistoryEntryId, HistoryStore};
-use agent_settings::AgentSettings;
-use anyhow::Result;
-use assistant_text_thread::TextThreadStore;
-use db::kvp::KEY_VALUE_STORE;
-use feature_flags::{AgentV2FeatureFlag, FeatureFlagAppExt};
-use fs::Fs;
-use gpui::{
-    Action, AsyncWindowContext, Entity, EventEmitter, Focusable, Pixels, Subscription, Task,
-    WeakEntity, actions, prelude::*,
-};
-use project::Project;
-use prompt_store::{PromptBuilder, PromptStore};
-use serde::{Deserialize, Serialize};
-use settings::{Settings as _, update_settings_file};
-use std::sync::Arc;
-use ui::{App, Context, IconName, IntoElement, ParentElement, Render, Styled, Window};
-use util::ResultExt;
-use workspace::{
-    Panel, Workspace,
-    dock::{ClosePane, DockPosition, PanelEvent, UtilityPane},
-    utility_pane::{UtilityPaneSlot, utility_slot_for_dock_position},
-};
-
-use crate::agent_thread_pane::{
-    AgentThreadPane, AgentsUtilityPaneEvent, SerializedAgentThreadPane, SerializedHistoryEntryId,
-};
-use crate::thread_history::{AcpThreadHistory, ThreadHistoryEvent};
-
-const AGENTS_PANEL_KEY: &str = "agents_panel";
-
-#[derive(Serialize, Deserialize, Debug)]
-struct SerializedAgentsPanel {
-    width: Option<Pixels>,
-    pane: Option<SerializedAgentThreadPane>,
-}
-
-actions!(
-    agents,
-    [
-        /// Toggle the visibility of the agents panel.
-        ToggleAgentsPanel
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleAgentsPanel, window, cx| {
-            workspace.toggle_panel_focus::<AgentsPanel>(window, cx);
-        });
-    })
-    .detach();
-}
-
-pub struct AgentsPanel {
-    focus_handle: gpui::FocusHandle,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    agent_thread_pane: Option<Entity<AgentThreadPane>>,
-    history: Entity<AcpThreadHistory>,
-    history_store: Entity<HistoryStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    fs: Arc<dyn Fs>,
-    width: Option<Pixels>,
-    pending_serialization: Task<Option<()>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl AgentsPanel {
-    pub fn load(
-        workspace: WeakEntity<Workspace>,
-        cx: AsyncWindowContext,
-    ) -> Task<Result<Entity<Self>, anyhow::Error>> {
-        cx.spawn(async move |cx| {
-            let serialized_panel = cx
-                .background_spawn(async move {
-                    KEY_VALUE_STORE
-                        .read_kvp(AGENTS_PANEL_KEY)
-                        .ok()
-                        .flatten()
-                        .and_then(|panel| {
-                            serde_json::from_str::<SerializedAgentsPanel>(&panel).ok()
-                        })
-                })
-                .await;
-
-            let (fs, project, prompt_builder) = workspace.update(cx, |workspace, cx| {
-                let fs = workspace.app_state().fs.clone();
-                let project = workspace.project().clone();
-                let prompt_builder = PromptBuilder::load(fs.clone(), false, cx);
-                (fs, project, prompt_builder)
-            })?;
-
-            let text_thread_store = workspace
-                .update(cx, |_, cx| {
-                    TextThreadStore::new(
-                        project.clone(),
-                        prompt_builder.clone(),
-                        Default::default(),
-                        cx,
-                    )
-                })?
-                .await?;
-
-            let prompt_store = workspace
-                .update(cx, |_, cx| PromptStore::global(cx))?
-                .await
-                .log_err();
-
-            workspace.update_in(cx, |_, window, cx| {
-                cx.new(|cx| {
-                    let mut panel = Self::new(
-                        workspace.clone(),
-                        fs,
-                        project,
-                        prompt_store,
-                        text_thread_store,
-                        window,
-                        cx,
-                    );
-                    if let Some(serialized_panel) = serialized_panel {
-                        panel.width = serialized_panel.width;
-                        if let Some(serialized_pane) = serialized_panel.pane {
-                            panel.restore_utility_pane(serialized_pane, window, cx);
-                        }
-                    }
-                    panel
-                })
-            })
-        })
-    }
-
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        fs: Arc<dyn Fs>,
-        project: Entity<Project>,
-        prompt_store: Option<Entity<PromptStore>>,
-        text_thread_store: Entity<TextThreadStore>,
-        window: &mut Window,
-        cx: &mut ui::Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let history = cx.new(|cx| AcpThreadHistory::new(history_store.clone(), window, cx));
-
-        let this = cx.weak_entity();
-        let subscriptions = vec![
-            cx.subscribe_in(&history, window, Self::handle_history_event),
-            cx.on_flags_ready(move |_, cx| {
-                this.update(cx, |_, cx| {
-                    cx.notify();
-                })
-                .ok();
-            }),
-        ];
-
-        Self {
-            focus_handle,
-            workspace,
-            project,
-            agent_thread_pane: None,
-            history,
-            history_store,
-            prompt_store,
-            fs,
-            width: None,
-            pending_serialization: Task::ready(None),
-            _subscriptions: subscriptions,
-        }
-    }
-
-    fn restore_utility_pane(
-        &mut self,
-        serialized_pane: SerializedAgentThreadPane,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread_id) = &serialized_pane.thread_id else {
-            return;
-        };
-
-        let entry = self
-            .history_store
-            .read(cx)
-            .entries()
-            .find(|e| match (&e.id(), thread_id) {
-                (
-                    HistoryEntryId::AcpThread(session_id),
-                    SerializedHistoryEntryId::AcpThread(id),
-                ) => session_id.to_string() == *id,
-                (HistoryEntryId::TextThread(path), SerializedHistoryEntryId::TextThread(id)) => {
-                    path.to_string_lossy() == *id
-                }
-                _ => false,
-            });
-
-        if let Some(entry) = entry {
-            self.open_thread(
-                entry,
-                serialized_pane.expanded,
-                serialized_pane.width,
-                window,
-                cx,
-            );
-        }
-    }
-
-    fn handle_utility_pane_event(
-        &mut self,
-        _utility_pane: Entity<AgentThreadPane>,
-        event: &AgentsUtilityPaneEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AgentsUtilityPaneEvent::StateChanged => {
-                self.serialize(cx);
-                cx.notify();
-            }
-        }
-    }
-
-    fn handle_close_pane_event(
-        &mut self,
-        _utility_pane: Entity<AgentThreadPane>,
-        _event: &ClosePane,
-        cx: &mut Context<Self>,
-    ) {
-        self.agent_thread_pane = None;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn handle_history_event(
-        &mut self,
-        _history: &Entity<AcpThreadHistory>,
-        event: &ThreadHistoryEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ThreadHistoryEvent::Open(entry) => {
-                self.open_thread(entry.clone(), true, None, window, cx);
-            }
-        }
-    }
-
-    fn open_thread(
-        &mut self,
-        entry: HistoryEntry,
-        expanded: bool,
-        width: Option<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let entry_id = entry.id();
-
-        if let Some(existing_pane) = &self.agent_thread_pane {
-            if existing_pane.read(cx).thread_id() == Some(entry_id) {
-                existing_pane.update(cx, |pane, cx| {
-                    pane.set_expanded(true, cx);
-                });
-                return;
-            }
-        }
-
-        let fs = self.fs.clone();
-        let workspace = self.workspace.clone();
-        let project = self.project.clone();
-        let history_store = self.history_store.clone();
-        let prompt_store = self.prompt_store.clone();
-
-        let agent_thread_pane = cx.new(|cx| {
-            let mut pane = AgentThreadPane::new(workspace.clone(), cx);
-            pane.open_thread(
-                entry,
-                fs,
-                workspace.clone(),
-                project,
-                history_store,
-                prompt_store,
-                window,
-                cx,
-            );
-            if let Some(width) = width {
-                pane.set_width(Some(width), cx);
-            }
-            pane.set_expanded(expanded, cx);
-            pane
-        });
-
-        let state_subscription = cx.subscribe(&agent_thread_pane, Self::handle_utility_pane_event);
-        let close_subscription = cx.subscribe(&agent_thread_pane, Self::handle_close_pane_event);
-
-        self._subscriptions.push(state_subscription);
-        self._subscriptions.push(close_subscription);
-
-        let slot = self.utility_slot(window, cx);
-        let panel_id = cx.entity_id();
-
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                workspace.register_utility_pane(slot, panel_id, agent_thread_pane.clone(), cx);
-            });
-        }
-
-        self.agent_thread_pane = Some(agent_thread_pane);
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn utility_slot(&self, window: &Window, cx: &App) -> UtilityPaneSlot {
-        let position = self.position(window, cx);
-        utility_slot_for_dock_position(position)
-    }
-
-    fn re_register_utility_pane(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(pane) = &self.agent_thread_pane {
-            let slot = self.utility_slot(window, cx);
-            let panel_id = cx.entity_id();
-            let pane = pane.clone();
-
-            if let Some(workspace) = self.workspace.upgrade() {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.register_utility_pane(slot, panel_id, pane, cx);
-                });
-            }
-        }
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let width = self.width;
-        let pane = self
-            .agent_thread_pane
-            .as_ref()
-            .map(|pane| pane.read(cx).serialize());
-
-        self.pending_serialization = cx.background_spawn(async move {
-            KEY_VALUE_STORE
-                .write_kvp(
-                    AGENTS_PANEL_KEY.into(),
-                    serde_json::to_string(&SerializedAgentsPanel { width, pane }).unwrap(),
-                )
-                .await
-                .log_err()
-        });
-    }
-}
-
-impl EventEmitter<PanelEvent> for AgentsPanel {}
-
-impl Focusable for AgentsPanel {
-    fn focus_handle(&self, _cx: &ui::App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Panel for AgentsPanel {
-    fn persistent_name() -> &'static str {
-        "AgentsPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        AGENTS_PANEL_KEY
-    }
-
-    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
-        match AgentSettings::get_global(cx).agents_panel_dock {
-            settings::DockSide::Left => DockPosition::Left,
-            settings::DockSide::Right => DockPosition::Right,
-        }
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        position != DockPosition::Bottom
-    }
-
-    fn set_position(
-        &mut self,
-        position: DockPosition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings.agent.get_or_insert_default().agents_panel_dock = Some(match position {
-                DockPosition::Left => settings::DockSide::Left,
-                DockPosition::Right | DockPosition::Bottom => settings::DockSide::Right,
-            });
-        });
-        self.re_register_utility_pane(window, cx);
-    }
-
-    fn size(&self, window: &Window, cx: &App) -> Pixels {
-        let settings = AgentSettings::get_global(cx);
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => {
-                self.width.unwrap_or(settings.default_width)
-            }
-            DockPosition::Bottom => self.width.unwrap_or(settings.default_height),
-        }
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => self.width = size,
-            DockPosition::Bottom => {}
-        }
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn icon(&self, _window: &Window, cx: &App) -> Option<IconName> {
-        (self.enabled(cx) && AgentSettings::get_global(cx).button).then_some(IconName::ZedAgentTwo)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Agents Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleAgentsPanel)
-    }
-
-    fn activation_priority(&self) -> u32 {
-        4
-    }
-
-    fn enabled(&self, cx: &App) -> bool {
-        AgentSettings::get_global(cx).enabled(cx) && cx.has_flag::<AgentV2FeatureFlag>()
-    }
-}
-
-impl Render for AgentsPanel {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        gpui::div().size_full().child(self.history.clone())
-    }
-}
--- a/crates/agent_ui_v2/src/thread_history.rs
+++ b/crates/agent_ui_v2/src/thread_history.rs
@@ -1,735 +0,0 @@
-use agent::{HistoryEntry, HistoryStore};
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
-use editor::{Editor, EditorEvent};
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    App, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Task,
-    UniformListScrollHandle, Window, actions, uniform_list,
-};
-use std::{fmt::Display, ops::Range};
-use text::Bias;
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Tab, Tooltip, WithScrollbar,
-    prelude::*,
-};
-
-actions!(
-    agents,
-    [
-        /// Removes all thread history.
-        RemoveHistory,
-        /// Removes the currently selected thread.
-        RemoveSelectedThread,
-    ]
-);
-
-pub struct AcpThreadHistory {
-    pub(crate) history_store: Entity<HistoryStore>,
-    scroll_handle: UniformListScrollHandle,
-    selected_index: usize,
-    hovered_index: Option<usize>,
-    search_editor: Entity<Editor>,
-    search_query: SharedString,
-    visible_items: Vec<ListItemType>,
-    local_timezone: UtcOffset,
-    confirming_delete_history: bool,
-    _update_task: Task<()>,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-enum ListItemType {
-    BucketSeparator(TimeBucket),
-    Entry {
-        entry: HistoryEntry,
-        format: EntryTimeFormat,
-    },
-    SearchResult {
-        entry: HistoryEntry,
-        positions: Vec<usize>,
-    },
-}
-
-impl ListItemType {
-    fn history_entry(&self) -> Option<&HistoryEntry> {
-        match self {
-            ListItemType::Entry { entry, .. } => Some(entry),
-            ListItemType::SearchResult { entry, .. } => Some(entry),
-            _ => None,
-        }
-    }
-}
-
-#[allow(dead_code)]
-pub enum ThreadHistoryEvent {
-    Open(HistoryEntry),
-}
-
-impl EventEmitter<ThreadHistoryEvent> for AcpThreadHistory {}
-
-impl AcpThreadHistory {
-    pub fn new(
-        history_store: Entity<agent::HistoryStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let search_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", window, cx);
-            editor
-        });
-
-        let search_editor_subscription =
-            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    let query = search_editor.read(cx).text(cx);
-                    if this.search_query != query {
-                        this.search_query = query.into();
-                        this.update_visible_items(false, cx);
-                    }
-                }
-            });
-
-        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
-            this.update_visible_items(true, cx);
-        });
-
-        let scroll_handle = UniformListScrollHandle::default();
-
-        let mut this = Self {
-            history_store,
-            scroll_handle,
-            selected_index: 0,
-            hovered_index: None,
-            visible_items: Default::default(),
-            search_editor,
-            local_timezone: UtcOffset::from_whole_seconds(
-                chrono::Local::now().offset().local_minus_utc(),
-            )
-            .unwrap(),
-            search_query: SharedString::default(),
-            confirming_delete_history: false,
-            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _update_task: Task::ready(()),
-        };
-        this.update_visible_items(false, cx);
-        this
-    }
-
-    fn update_visible_items(&mut self, preserve_selected_item: bool, cx: &mut Context<Self>) {
-        let entries = self
-            .history_store
-            .update(cx, |store, _| store.entries().collect());
-        let new_list_items = if self.search_query.is_empty() {
-            self.add_list_separators(entries, cx)
-        } else {
-            self.filter_search_results(entries, cx)
-        };
-        let selected_history_entry = if preserve_selected_item {
-            self.selected_history_entry().cloned()
-        } else {
-            None
-        };
-
-        self._update_task = cx.spawn(async move |this, cx| {
-            let new_visible_items = new_list_items.await;
-            this.update(cx, |this, cx| {
-                let new_selected_index = if let Some(history_entry) = selected_history_entry {
-                    let history_entry_id = history_entry.id();
-                    new_visible_items
-                        .iter()
-                        .position(|visible_entry| {
-                            visible_entry
-                                .history_entry()
-                                .is_some_and(|entry| entry.id() == history_entry_id)
-                        })
-                        .unwrap_or(0)
-                } else {
-                    0
-                };
-
-                this.visible_items = new_visible_items;
-                this.set_selected_index(new_selected_index, Bias::Right, cx);
-                cx.notify();
-            })
-            .ok();
-        });
-    }
-
-    fn add_list_separators(&self, entries: Vec<HistoryEntry>, cx: &App) -> Task<Vec<ListItemType>> {
-        cx.background_spawn(async move {
-            let mut items = Vec::with_capacity(entries.len() + 1);
-            let mut bucket = None;
-            let today = Local::now().naive_local().date();
-
-            for entry in entries.into_iter() {
-                let entry_date = entry
-                    .updated_at()
-                    .with_timezone(&Local)
-                    .naive_local()
-                    .date();
-                let entry_bucket = TimeBucket::from_dates(today, entry_date);
-
-                if Some(entry_bucket) != bucket {
-                    bucket = Some(entry_bucket);
-                    items.push(ListItemType::BucketSeparator(entry_bucket));
-                }
-
-                items.push(ListItemType::Entry {
-                    entry,
-                    format: entry_bucket.into(),
-                });
-            }
-            items
-        })
-    }
-
-    fn filter_search_results(
-        &self,
-        entries: Vec<HistoryEntry>,
-        cx: &App,
-    ) -> Task<Vec<ListItemType>> {
-        let query = self.search_query.clone();
-        cx.background_spawn({
-            let executor = cx.background_executor().clone();
-            async move {
-                let mut candidates = Vec::with_capacity(entries.len());
-
-                for (idx, entry) in entries.iter().enumerate() {
-                    candidates.push(StringMatchCandidate::new(idx, entry.title()));
-                }
-
-                const MAX_MATCHES: usize = 100;
-
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    MAX_MATCHES,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
-
-                matches
-                    .into_iter()
-                    .map(|search_match| ListItemType::SearchResult {
-                        entry: entries[search_match.candidate_id].clone(),
-                        positions: search_match.positions,
-                    })
-                    .collect()
-            }
-        })
-    }
-
-    fn search_produced_no_matches(&self) -> bool {
-        self.visible_items.is_empty() && !self.search_query.is_empty()
-    }
-
-    fn selected_history_entry(&self) -> Option<&HistoryEntry> {
-        self.get_history_entry(self.selected_index)
-    }
-
-    fn get_history_entry(&self, visible_items_ix: usize) -> Option<&HistoryEntry> {
-        self.visible_items.get(visible_items_ix)?.history_entry()
-    }
-
-    fn set_selected_index(&mut self, mut index: usize, bias: Bias, cx: &mut Context<Self>) {
-        if self.visible_items.is_empty() {
-            self.selected_index = 0;
-            return;
-        }
-        while matches!(
-            self.visible_items.get(index),
-            None | Some(ListItemType::BucketSeparator(..))
-        ) {
-            index = match bias {
-                Bias::Left => {
-                    if index == 0 {
-                        self.visible_items.len() - 1
-                    } else {
-                        index - 1
-                    }
-                }
-                Bias::Right => {
-                    if index >= self.visible_items.len() - 1 {
-                        0
-                    } else {
-                        index + 1
-                    }
-                }
-            };
-        }
-        self.selected_index = index;
-        self.scroll_handle
-            .scroll_to_item(index, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == 0 {
-            self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-        } else {
-            self.set_selected_index(self.selected_index - 1, Bias::Left, cx);
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == self.visible_items.len() - 1 {
-            self.set_selected_index(0, Bias::Right, cx);
-        } else {
-            self.set_selected_index(self.selected_index + 1, Bias::Right, cx);
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_selected_index(0, Bias::Right, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirm_entry(self.selected_index, cx);
-    }
-
-    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(ix) else {
-            return;
-        };
-        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_thread(self.selected_index, cx)
-    }
-
-    fn remove_thread(&mut self, visible_item_ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(visible_item_ix) else {
-            return;
-        };
-
-        let task = match entry {
-            HistoryEntry::AcpThread(thread) => self
-                .history_store
-                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
-            HistoryEntry::TextThread(text_thread) => self.history_store.update(cx, |this, cx| {
-                this.delete_text_thread(text_thread.path.clone(), cx)
-            }),
-        };
-        task.detach_and_log_err(cx);
-    }
-
-    fn remove_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.history_store.update(cx, |store, cx| {
-            store.delete_threads(cx).detach_and_log_err(cx)
-        });
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn prompt_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = true;
-        cx.notify();
-    }
-
-    fn cancel_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn render_list_items(
-        &mut self,
-        range: Range<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        self.visible_items
-            .get(range.clone())
-            .into_iter()
-            .flatten()
-            .enumerate()
-            .map(|(ix, item)| self.render_list_item(item, range.start + ix, cx))
-            .collect()
-    }
-
-    fn render_list_item(&self, item: &ListItemType, ix: usize, cx: &Context<Self>) -> AnyElement {
-        match item {
-            ListItemType::Entry { entry, format } => self
-                .render_history_entry(entry, *format, ix, Vec::default(), cx)
-                .into_any(),
-            ListItemType::SearchResult { entry, positions } => self.render_history_entry(
-                entry,
-                EntryTimeFormat::DateAndTime,
-                ix,
-                positions.clone(),
-                cx,
-            ),
-            ListItemType::BucketSeparator(bucket) => div()
-                .px(DynamicSpacing::Base06.rems(cx))
-                .pt_2()
-                .pb_1()
-                .child(
-                    Label::new(bucket.to_string())
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-        }
-    }
-
-    fn render_history_entry(
-        &self,
-        entry: &HistoryEntry,
-        format: EntryTimeFormat,
-        ix: usize,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let selected = ix == self.selected_index;
-        let hovered = Some(ix) == self.hovered_index;
-        let timestamp = entry.updated_at().timestamp();
-        let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
-
-        h_flex()
-            .w_full()
-            .pb_1()
-            .child(
-                ListItem::new(ix)
-                    .rounded()
-                    .toggle_state(selected)
-                    .spacing(ListItemSpacing::Sparse)
-                    .start_slot(
-                        h_flex()
-                            .w_full()
-                            .gap_2()
-                            .justify_between()
-                            .child(
-                                HighlightedLabel::new(entry.title(), highlight_positions)
-                                    .size(LabelSize::Small)
-                                    .truncate(),
-                            )
-                            .child(
-                                Label::new(thread_timestamp)
-                                    .color(Color::Muted)
-                                    .size(LabelSize::XSmall),
-                            ),
-                    )
-                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                        if *is_hovered {
-                            this.hovered_index = Some(ix);
-                        } else if this.hovered_index == Some(ix) {
-                            this.hovered_index = None;
-                        }
-
-                        cx.notify();
-                    }))
-                    .end_slot::<IconButton>(if hovered {
-                        Some(
-                            IconButton::new("delete", IconName::Trash)
-                                .shape(IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .tooltip(move |_window, cx| {
-                                    Tooltip::for_action("Delete", &RemoveSelectedThread, cx)
-                                })
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.remove_thread(ix, cx);
-                                    cx.stop_propagation()
-                                })),
-                        )
-                    } else {
-                        None
-                    })
-                    .on_click(cx.listener(move |this, _, _, cx| this.confirm_entry(ix, cx))),
-            )
-            .into_any_element()
-    }
-}
-
-impl Focusable for AcpThreadHistory {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.search_editor.focus_handle(cx)
-    }
-}
-
-impl Render for AcpThreadHistory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_no_history = self.history_store.read(cx).is_empty(cx);
-
-        v_flex()
-            .key_context("ThreadHistory")
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::remove_selected_thread))
-            .on_action(cx.listener(|this, _: &RemoveHistory, window, cx| {
-                this.remove_history(window, cx);
-            }))
-            .child(
-                h_flex()
-                    .h(Tab::container_height(cx))
-                    .w_full()
-                    .py_1()
-                    .px_2()
-                    .gap_2()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        Icon::new(IconName::MagnifyingGlass)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(self.search_editor.clone()),
-            )
-            .child({
-                let view = v_flex()
-                    .id("list-container")
-                    .relative()
-                    .overflow_hidden()
-                    .flex_grow();
-
-                if has_no_history {
-                    view.justify_center().items_center().child(
-                        Label::new("You don't have any past threads yet.")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                } else if self.search_produced_no_matches() {
-                    view.justify_center()
-                        .items_center()
-                        .child(Label::new("No threads match your search.").size(LabelSize::Small))
-                } else {
-                    view.child(
-                        uniform_list(
-                            "thread-history",
-                            self.visible_items.len(),
-                            cx.processor(|this, range: Range<usize>, window, cx| {
-                                this.render_list_items(range, window, cx)
-                            }),
-                        )
-                        .p_1()
-                        .pr_4()
-                        .track_scroll(&self.scroll_handle)
-                        .flex_grow(),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-                }
-            })
-            .when(!has_no_history, |this| {
-                this.child(
-                    h_flex()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .when(!self.confirming_delete_history, |this| {
-                            this.child(
-                                Button::new("delete_history", "Delete All History")
-                                    .full_width()
-                                    .style(ButtonStyle::Outlined)
-                                    .label_size(LabelSize::Small)
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.prompt_delete_history(window, cx);
-                                    })),
-                            )
-                        })
-                        .when(self.confirming_delete_history, |this| {
-                            this.w_full()
-                                .gap_2()
-                                .flex_wrap()
-                                .justify_between()
-                                .child(
-                                    h_flex()
-                                        .flex_wrap()
-                                        .gap_1()
-                                        .child(
-                                            Label::new("Delete all threads?")
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Label::new("You won't be able to recover them later.")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .child(
-                                            Button::new("cancel_delete", "Cancel")
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.cancel_delete_history(window, cx);
-                                                })),
-                                        )
-                                        .child(
-                                            Button::new("confirm_delete", "Delete")
-                                                .style(ButtonStyle::Tinted(ui::TintColor::Error))
-                                                .color(Color::Error)
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|_, _, window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(RemoveHistory),
-                                                        cx,
-                                                    );
-                                                })),
-                                        ),
-                                )
-                        }),
-                )
-            })
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum EntryTimeFormat {
-    DateAndTime,
-    TimeOnly,
-}
-
-impl EntryTimeFormat {
-    fn format_timestamp(&self, timestamp: i64, timezone: UtcOffset) -> String {
-        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-
-        match self {
-            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
-                timestamp,
-                OffsetDateTime::now_utc(),
-                timezone,
-                time_format::TimestampFormat::EnhancedAbsolute,
-            ),
-            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp.to_offset(timezone)),
-        }
-    }
-}
-
-impl From<TimeBucket> for EntryTimeFormat {
-    fn from(bucket: TimeBucket) -> Self {
-        match bucket {
-            TimeBucket::Today => EntryTimeFormat::TimeOnly,
-            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
-            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::All => EntryTimeFormat::DateAndTime,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum TimeBucket {
-    Today,
-    Yesterday,
-    ThisWeek,
-    PastWeek,
-    All,
-}
-
-impl TimeBucket {
-    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
-        if date == reference {
-            return TimeBucket::Today;
-        }
-
-        if date == reference - TimeDelta::days(1) {
-            return TimeBucket::Yesterday;
-        }
-
-        let week = date.iso_week();
-
-        if reference.iso_week() == week {
-            return TimeBucket::ThisWeek;
-        }
-
-        let last_week = (reference - TimeDelta::days(7)).iso_week();
-
-        if week == last_week {
-            return TimeBucket::PastWeek;
-        }
-
-        TimeBucket::All
-    }
-}
-
-impl Display for TimeBucket {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TimeBucket::Today => write!(f, "Today"),
-            TimeBucket::Yesterday => write!(f, "Yesterday"),
-            TimeBucket::ThisWeek => write!(f, "This Week"),
-            TimeBucket::PastWeek => write!(f, "Past Week"),
-            TimeBucket::All => write!(f, "All"),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDate;
-
-    #[test]
-    fn test_time_bucket_from_dates() {
-        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
-
-        let date = today;
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        // All: not in this week or last week
-        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
-
-        // Test year boundary cases
-        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
-        assert_eq!(
-            TimeBucket::from_dates(new_year, date),
-            TimeBucket::Yesterday
-        );
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
-        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
-    }
-}
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -429,24 +429,10 @@ impl Model {
        let mut headers = vec![];

        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5Thinking => {
-                // Fine-grained tool streaming for newer models
-                headers.push("fine-grained-tool-streaming-2025-05-14".to_string());
-            }
            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => {
                // Try beta token-efficient tool use (supported in Claude 3.7 Sonnet only)
                // https://docs.anthropic.com/en/docs/build-with-claude/tool-use/token-efficient-tool-use
                headers.push("token-efficient-tools-2025-02-19".to_string());
-                headers.push("fine-grained-tool-streaming-2025-05-14".to_string());
            }
            Self::Custom {
                extra_beta_headers, ..
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -22,6 +22,7 @@ feature_flags.workspace = true
 fs.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
+globset.workspace = true
 gpui.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -226,10 +226,10 @@ fn collect_files(
    let Ok(matchers) = glob_inputs
        .iter()
        .map(|glob_input| {
-            util::paths::PathMatcher::new(&[glob_input.to_owned()], project.read(cx).path_style(cx))
+            custom_path_matcher::PathMatcher::new(&[glob_input.to_owned()])
                .with_context(|| format!("invalid path {glob_input}"))
        })
-        .collect::<anyhow::Result<Vec<util::paths::PathMatcher>>>()
+        .collect::<anyhow::Result<Vec<custom_path_matcher::PathMatcher>>>()
    else {
        return futures::stream::once(async {
            anyhow::bail!("invalid path");
@@ -250,7 +250,6 @@ fn collect_files(
            let worktree_id = snapshot.id();
            let path_style = snapshot.path_style();
            let mut directory_stack: Vec<Arc<RelPath>> = Vec::new();
-            let mut folded_directory_path: Option<Arc<RelPath>> = None;
            let mut folded_directory_names: Arc<RelPath> = RelPath::empty().into();
            let mut is_top_level_directory = true;

@@ -278,16 +277,6 @@ fn collect_files(
                    )))?;
                }

-                if let Some(folded_path) = &folded_directory_path {
-                    if !entry.path.starts_with(folded_path) {
-                        folded_directory_names = RelPath::empty().into();
-                        folded_directory_path = None;
-                        if directory_stack.is_empty() {
-                            is_top_level_directory = true;
-                        }
-                    }
-                }
-
                let filename = entry.path.file_name().unwrap_or_default().to_string();

                if entry.is_dir() {
@@ -303,17 +292,13 @@ fn collect_files(
                                folded_directory_names =
                                    folded_directory_names.join(RelPath::unix(&filename).unwrap());
                            }
-                            folded_directory_path = Some(entry.path.clone());
                            continue;
                        }
                    } else {
                        // Skip empty directories
                        folded_directory_names = RelPath::empty().into();
-                        folded_directory_path = None;
                        continue;
                    }
-
-                    // Render the directory (either folded or normal)
                    if folded_directory_names.is_empty() {
                        let label = if is_top_level_directory {
                            is_top_level_directory = false;
@@ -349,8 +334,6 @@ fn collect_files(
                            },
                        )))?;
                        directory_stack.push(entry.path.clone());
-                        folded_directory_names = RelPath::empty().into();
-                        folded_directory_path = None;
                    }
                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
                        SlashCommandContent::Text {
@@ -464,6 +447,87 @@ pub fn build_entry_output_section(
    }
 }

+/// This contains a small fork of the util::paths::PathMatcher, that is stricter about the prefix
+/// check. Only subpaths pass the prefix check, rather than any prefix.
+mod custom_path_matcher {
+    use globset::{Glob, GlobSet, GlobSetBuilder};
+    use std::fmt::Debug as _;
+    use util::{paths::SanitizedPath, rel_path::RelPath};
+
+    #[derive(Clone, Debug, Default)]
+    pub struct PathMatcher {
+        sources: Vec<String>,
+        sources_with_trailing_slash: Vec<String>,
+        glob: GlobSet,
+    }
+
+    impl std::fmt::Display for PathMatcher {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            self.sources.fmt(f)
+        }
+    }
+
+    impl PartialEq for PathMatcher {
+        fn eq(&self, other: &Self) -> bool {
+            self.sources.eq(&other.sources)
+        }
+    }
+
+    impl Eq for PathMatcher {}
+
+    impl PathMatcher {
+        pub fn new(globs: &[String]) -> Result<Self, globset::Error> {
+            let globs = globs
+                .iter()
+                .map(|glob| Glob::new(&SanitizedPath::new(glob).to_string()))
+                .collect::<Result<Vec<_>, _>>()?;
+            let sources = globs.iter().map(|glob| glob.glob().to_owned()).collect();
+            let sources_with_trailing_slash = globs
+                .iter()
+                .map(|glob| glob.glob().to_string() + "/")
+                .collect();
+            let mut glob_builder = GlobSetBuilder::new();
+            for single_glob in globs {
+                glob_builder.add(single_glob);
+            }
+            let glob = glob_builder.build()?;
+            Ok(PathMatcher {
+                glob,
+                sources,
+                sources_with_trailing_slash,
+            })
+        }
+
+        pub fn is_match(&self, other: &RelPath) -> bool {
+            self.sources
+                .iter()
+                .zip(self.sources_with_trailing_slash.iter())
+                .any(|(source, with_slash)| {
+                    let as_bytes = other.as_unix_str().as_bytes();
+                    let with_slash = if source.ends_with('/') {
+                        source.as_bytes()
+                    } else {
+                        with_slash.as_bytes()
+                    };
+
+                    as_bytes.starts_with(with_slash) || as_bytes.ends_with(source.as_bytes())
+                })
+                || self.glob.is_match(other.as_std_path())
+                || self.check_with_end_separator(other)
+        }
+
+        fn check_with_end_separator(&self, path: &RelPath) -> bool {
+            let path_str = path.as_unix_str();
+            let separator = "/";
+            if path_str.ends_with(separator) {
+                false
+            } else {
+                self.glob.is_match(path_str.to_string() + separator)
+            }
+        }
+    }
+}
+
 pub fn append_buffer_to_output(
    buffer: &BufferSnapshot,
    path: Option<&str>,
--- a/crates/assistant_text_thread/Cargo.toml
+++ b/crates/assistant_text_thread/Cargo.toml
@@ -46,7 +46,7 @@ serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-telemetry.workspace = true
+telemetry_events.workspace = true
 text.workspace = true
 ui.workspace = true
 util.workspace = true
--- a/crates/assistant_text_thread/src/assistant_text_thread_tests.rs
+++ b/crates/assistant_text_thread/src/assistant_text_thread_tests.rs
@@ -50,6 +50,7 @@ fn test_inserting_and_removing_messages(cx: &mut App) {
        TextThread::local(
            registry,
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -188,6 +189,7 @@ fn test_message_splitting(cx: &mut App) {
        TextThread::local(
            registry.clone(),
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -292,6 +294,7 @@ fn test_messages_for_offsets(cx: &mut App) {
        TextThread::local(
            registry,
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -402,6 +405,7 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
        TextThread::local(
            registry.clone(),
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -673,6 +677,7 @@ async fn test_serialization(cx: &mut TestAppContext) {
        TextThread::local(
            registry.clone(),
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -719,6 +724,7 @@ async fn test_serialization(cx: &mut TestAppContext) {
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            None,
+            None,
            cx,
        )
    });
@@ -774,6 +780,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
                prompt_builder.clone(),
                Arc::new(SlashCommandWorkingSet::default()),
                None,
+                None,
                cx,
            )
        });
@@ -1034,6 +1041,7 @@ fn test_mark_cache_anchors(cx: &mut App) {
        TextThread::local(
            registry,
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
@@ -1360,6 +1368,7 @@ fn setup_context_editor_with_fake_model(
        TextThread::local(
            registry,
            None,
+            None,
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
            cx,
--- a/crates/assistant_text_thread/src/text_thread.rs
+++ b/crates/assistant_text_thread/src/text_thread.rs
@@ -5,7 +5,7 @@ use assistant_slash_command::{
    SlashCommandResult, SlashCommandWorkingSet,
 };
 use assistant_slash_commands::FileCommandMetadata;
-use client::{self, ModelRequestUsage, RequestUsage, proto};
+use client::{self, ModelRequestUsage, RequestUsage, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use cloud_llm_client::{CompletionIntent, UsageLimit};
 use collections::{HashMap, HashSet};
@@ -19,11 +19,10 @@ use gpui::{
 use itertools::Itertools as _;
 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use language_model::{
-    AnthropicCompletionType, AnthropicEventData, AnthropicEventType, LanguageModel,
-    LanguageModelCacheConfiguration, LanguageModelCompletionEvent, LanguageModelImage,
-    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
+    LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    LanguageModelToolUseId, MessageContent, PaymentRequiredError, Role, StopReason,
-    report_anthropic_event,
+    report_assistant_event,
 };
 use open_ai::Model as OpenAiModel;
 use paths::text_threads_dir;
@@ -41,7 +40,7 @@ use std::{
    sync::Arc,
    time::{Duration, Instant},
 };
-
+use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use text::{BufferSnapshot, ToPoint};
 use ui::IconName;
 use util::{ResultExt, TryFutureExt, post_inc};
@@ -687,6 +686,7 @@ pub struct TextThread {
    pending_cache_warming_task: Task<Option<()>>,
    path: Option<Arc<Path>>,
    _subscriptions: Vec<Subscription>,
+    telemetry: Option<Arc<Telemetry>>,
    language_registry: Arc<LanguageRegistry>,
    project: Option<WeakEntity<Project>>,
    prompt_builder: Arc<PromptBuilder>,
@@ -709,6 +709,7 @@ impl TextThread {
    pub fn local(
        language_registry: Arc<LanguageRegistry>,
        project: Option<WeakEntity<Project>>,
+        telemetry: Option<Arc<Telemetry>>,
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
        cx: &mut Context<Self>,
@@ -721,6 +722,7 @@ impl TextThread {
            prompt_builder,
            slash_commands,
            project,
+            telemetry,
            cx,
        )
    }
@@ -741,6 +743,7 @@ impl TextThread {
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
        project: Option<WeakEntity<Project>>,
+        telemetry: Option<Arc<Telemetry>>,
        cx: &mut Context<Self>,
    ) -> Self {
        let buffer = cx.new(|_cx| {
@@ -781,6 +784,7 @@ impl TextThread {
            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
            path: None,
            buffer,
+            telemetry,
            project,
            language_registry,
            slash_commands,
@@ -870,6 +874,7 @@ impl TextThread {
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
        project: Option<WeakEntity<Project>>,
+        telemetry: Option<Arc<Telemetry>>,
        cx: &mut Context<Self>,
    ) -> Self {
        let id = saved_context.id.clone().unwrap_or_else(TextThreadId::new);
@@ -881,6 +886,7 @@ impl TextThread {
            prompt_builder,
            slash_commands,
            project,
+            telemetry,
            cx,
        );
        this.path = Some(path);
@@ -2206,26 +2212,24 @@ impl TextThread {
                        .read(cx)
                        .language()
                        .map(|language| language.name());
-
-                    telemetry::event!(
-                        "Assistant Responded",
-                        conversation_id = this.id.0.clone(),
-                        kind = "panel",
-                        phase = "response",
-                        model =  model.telemetry_id(),
-                        model_provider = model.provider_id().to_string(),
-                        response_latency,
-                        error_message,
-                        language_name = language_name.as_ref().map(|name| name.to_proto()),
+                    report_assistant_event(
+                        AssistantEventData {
+                            conversation_id: Some(this.id.0.clone()),
+                            kind: AssistantKind::Panel,
+                            phase: AssistantPhase::Response,
+                            message_id: None,
+                            model: model.telemetry_id(),
+                            model_provider: model.provider_id().to_string(),
+                            response_latency,
+                            error_message,
+                            language_name: language_name.map(|name| name.to_proto()),
+                        },
+                        this.telemetry.clone(),
+                        cx.http_client(),
+                        model.api_key(cx),
+                        cx.background_executor(),
                    );

-                    report_anthropic_event(&model, AnthropicEventData {
-                        completion_type: AnthropicCompletionType::Panel,
-                        event: AnthropicEventType::Response,
-                        language_name: language_name.map(|name| name.to_proto()),
-                        message_id: None,
-                    }, cx);
-
                    if let Ok(stop_reason) = result {
                        match stop_reason {
                            StopReason::ToolUse => {}
--- a/crates/assistant_text_thread/src/text_thread_store.rs
+++ b/crates/assistant_text_thread/src/text_thread_store.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use anyhow::{Context as _, Result};
 use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
-use client::{Client, TypedEnvelope, proto};
+use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::HashMap;
 use context_server::ContextServerId;
@@ -48,6 +48,7 @@ pub struct TextThreadStore {
    fs: Arc<dyn Fs>,
    languages: Arc<LanguageRegistry>,
    slash_commands: Arc<SlashCommandWorkingSet>,
+    telemetry: Arc<Telemetry>,
    _watch_updates: Task<Option<()>>,
    client: Arc<Client>,
    project: WeakEntity<Project>,
@@ -87,6 +88,7 @@ impl TextThreadStore {
    ) -> Task<Result<Entity<Self>>> {
        let fs = project.read(cx).fs().clone();
        let languages = project.read(cx).languages().clone();
+        let telemetry = project.read(cx).client().telemetry().clone();
        cx.spawn(async move |cx| {
            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
            let (mut events, _) = fs.watch(text_threads_dir(), CONTEXT_WATCH_DURATION).await;
@@ -100,6 +102,7 @@ impl TextThreadStore {
                    fs,
                    languages,
                    slash_commands,
+                    telemetry,
                    _watch_updates: cx.spawn(async move |this, cx| {
                        async move {
                            while events.next().await.is_some() {
@@ -140,6 +143,7 @@ impl TextThreadStore {
            fs: project.read(cx).fs().clone(),
            languages: project.read(cx).languages().clone(),
            slash_commands: Arc::default(),
+            telemetry: project.read(cx).client().telemetry().clone(),
            _watch_updates: Task::ready(None),
            client: project.read(cx).client(),
            project: project.downgrade(),
@@ -375,6 +379,7 @@ impl TextThreadStore {
            TextThread::local(
                self.languages.clone(),
                Some(self.project.clone()),
+                Some(self.telemetry.clone()),
                self.prompt_builder.clone(),
                self.slash_commands.clone(),
                cx,
@@ -397,7 +402,7 @@ impl TextThreadStore {
        let capability = project.capability();
        let language_registry = self.languages.clone();
        let project = self.project.clone();
-
+        let telemetry = self.telemetry.clone();
        let prompt_builder = self.prompt_builder.clone();
        let slash_commands = self.slash_commands.clone();
        let request = self.client.request(proto::CreateContext { project_id });
@@ -414,6 +419,7 @@ impl TextThreadStore {
                    prompt_builder,
                    slash_commands,
                    Some(project),
+                    Some(telemetry),
                    cx,
                )
            })?;
@@ -451,6 +457,7 @@ impl TextThreadStore {
        let fs = self.fs.clone();
        let languages = self.languages.clone();
        let project = self.project.clone();
+        let telemetry = self.telemetry.clone();
        let load = cx.background_spawn({
            let path = path.clone();
            async move {
@@ -471,6 +478,7 @@ impl TextThreadStore {
                    prompt_builder,
                    slash_commands,
                    Some(project),
+                    Some(telemetry),
                    cx,
                )
            })?;
@@ -560,6 +568,7 @@ impl TextThreadStore {
        let capability = project.capability();
        let language_registry = self.languages.clone();
        let project = self.project.clone();
+        let telemetry = self.telemetry.clone();
        let request = self.client.request(proto::OpenContext {
            project_id,
            context_id: text_thread_id.to_proto(),
@@ -578,6 +587,7 @@ impl TextThreadStore {
                    prompt_builder,
                    slash_commands,
                    Some(project),
+                    Some(telemetry),
                    cx,
                )
            })?;
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -305,7 +305,6 @@ impl Room {

    pub(crate) fn leave(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        cx.notify();
-        self.emit_video_track_unsubscribed_events(cx);
        self.leave_internal(cx)
    }

@@ -353,14 +352,6 @@ impl Room {
        self.maintain_connection.take();
    }

-    fn emit_video_track_unsubscribed_events(&self, cx: &mut Context<Self>) {
-        for participant in self.remote_participants.values() {
-            for sid in participant.video_tracks.keys() {
-                cx.emit(Event::RemoteVideoTrackUnsubscribed { sid: sid.clone() });
-            }
-        }
-    }
-
    async fn maintain_connection(
        this: WeakEntity<Self>,
        client: Arc<Client>,
@@ -891,9 +882,6 @@ impl Room {
                                    project_id: project.id,
                                });
                            }
-                            for sid in participant.video_tracks.keys() {
-                                cx.emit(Event::RemoteVideoTrackUnsubscribed { sid: sid.clone() });
-                            }
                            false
                        }
                    });
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -32,7 +32,7 @@ struct Detect;

 trait InstalledApp {
    fn zed_version_string(&self) -> String;
-    fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()>;
+    fn launch(&self, ipc_url: String) -> anyhow::Result<()>;
    fn run_foreground(
        &self,
        ipc_url: String,
@@ -61,8 +61,6 @@ Examples:
 )]
 struct Args {
    /// Wait for all of the given paths to be opened/closed before exiting.
-    ///
-    /// When opening a directory, waits until the created window is closed.
    #[arg(short, long)]
    wait: bool,
    /// Add files to the currently open workspace
@@ -590,7 +588,7 @@ fn main() -> Result<()> {
    if args.foreground {
        app.run_foreground(url, user_data_dir.as_deref())?;
    } else {
-        app.launch(url, user_data_dir.as_deref())?;
+        app.launch(url)?;
        sender.join().unwrap()?;
        if let Some(handle) = stdin_pipe_handle {
            handle.join().unwrap()?;
@@ -711,18 +709,14 @@ mod linux {
            )
        }

-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
-            let data_dir = user_data_dir
-                .map(PathBuf::from)
-                .unwrap_or_else(|| paths::data_dir().clone());
-
-            let sock_path = data_dir.join(format!(
+        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
+            let sock_path = paths::data_dir().join(format!(
                "zed-{}.sock",
                *release_channel::RELEASE_CHANNEL_NAME
            ));
            let sock = UnixDatagram::unbound()?;
            if sock.connect(&sock_path).is_err() {
-                self.boot_background(ipc_url, user_data_dir)?;
+                self.boot_background(ipc_url)?;
            } else {
                sock.send(ipc_url.as_bytes())?;
            }
@@ -748,11 +742,7 @@ mod linux {
    }

    impl App {
-        fn boot_background(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> anyhow::Result<()> {
+        fn boot_background(&self, ipc_url: String) -> anyhow::Result<()> {
            let path = &self.0;

            match fork::fork() {
@@ -766,13 +756,8 @@ mod linux {
                    if fork::close_fd().is_err() {
                        eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
                    }
-                    let mut args: Vec<OsString> =
-                        vec![path.as_os_str().to_owned(), OsString::from(ipc_url)];
-                    if let Some(dir) = user_data_dir {
-                        args.push(OsString::from("--user-data-dir"));
-                        args.push(OsString::from(dir));
-                    }
-                    let error = exec::execvp(path.clone(), &args);
+                    let error =
+                        exec::execvp(path.clone(), &[path.as_os_str(), &OsString::from(ipc_url)]);
                    // if exec succeeded, we never get here.
                    eprintln!("failed to exec {:?}: {}", path, error);
                    process::exit(1)
@@ -958,14 +943,11 @@ mod windows {
            )
        }

-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
+        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
            if check_single_instance() {
-                let mut cmd = std::process::Command::new(self.0.clone());
-                cmd.arg(ipc_url);
-                if let Some(dir) = user_data_dir {
-                    cmd.arg("--user-data-dir").arg(dir);
-                }
-                cmd.spawn()?;
+                std::process::Command::new(self.0.clone())
+                    .arg(ipc_url)
+                    .spawn()?;
            } else {
                unsafe {
                    let pipe = CreateFileW(
@@ -1114,7 +1096,7 @@ mod mac_os {
            format!("Zed {} – {}", self.version(), self.path().display(),)
        }

-        fn launch(&self, url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
+        fn launch(&self, url: String) -> anyhow::Result<()> {
            match self {
                Self::App { app_bundle, .. } => {
                    let app_path = app_bundle;
@@ -1164,11 +1146,8 @@ mod mac_os {
                            format!("Cloning descriptor for file {subprocess_stdout_file:?}")
                        })?;
                    let mut command = std::process::Command::new(executable);
-                    command.env(FORCE_CLI_MODE_ENV_VAR_NAME, "");
-                    if let Some(dir) = user_data_dir {
-                        command.arg("--user-data-dir").arg(dir);
-                    }
-                    command
+                    let command = command
+                        .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
                        .stderr(subprocess_stdout_file)
                        .stdout(subprocess_stdin_file)
                        .arg(url);
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -53,7 +53,7 @@ text.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tiny_http.workspace = true
-tokio-socks.workspace = true
+tokio-socks = { version = "0.5.2", default-features = false, features = ["futures-io"] }
 tokio.workspace = true
 url.workspace = true
 util.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -150,8 +150,9 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
                    .detach_and_log_err(cx);
            }
        }
-    })
-    .on_action({
+    });
+
+    cx.on_action({
        let client = client.clone();
        move |_: &SignOut, cx| {
            if let Some(client) = client.upgrade() {
@@ -161,8 +162,9 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
                .detach();
            }
        }
-    })
-    .on_action({
+    });
+
+    cx.on_action({
        let client = client;
        move |_: &Reconnect, cx| {
            if let Some(client) = client.upgrade() {
@@ -1730,59 +1732,23 @@ impl ProtoClient for Client {
 /// prefix for the zed:// url scheme
 pub const ZED_URL_SCHEME: &str = "zed";

-/// A parsed Zed link that can be handled internally by the application.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ZedLink {
-    /// Join a channel: `zed.dev/channel/channel-name-123` or `zed://channel/channel-name-123`
-    Channel { channel_id: u64 },
-    /// Open channel notes: `zed.dev/channel/channel-name-123/notes` or with heading `notes#heading`
-    ChannelNotes {
-        channel_id: u64,
-        heading: Option<String>,
-    },
-}
-
 /// Parses the given link into a Zed link.
 ///
-/// Returns a [`Some`] containing the parsed link if the link is a recognized Zed link
-/// that should be handled internally by the application.
-/// Returns [`None`] for links that should be opened in the browser.
-pub fn parse_zed_link(link: &str, cx: &App) -> Option<ZedLink> {
+/// Returns a [`Some`] containing the unprefixed link if the link is a Zed link.
+/// Returns [`None`] otherwise.
+pub fn parse_zed_link<'a>(link: &'a str, cx: &App) -> Option<&'a str> {
    let server_url = &ClientSettings::get_global(cx).server_url;
-    let path = link
+    if let Some(stripped) = link
        .strip_prefix(server_url)
        .and_then(|result| result.strip_prefix('/'))
-        .or_else(|| {
-            link.strip_prefix(ZED_URL_SCHEME)
-                .and_then(|result| result.strip_prefix("://"))
-        })?;
-
-    let mut parts = path.split('/');
-
-    if parts.next() != Some("channel") {
-        return None;
+    {
+        return Some(stripped);
    }
-
-    let slug = parts.next()?;
-    let id_str = slug.split('-').next_back()?;
-    let channel_id = id_str.parse::<u64>().ok()?;
-
-    let Some(next) = parts.next() else {
-        return Some(ZedLink::Channel { channel_id });
-    };
-
-    if let Some(heading) = next.strip_prefix("notes#") {
-        return Some(ZedLink::ChannelNotes {
-            channel_id,
-            heading: Some(heading.to_string()),
-        });
-    }
-
-    if next == "notes" {
-        return Some(ZedLink::ChannelNotes {
-            channel_id,
-            heading: None,
-        });
+    if let Some(stripped) = link
+        .strip_prefix(ZED_URL_SCHEME)
+        .and_then(|result| result.strip_prefix("://"))
+    {
+        return Some(stripped);
    }

    None
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ b/crates/cloud_llm_client/src/cloud_llm_client.rs
@@ -371,8 +371,6 @@ pub struct LanguageModel {
    pub supports_images: bool,
    pub supports_thinking: bool,
    pub supports_max_mode: bool,
-    #[serde(default)]
-    pub supports_streaming_tools: bool,
    // only used by OpenAI and xAI
    #[serde(default)]
    pub supports_parallel_tool_calls: bool,
--- a/crates/cloud_zeta2_prompt/Cargo.toml
+++ b/crates/cloud_zeta2_prompt/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "cloud_zeta2_prompt"
+version = "0.1.0"
+publish.workspace = true
+edition.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/cloud_zeta2_prompt.rs"
+
+[dependencies]
+anyhow.workspace = true
+cloud_llm_client.workspace = true
+indoc.workspace = true
+serde.workspace = true
--- a/crates/cloud_zeta2_prompt/LICENSE-GPL
+++ b/crates/cloud_zeta2_prompt/LICENSE-GPL
--- a/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
+++ b/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
@@ -0,0 +1,485 @@
+use anyhow::Result;
+use cloud_llm_client::predict_edits_v3::{
+    self, DiffPathFmt, Event, Excerpt, Line, Point, PromptFormat, RelatedFile,
+};
+use indoc::indoc;
+use std::cmp;
+use std::fmt::Write;
+use std::path::Path;
+use std::sync::Arc;
+
+pub const DEFAULT_MAX_PROMPT_BYTES: usize = 10 * 1024;
+
+pub const CURSOR_MARKER: &str = "<|user_cursor|>";
+/// NOTE: Differs from zed version of constant - includes a newline
+pub const EDITABLE_REGION_START_MARKER_WITH_NEWLINE: &str = "<|editable_region_start|>\n";
+/// NOTE: Differs from zed version of constant - includes a newline
+pub const EDITABLE_REGION_END_MARKER_WITH_NEWLINE: &str = "<|editable_region_end|>\n";
+
+const STUDENT_MODEL_INSTRUCTIONS: &str = indoc! {r#"
+    You are a code completion assistant that analyzes edit history to identify and systematically complete incomplete refactorings or patterns across the entire codebase.
+
+    ## Edit History
+
+    "#};
+
+const MINIMAL_PROMPT_REMINDER: &str = indoc! {"
+    ---
+
+    Please analyze the edit history and the files, then provide the unified diff for your predicted edits.
+    Do not include the cursor marker in your output.
+    If you're editing multiple files, be sure to reflect filename in the hunk's header.
+    "};
+
+const XML_TAGS_INSTRUCTIONS: &str = indoc! {r#"
+    # Instructions
+
+    You are an edit prediction agent in a code editor.
+
+    Analyze the history of edits made by the user in order to infer what they are currently trying to accomplish.
+    Then complete the remainder of the current change if it is incomplete, or predict the next edit the user intends to make.
+    Always continue along the user's current trajectory, rather than changing course.
+
+    ## Output Format
+
+    You should briefly explain your understanding of the user's overall goal in one sentence, then explain what the next change
+    along the users current trajectory will be in another, and finally specify the next edit using the following XML-like format:
+
+    <edits path="my-project/src/myapp/cli.py">
+    <old_text>
+    OLD TEXT 1 HERE
+    </old_text>
+    <new_text>
+    NEW TEXT 1 HERE
+    </new_text>
+
+    <old_text>
+    OLD TEXT 1 HERE
+    </old_text>
+    <new_text>
+    NEW TEXT 1 HERE
+    </new_text>
+    </edits>
+
+    - Specify the file to edit using the `path` attribute.
+    - Use `<old_text>` and `<new_text>` tags to replace content
+    - `<old_text>` must exactly match existing file content, including indentation
+    - `<old_text>` cannot be empty
+    - Do not escape quotes, newlines, or other characters within tags
+    - Always close all tags properly
+    - Don't include the <|user_cursor|> marker in your output.
+
+    ## Edit History
+
+"#};
+
+const OLD_TEXT_NEW_TEXT_REMINDER: &str = indoc! {r#"
+    ---
+
+    Remember that the edits in the edit history have already been applied.
+"#};
+
+pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result<String> {
+    let prompt_data = PromptData {
+        events: request.events.clone(),
+        cursor_point: request.cursor_point,
+        cursor_path: request.excerpt_path.clone(),
+        included_files: request.related_files.clone(),
+    };
+    match request.prompt_format {
+        PromptFormat::MinimalQwen => {
+            return Ok(MinimalQwenPrompt.render(&prompt_data));
+        }
+        PromptFormat::SeedCoder1120 => {
+            return Ok(SeedCoder1120Prompt.render(&prompt_data));
+        }
+        _ => (),
+    };
+
+    let insertions = match request.prompt_format {
+        PromptFormat::Minimal | PromptFormat::OldTextNewText => {
+            vec![(request.cursor_point, CURSOR_MARKER)]
+        }
+        PromptFormat::OnlySnippets => vec![],
+        PromptFormat::MinimalQwen => unreachable!(),
+        PromptFormat::SeedCoder1120 => unreachable!(),
+    };
+
+    let mut prompt = match request.prompt_format {
+        PromptFormat::OldTextNewText => XML_TAGS_INSTRUCTIONS.to_string(),
+        PromptFormat::OnlySnippets => String::new(),
+        PromptFormat::Minimal => STUDENT_MODEL_INSTRUCTIONS.to_string(),
+        PromptFormat::MinimalQwen => unreachable!(),
+        PromptFormat::SeedCoder1120 => unreachable!(),
+    };
+
+    if request.events.is_empty() {
+        prompt.push_str("(No edit history)\n\n");
+    } else {
+        let edit_preamble = if request.prompt_format == PromptFormat::Minimal {
+            "The following are the latest edits made by the user, from earlier to later.\n\n"
+        } else {
+            "Here are the latest edits made by the user, from earlier to later.\n\n"
+        };
+        prompt.push_str(edit_preamble);
+        push_events(&mut prompt, &request.events);
+    }
+
+    let excerpts_preamble = match request.prompt_format {
+        PromptFormat::Minimal => indoc! {"
+             ## Part of the file under the cursor
+
+             (The cursor marker <|user_cursor|> indicates the current user cursor position.
+             The file is in current state, edits from edit history has been applied.
+             We only show part of the file around the cursor.
+             You can only edit exactly this part of the file.
+             We prepend line numbers (e.g., `123|<actual line>`); they are not part of the file.)
+             "},
+        PromptFormat::OldTextNewText => indoc! {"
+            ## Code Excerpts
+
+            Here is some excerpts of code that you should take into account to predict the next edit.
+
+            The cursor position is marked by `<|user_cursor|>` as it stands after the last edit in the history.
+
+            In addition other excerpts are included to better understand what the edit will be, including the declaration
+            or references of symbols around the cursor, or other similar code snippets that may need to be updated
+            following patterns that appear in the edit history.
+
+            Consider each of them carefully in relation to the edit history, and that the user may not have navigated
+            to the next place they want to edit yet.
+
+            Lines starting with `…` indicate omitted line ranges. These may appear inside multi-line code constructs.
+        "},
+        PromptFormat::OnlySnippets | PromptFormat::MinimalQwen | PromptFormat::SeedCoder1120 => {
+            indoc! {"
+            ## Code Excerpts
+
+            The cursor marker <|user_cursor|> indicates the current user cursor position.
+            The file is in current state, edits from edit history have been applied.
+        "}
+        }
+    };
+
+    prompt.push_str(excerpts_preamble);
+    prompt.push('\n');
+
+    let include_line_numbers = matches!(request.prompt_format, PromptFormat::Minimal);
+    for related_file in &request.related_files {
+        if request.prompt_format == PromptFormat::Minimal {
+            write_codeblock_with_filename(
+                &related_file.path,
+                &related_file.excerpts,
+                if related_file.path == request.excerpt_path {
+                    &insertions
+                } else {
+                    &[]
+                },
+                related_file.max_row,
+                include_line_numbers,
+                &mut prompt,
+            );
+        } else {
+            write_codeblock(
+                &related_file.path,
+                &related_file.excerpts,
+                if related_file.path == request.excerpt_path {
+                    &insertions
+                } else {
+                    &[]
+                },
+                related_file.max_row,
+                include_line_numbers,
+                &mut prompt,
+            );
+        }
+    }
+
+    match request.prompt_format {
+        PromptFormat::OldTextNewText => {
+            prompt.push_str(OLD_TEXT_NEW_TEXT_REMINDER);
+        }
+        PromptFormat::Minimal => {
+            prompt.push_str(MINIMAL_PROMPT_REMINDER);
+        }
+        _ => {}
+    }
+
+    Ok(prompt)
+}
+
+pub fn generation_params(prompt_format: PromptFormat) -> GenerationParams {
+    match prompt_format {
+        PromptFormat::SeedCoder1120 => SeedCoder1120Prompt::generation_params(),
+        _ => GenerationParams::default(),
+    }
+}
+
+pub fn write_codeblock<'a>(
+    path: &Path,
+    excerpts: impl IntoIterator<Item = &'a Excerpt>,
+    sorted_insertions: &[(Point, &str)],
+    file_line_count: Line,
+    include_line_numbers: bool,
+    output: &'a mut String,
+) {
+    writeln!(output, "`````{}", DiffPathFmt(path)).unwrap();
+
+    write_excerpts(
+        excerpts,
+        sorted_insertions,
+        file_line_count,
+        include_line_numbers,
+        output,
+    );
+    write!(output, "`````\n\n").unwrap();
+}
+
+fn write_codeblock_with_filename<'a>(
+    path: &Path,
+    excerpts: impl IntoIterator<Item = &'a Excerpt>,
+    sorted_insertions: &[(Point, &str)],
+    file_line_count: Line,
+    include_line_numbers: bool,
+    output: &'a mut String,
+) {
+    writeln!(output, "`````filename={}", DiffPathFmt(path)).unwrap();
+
+    write_excerpts(
+        excerpts,
+        sorted_insertions,
+        file_line_count,
+        include_line_numbers,
+        output,
+    );
+    write!(output, "`````\n\n").unwrap();
+}
+
+pub fn write_excerpts<'a>(
+    excerpts: impl IntoIterator<Item = &'a Excerpt>,
+    sorted_insertions: &[(Point, &str)],
+    file_line_count: Line,
+    include_line_numbers: bool,
+    output: &mut String,
+) {
+    let mut current_row = Line(0);
+    let mut sorted_insertions = sorted_insertions.iter().peekable();
+
+    for excerpt in excerpts {
+        if excerpt.start_line > current_row {
+            writeln!(output, "…").unwrap();
+        }
+        if excerpt.text.is_empty() {
+            return;
+        }
+
+        current_row = excerpt.start_line;
+
+        for mut line in excerpt.text.lines() {
+            if include_line_numbers {
+                write!(output, "{}|", current_row.0 + 1).unwrap();
+            }
+
+            while let Some((insertion_location, insertion_marker)) = sorted_insertions.peek() {
+                match current_row.cmp(&insertion_location.line) {
+                    cmp::Ordering::Equal => {
+                        let (prefix, suffix) = line.split_at(insertion_location.column as usize);
+                        output.push_str(prefix);
+                        output.push_str(insertion_marker);
+                        line = suffix;
+                        sorted_insertions.next();
+                    }
+                    cmp::Ordering::Less => break,
+                    cmp::Ordering::Greater => {
+                        sorted_insertions.next();
+                        break;
+                    }
+                }
+            }
+            output.push_str(line);
+            output.push('\n');
+            current_row.0 += 1;
+        }
+    }
+
+    if current_row < file_line_count {
+        writeln!(output, "…").unwrap();
+    }
+}
+
+pub fn push_events(output: &mut String, events: &[Arc<predict_edits_v3::Event>]) {
+    if events.is_empty() {
+        return;
+    };
+
+    writeln!(output, "`````diff").unwrap();
+    for event in events {
+        writeln!(output, "{}", event).unwrap();
+    }
+    writeln!(output, "`````\n").unwrap();
+}
+
+struct PromptData {
+    events: Vec<Arc<Event>>,
+    cursor_point: Point,
+    cursor_path: Arc<Path>, // TODO: make a common struct with cursor_point
+    included_files: Vec<RelatedFile>,
+}
+
+#[derive(Default)]
+pub struct GenerationParams {
+    pub temperature: Option<f32>,
+    pub top_p: Option<f32>,
+    pub stop: Option<Vec<String>>,
+}
+
+trait PromptFormatter {
+    fn render(&self, data: &PromptData) -> String;
+
+    fn generation_params() -> GenerationParams {
+        return GenerationParams::default();
+    }
+}
+
+struct MinimalQwenPrompt;
+
+impl PromptFormatter for MinimalQwenPrompt {
+    fn render(&self, data: &PromptData) -> String {
+        let edit_history = self.fmt_edit_history(data);
+        let context = self.fmt_context(data);
+
+        format!(
+            "{instructions}\n\n{edit_history}\n\n{context}",
+            instructions = MinimalQwenPrompt::INSTRUCTIONS,
+            edit_history = edit_history,
+            context = context
+        )
+    }
+}
+
+impl MinimalQwenPrompt {
+    const INSTRUCTIONS: &str = "You are a code completion assistant that analyzes edit history to identify and systematically complete incomplete refactorings or patterns across the entire codebase.\n";
+
+    fn fmt_edit_history(&self, data: &PromptData) -> String {
+        if data.events.is_empty() {
+            "(No edit history)\n\n".to_string()
+        } else {
+            let mut events_str = String::new();
+            push_events(&mut events_str, &data.events);
+            format!(
+                "The following are the latest edits made by the user, from earlier to later.\n\n{}",
+                events_str
+            )
+        }
+    }
+
+    fn fmt_context(&self, data: &PromptData) -> String {
+        let mut context = String::new();
+        let include_line_numbers = true;
+
+        for related_file in &data.included_files {
+            writeln!(context, "<|file_sep|>{}", DiffPathFmt(&related_file.path)).unwrap();
+
+            if related_file.path == data.cursor_path {
+                write!(context, "<|fim_prefix|>").unwrap();
+                write_excerpts(
+                    &related_file.excerpts,
+                    &[(data.cursor_point, "<|fim_suffix|>")],
+                    related_file.max_row,
+                    include_line_numbers,
+                    &mut context,
+                );
+                writeln!(context, "<|fim_middle|>").unwrap();
+            } else {
+                write_excerpts(
+                    &related_file.excerpts,
+                    &[],
+                    related_file.max_row,
+                    include_line_numbers,
+                    &mut context,
+                );
+            }
+        }
+        context
+    }
+}
+
+struct SeedCoder1120Prompt;
+
+impl PromptFormatter for SeedCoder1120Prompt {
+    fn render(&self, data: &PromptData) -> String {
+        let edit_history = self.fmt_edit_history(data);
+        let context = self.fmt_context(data);
+
+        format!(
+            "# Edit History:\n{edit_history}\n\n{context}",
+            edit_history = edit_history,
+            context = context
+        )
+    }
+
+    fn generation_params() -> GenerationParams {
+        GenerationParams {
+            temperature: Some(0.2),
+            top_p: Some(0.9),
+            stop: Some(vec!["<[end_of_sentence]>".into()]),
+        }
+    }
+}
+
+impl SeedCoder1120Prompt {
+    fn fmt_edit_history(&self, data: &PromptData) -> String {
+        if data.events.is_empty() {
+            "(No edit history)\n\n".to_string()
+        } else {
+            let mut events_str = String::new();
+            push_events(&mut events_str, &data.events);
+            events_str
+        }
+    }
+
+    fn fmt_context(&self, data: &PromptData) -> String {
+        let mut context = String::new();
+        let include_line_numbers = true;
+
+        for related_file in &data.included_files {
+            writeln!(context, "# Path: {}\n", DiffPathFmt(&related_file.path)).unwrap();
+
+            if related_file.path == data.cursor_path {
+                let fim_prompt = self.fmt_fim(&related_file, data.cursor_point);
+                context.push_str(&fim_prompt);
+            } else {
+                write_excerpts(
+                    &related_file.excerpts,
+                    &[],
+                    related_file.max_row,
+                    include_line_numbers,
+                    &mut context,
+                );
+            }
+        }
+        context
+    }
+
+    fn fmt_fim(&self, file: &RelatedFile, cursor_point: Point) -> String {
+        let mut buf = String::new();
+        const FIM_SUFFIX: &str = "<[fim-suffix]>";
+        const FIM_PREFIX: &str = "<[fim-prefix]>";
+        const FIM_MIDDLE: &str = "<[fim-middle]>";
+        write!(buf, "{}", FIM_PREFIX).unwrap();
+        write_excerpts(
+            &file.excerpts,
+            &[(cursor_point, FIM_SUFFIX)],
+            file.max_row,
+            true,
+            &mut buf,
+        );
+
+        // Swap prefix and suffix parts
+        let index = buf.find(FIM_SUFFIX).unwrap();
+        let prefix = &buf[..index];
+        let suffix = &buf[index..];
+
+        format!("{}{}{}", suffix, prefix, FIM_MIDDLE)
+    }
+}
--- a/crates/collab/README.md
+++ b/crates/collab/README.md
@@ -63,3 +63,15 @@ Deployment is triggered by pushing to the `collab-staging` (or `collab-productio
 - `./script/deploy-collab production`

 You can tell what is currently deployed with `./script/what-is-deployed`.
+
+# Database Migrations
+
+To create a new migration:
+
+```sh
+./script/create-migration <name>
+```
+
+Migrations are run automatically on service start, so run `foreman start` again. The service will crash if the migrations fail.
+
+When you create a new migration, you also need to update the [SQLite schema](./migrations.sqlite/20221109000000_test_schema.sql) that is used for testing.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bennet Bo Fenner	87251198ef	Fix errors after merge conflicts	2025-12-08 17:20:50 +01:00
Bennet Bo Fenner	7997c29260	Merge branch 'main' into agent-paste-context	2025-12-08 17:09:13 +01:00
Bennet Bo Fenner	23c1556b9e	Fix abs_path, wrong line numbers	2025-12-08 17:08:47 +01:00
Bennet Bo Fenner	67e4361040	Deduplicate logic	2025-12-05 13:11:50 +01:00
ozer	0317d0497d	refactor: adaptive to new structure of message editor	2025-11-22 16:11:19 +03:00
ozer	f2476cf44e	Merge branch 'agent-paste-context' of github.com:ddoemonn/zed into agent-paste-context	2025-11-22 15:52:19 +03:00
ozer	32ece6eba8	Merge branch 'main' of github.com:ddoemonn/zed into agent-paste-context	2025-11-22 15:51:44 +03:00
ozzy	48e728e086	Merge branch 'main' into agent-paste-context	2025-11-22 15:27:23 +03:00
ozer	302d91ddd9	feat: auto-capture file context on paste to agent panel	2025-11-18 18:08:30 +03:00