move old acp support to its own module

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>
Remove deps
2025-07-24 13:14:16 -03:00 · 2025-07-24 13:06:39 -03:00 · 2025-07-24 13:02:43 -03:00 · 2025-07-24 12:59:56 -03:00 · 2025-07-24 12:50:14 -03:00 · 2025-07-24 12:48:26 -03:00
366 changed files with 6289 additions and 21548 deletions
--- a/.github/actions/build_docs/action.yml
+++ b/.github/actions/build_docs/action.yml
@@ -19,7 +19,7 @@ runs:
      shell: bash -euxo pipefail {0}
      run: ./script/linux

-    - name: Check for broken links (in MD)
+    - name: Check for broken links
      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
      with:
        args: --no-progress --exclude '^http' './docs/src/**/*'
@@ -30,9 +30,3 @@ runs:
      run: |
        mkdir -p target/deploy
        mdbook build ./docs --dest-dir=../target/deploy/docs/
-
-    - name: Check for broken links (in HTML)
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
-      with:
-        args: --no-progress --exclude '^http' 'target/deploy/docs/'
-        fail: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -269,10 +269,6 @@ jobs:
          mkdir -p ./../.cargo
          cp ./.cargo/ci-config.toml ./../.cargo/config.toml

-      - name: Check that Cargo.lock is up to date
-        run: |
-          cargo update --locked --workspace
-
      - name: cargo clippy
        run: ./script/clippy

@@ -771,8 +767,7 @@ jobs:
    timeout-minutes: 120
    name: Create a Windows installer
    runs-on: [self-hosted, Windows, X64]
-    if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
-    # if: (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+    if: false && (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
    needs: [windows_tests]
    env:
      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -111,11 +111,6 @@ jobs:
          echo "Publishing version: ${version} on release channel nightly"
          echo "nightly" > crates/zed/RELEASE_CHANNEL

-      - name: Setup Sentry CLI
-        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
-        with:
-          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
      - name: Create macOS app bundle
        run: script/bundle-mac

@@ -141,11 +136,6 @@ jobs:
      - name: Install Linux dependencies
        run: ./script/linux && ./script/install-mold 2.34.0

-      - name: Setup Sentry CLI
-        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
-        with:
-          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
      - name: Limit target directory size
        run: script/clear-target-dir-if-larger-than 100

@@ -178,11 +168,6 @@ jobs:
      - name: Install Linux dependencies
        run: ./script/linux

-      - name: Setup Sentry CLI
-        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
-        with:
-          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
      - name: Limit target directory size
        run: script/clear-target-dir-if-larger-than 100

@@ -277,11 +262,6 @@ jobs:
          Write-Host "Publishing version: $version on release channel nightly"
          "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"

-      - name: Setup Sentry CLI
-        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
-        with:
-          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
      - name: Build Zed installer
        working-directory: ${{ env.ZED_WORKSPACE }}
        run: script/bundle-windows.ps1
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/acp_thread",
    "crates/activity_indicator",
-    "crates/agent",
-    "crates/agent_servers",
-    "crates/agent_settings",
+    "crates/acp_thread",
    "crates/agent_ui",
+    "crates/agent",
+    "crates/agent_settings",
    "crates/ai_onboarding",
+    "crates/agent_servers",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
@@ -29,9 +29,6 @@ members = [
    "crates/cli",
    "crates/client",
    "crates/clock",
-    "crates/cloud_api_client",
-    "crates/cloud_api_types",
-    "crates/cloud_llm_client",
    "crates/collab",
    "crates/collab_ui",
    "crates/collections",
@@ -51,8 +48,8 @@ members = [
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/editor",
-    "crates/eval",
    "crates/explorer_command_injector",
+    "crates/eval",
    "crates/extension",
    "crates/extension_api",
    "crates/extension_cli",
@@ -73,6 +70,7 @@ members = [
    "crates/gpui",
    "crates/gpui_macros",
    "crates/gpui_tokio",
+
    "crates/html_to_markdown",
    "crates/http_client",
    "crates/http_client_tls",
@@ -101,6 +99,7 @@ members = [
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
+    "crates/svg_preview",
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
@@ -141,7 +140,6 @@ members = [
    "crates/semantic_version",
    "crates/session",
    "crates/settings",
-    "crates/settings_profile_selector",
    "crates/settings_ui",
    "crates/snippet",
    "crates/snippet_provider",
@@ -154,7 +152,6 @@ members = [
    "crates/sum_tree",
    "crates/supermaven",
    "crates/supermaven_api",
-    "crates/svg_preview",
    "crates/tab_switcher",
    "crates/task",
    "crates/tasks_ui",
@@ -254,9 +251,6 @@ channel = { path = "crates/channel" }
 cli = { path = "crates/cli" }
 client = { path = "crates/client" }
 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" }
 collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
@@ -343,7 +337,6 @@ picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
-settings_profile_selector = { path = "crates/settings_profile_selector" }
 project = { path = "crates/project" }
 project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
@@ -420,7 +413,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 #

 agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.11"
+agent-client-protocol = { path = "../agent-client-protocol" }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
@@ -467,7 +460,7 @@ core-video = { version = "0.4.3", features = ["metal"] }
 cpal = "0.16"
 criterion = { version = "0.5", features = ["html_reports"] }
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "1b461b310481d01e02b2603c16d7144b926339f8" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "7f39295b441614ca9dbf44293e53c32f666897f9" }
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
@@ -652,6 +645,7 @@ which = "6.0.0"
 windows-core = "0.61"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
+zed_llm_client = "= 0.8.6"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
@@ -678,16 +672,14 @@ features = [
    "UI_ViewManagement",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
-    "Win32_Graphics_Direct3D",
-    "Win32_Graphics_Direct3D11",
-    "Win32_Graphics_Direct3D_Fxc",
-    "Win32_Graphics_DirectComposition",
+    "Win32_Graphics_Direct2D",
+    "Win32_Graphics_Direct2D_Common",
    "Win32_Graphics_DirectWrite",
    "Win32_Graphics_Dwm",
-    "Win32_Graphics_Dxgi",
    "Win32_Graphics_Dxgi_Common",
    "Win32_Graphics_Gdi",
    "Win32_Graphics_Imaging",
+    "Win32_Graphics_Imaging_D2D",
    "Win32_Networking_WinSock",
    "Win32_Security",
    "Win32_Security_Credentials",
@@ -728,11 +720,6 @@ workspace-hack = { path = "tooling/workspace-hack" }
 split-debuginfo = "unpacked"
 codegen-units = 16

-# mirror configuration for crates compiled for the build platform
-# (without this cargo will compile ~400 crates twice)
-[profile.dev.build-override]
-codegen-units = 16
-
 [profile.dev.package]
 taffy = { opt-level = 3 }
 cranelift-codegen = { opt-level = 3 }
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # Zed

-[![Zed](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zed-industries/zed/main/assets/badge/v0.json)](https://zed.dev)
 [![CI](https://github.com/zed-industries/zed/actions/workflows/ci.yml/badge.svg)](https://github.com/zed-industries/zed/actions/workflows/ci.yml)

 Welcome to Zed, a high-performance, multiplayer code editor from the creators of [Atom](https://github.com/atom/atom) and [Tree-sitter](https://github.com/tree-sitter/tree-sitter).
--- a/assets/badge/v0.json
+++ b/assets/badge/v0.json
@@ -1,8 +0,0 @@
-{
-  "label": "",
-  "message": "Zed",
-  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 96 96\"><rect width=\"96\" height=\"96\" fill=\"#000\"/><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M9 6C7.34315 6 6 7.34315 6 9V75H0V9C0 4.02944 4.02944 0 9 0H89.3787C93.3878 0 95.3955 4.84715 92.5607 7.68198L43.0551 57.1875H57V51H63V58.6875C63 61.1728 60.9853 63.1875 58.5 63.1875H37.0551L26.7426 73.5H73.5V36H79.5V73.5C79.5 76.8137 76.8137 79.5 73.5 79.5H20.7426L10.2426 90H87C88.6569 90 90 88.6569 90 87V21H96V87C96 91.9706 91.9706 96 87 96H6.62132C2.61224 96 0.604504 91.1529 3.43934 88.318L52.7574 39H39V45H33V37.5C33 35.0147 35.0147 33 37.5 33H58.7574L69.2574 22.5H22.5V60H16.5V22.5C16.5 19.1863 19.1863 16.5 22.5 16.5H75.2574L85.7574 6H9Z\" fill=\"#fff\"/></svg>",
-  "logoWidth": 16,
-  "labelColor": "black",
-  "color": "white"
-}
--- a/assets/icons/audio_off.svg
+++ b/assets/icons/audio_off.svg
@@ -1,7 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 6C11.003 6.44823 11.2208 6.97398 11.3001 7.52867" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 3.75732C13.7621 4.6095 14.3383 5.69876 14.5629 6.88315C14.7875 8.06754 14.6502 9.29213 14.1688 10.3973" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2L13.6667 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33333 4.66669L4.942 5.05802C4.85494 5.1456 4.75136 5.21504 4.63726 5.2623C4.52317 5.30957 4.40083 5.33372 4.27733 5.33335H2.66667C2.48986 5.33335 2.32029 5.40359 2.19526 5.52862C2.07024 5.65364 2 5.82321 2 6.00002V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3088 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2646 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8654V7.33335" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.21875 2.78136C7.28267 2.71719 7.36421 2.67345 7.45303 2.65568C7.54184 2.63791 7.63393 2.64691 7.71762 2.68154C7.80132 2.71618 7.87284 2.77488 7.92312 2.85022C7.97341 2.92555 8.0002 3.01412 8.00008 3.10469V3.56202" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-volume-off"><path d="M16 9a5 5 0 0 1 .95 2.293"/><path d="M19.364 5.636a9 9 0 0 1 1.889 9.96"/><path d="m2 2 20 20"/><path d="m7 7-.587.587A1.4 1.4 0 0 1 5.416 8H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h2.416a1.4 1.4 0 0 1 .997.413l3.383 3.384A.705.705 0 0 0 11 19.298V11"/><path d="M9.828 4.172A.686.686 0 0 1 11 4.657v.686"/></svg>
--- a/assets/icons/audio_on.svg
+++ b/assets/icons/audio_on.svg
@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3.13467C7.99987 3.04181 7.97223 2.95107 7.92057 2.8739C7.86892 2.79674 7.79557 2.7366 7.70977 2.70108C7.62397 2.66557 7.52958 2.65626 7.43849 2.67434C7.34741 2.69242 7.26373 2.73707 7.198 2.80266L4.942 5.058C4.85494 5.14558 4.75136 5.21502 4.63726 5.26228C4.52317 5.30954 4.40083 5.33369 4.27733 5.33333H2.66667C2.48986 5.33333 2.32029 5.40357 2.19526 5.52859C2.07024 5.65362 2 5.82319 2 6V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3087 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2645 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8653V3.13467Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.6667 6C11.0995 6.57699 11.3334 7.27877 11.3334 8C11.3334 8.72123 11.0995 9.42301 10.6667 10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 12.2427C13.4666 11.6855 13.9085 11.0241 14.2101 10.2961C14.5116 9.56815 14.6668 8.78793 14.6668 7.99999C14.6668 7.21205 14.5116 6.43183 14.2101 5.70387C13.9085 4.97591 13.4666 4.31448 12.9094 3.75732" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-volume-2"><path d="M11 4.702a.705.705 0 0 0-1.203-.498L6.413 7.587A1.4 1.4 0 0 1 5.416 8H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h2.416a1.4 1.4 0 0 1 .997.413l3.383 3.384A.705.705 0 0 0 11 19.298z"/><path d="M16 9a5 5 0 0 1 0 6"/><path d="M19.364 18.364a9 9 0 0 0 0-12.728"/></svg>
--- a/assets/icons/cloud_download.svg
+++ b/assets/icons/cloud_download.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-cloud-download-icon lucide-cloud-download"><path d="M12 13v8l-4-4"/><path d="m12 21 4-4"/><path d="M4.393 15.269A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 2.436 8.284"/></svg>
--- a/assets/icons/editor_atom.svg
+++ b/assets/icons/editor_atom.svg
--- a/assets/icons/editor_cursor.svg
+++ b/assets/icons/editor_cursor.svg
@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M3.5 11V5.5L8.5 8L3.5 11Z" fill="black"/>
-<path opacity="0.4" d="M8.5 14L3.5 11L8.5 8V14Z" fill="black"/>
-<path opacity="0.6" d="M8.5 5.5H3.5L8.5 2.5L8.5 5.5Z" fill="black"/>
-<path opacity="0.8" d="M8.5 5.5V2.5L13.5 5.5H8.5Z" fill="black"/>
-<path opacity="0.2" d="M13.5 11L8.5 14L11 9.5L13.5 11Z" fill="black"/>
-<path opacity="0.5" d="M13.5 11L11 9.5L13.5 5V11Z" fill="black"/>
-<path d="M3.5 11V5L8.5 2.11325L13.5 5V11L8.5 13.8868L3.5 11Z" stroke="black"/>
-</svg>
--- a/assets/icons/editor_emacs.svg
+++ b/assets/icons/editor_emacs.svg
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2716_663)">
-<path d="M8.47552 2.45453C11.5167 2.45457 13.9814 4.94501 13.9814 8.01623C13.9814 11.0875 11.5167 13.578 8.47552 13.5781C5.43427 13.5781 2.96948 11.0875 2.96948 8.01623C2.9695 4.94498 5.43429 2.45453 8.47552 2.45453ZM10.8795 4.70348C10.7605 4.16887 10.1328 3.85468 9.53627 3.96342C8.97622 4.06552 7.62871 4.45681 7.62057 4.45916C9.29414 4.44469 9.57429 4.4726 9.69939 4.64751C9.77324 4.7508 9.66576 4.89248 9.21944 4.96538C8.73515 5.04447 7.73014 5.13958 7.72343 5.14022C6.75441 5.19776 6.07177 5.20168 5.86705 5.63512C5.73334 5.91827 6.00968 6.16857 6.13082 6.32527C6.64271 6.89455 7.38215 7.20158 7.85809 7.42767C8.03716 7.51274 8.56257 7.67345 8.56257 7.67345C7.01855 7.58853 5.90474 8.06267 5.2514 8.60855C4.51246 9.29204 4.83937 10.1067 6.35327 10.6084C7.24742 10.9047 7.69094 11.0439 9.02473 10.9238C9.81031 10.8815 9.9342 10.9068 9.94203 10.9712C9.95275 11.062 9.06932 11.2874 8.82812 11.357C8.21455 11.534 6.60645 11.8913 6.59758 11.8932C6.60115 11.8935 7.06249 11.9257 7.65531 11.8735C7.89632 11.8522 8.81142 11.7624 9.49557 11.6123C9.49557 11.6123 10.3297 11.4338 10.7759 11.2693C11.2429 11.0973 11.497 10.9512 11.6113 10.7443C11.6063 10.7019 11.6465 10.5516 11.4313 10.4613C10.8807 10.2304 10.2423 10.2721 8.9789 10.2453C7.57789 10.1972 7.11184 9.9626 6.86356 9.77373C6.62548 9.58212 6.74518 9.05204 7.76528 8.5851C8.27917 8.33646 10.2935 7.87759 10.2935 7.87759C9.61511 7.54227 8.35014 6.95284 8.09005 6.82552C7.86199 6.71388 7.49701 6.54572 7.4179 6.34233C7.32824 6.14709 7.6297 5.97888 7.79813 5.9307C8.34057 5.77424 9.10635 5.67701 9.8033 5.66609C10.1536 5.66061 10.2105 5.63806 10.2105 5.63806C10.6939 5.55787 11.0121 5.22722 10.8795 4.70348Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2716_663">
-<rect width="12" height="12" fill="white" transform="translate(2.5 2)"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/icons/editor_jet_brains.svg
+++ b/assets/icons/editor_jet_brains.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.6725 13.9985C3.36161 13.9982 3.06354 13.8746 2.84371 13.6548C2.62388 13.435 2.50026 13.1369 2.5 12.826V7.494C2.5 6.8325 2.7675 6.185 3.2365 5.7165L6.219 2.736C6.45192 2.50247 6.72867 2.31724 7.03335 2.19094C7.33804 2.06464 7.66467 1.99975 7.9945 2H13.3275C13.6384 2.00027 13.9365 2.12388 14.1563 2.34371C14.3761 2.56354 14.4997 2.86162 14.5 3.1725V8.5045C14.4983 9.17074 14.2336 9.80936 13.7635 10.2815L10.781 13.264C10.5477 13.4976 10.2706 13.6829 9.96561 13.8092C9.66059 13.9355 9.33364 14.0003 9.0035 14V13.9985H3.6725ZM8.157 10.5715H5.243V11.257H8.157V10.5715ZM4.4815 5.257H11.243V12.0165L13.3715 9.888C13.7373 9.52036 13.9433 9.02316 13.9445 8.5045V3.1725C13.9445 2.8335 13.6685 2.5555 13.3275 2.5555H7.9945C7.73753 2.55499 7.483 2.6053 7.24556 2.70356C7.00813 2.80181 6.79246 2.94606 6.611 3.128L4.4815 5.257ZM4.3855 5.353L3.628 6.11C3.26258 6.47809 3.0569 6.97533 3.0555 7.494V12.826C3.0555 13.165 3.3315 13.443 3.6725 13.443H9.0055C9.26249 13.4434 9.51701 13.3929 9.75445 13.2946C9.99188 13.1963 10.2075 13.052 10.389 12.87L11.145 12.1145H4.3855V5.353Z" fill="black"/>
-</svg>
--- a/assets/icons/editor_sublime.svg
+++ b/assets/icons/editor_sublime.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 fill-rule="evenodd" clip-rule="evenodd" d="M13.0945 8.01611C13.0945 7.87619 12.9911 7.79551 12.8642 7.8356L4.13456 10.6038C4.00742 10.6441 3.90427 10.7904 3.90427 10.9301V13.7593C3.90427 13.8992 4.00742 13.9801 4.13456 13.9398L12.8642 11.1719C12.9911 11.1315 13.0945 10.9852 13.0945 10.8453V8.01611Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.90427 7.92597C3.90427 8.06588 4.00742 8.21218 4.13456 8.25252L12.8655 11.0209C12.9926 11.0613 13.0958 10.9803 13.0958 10.8407V8.01124C13.0958 7.87158 12.9926 7.72529 12.8655 7.68494L4.13456 4.91652C4.00742 4.87618 3.90427 4.95686 3.90427 5.09677V7.92597Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.0945 2.20248C13.0945 2.06256 12.9911 1.98163 12.8642 2.02197L4.13456 4.78988C4.00742 4.83022 3.90427 4.97652 3.90427 5.11644V7.94563C3.90427 8.08554 4.00742 8.16622 4.13456 8.12614L12.8642 5.35797C12.9911 5.31763 13.0945 5.17133 13.0945 5.03167V2.20248Z" fill="black"/>
-</svg>
--- a/assets/icons/editor_vs_code.svg
+++ b/assets/icons/editor_vs_code.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0094 13.9181C11.1984 13.9917 11.4139 13.987 11.6047 13.8952L14.0753 12.7064C14.3349 12.5814 14.5 12.3187 14.5 12.0305V3.9696C14.5 3.68136 14.3349 3.41862 14.0753 3.2937L11.6047 2.10485C11.3543 1.98438 11.0614 2.01389 10.8416 2.17363C10.8102 2.19645 10.7803 2.22193 10.7523 2.25001L6.02261 6.56498L3.96246 5.00115C3.77068 4.85558 3.50244 4.86751 3.32432 5.02953L2.66356 5.63059C2.44569 5.82877 2.44544 6.17152 2.66302 6.37004L4.44965 8.00001L2.66302 9.62998C2.44544 9.82849 2.44569 10.1713 2.66356 10.3694L3.32432 10.9705C3.50244 11.1325 3.77068 11.1444 3.96246 10.9989L6.02261 9.43504L10.7523 13.75C10.8271 13.8249 10.915 13.8812 11.0094 13.9181ZM11.5018 5.27587L7.91309 8.00001L11.5018 10.7241V5.27587Z" fill="black"/>
-</svg>
--- a/assets/icons/exit.svg
+++ b/assets/icons/exit.svg
@@ -1,5 +1,8 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.437 11.0461L13.4831 8L10.437 4.95392" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 8L8 8" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.6553 13.4659H4.21843C3.89528 13.4659 3.58537 13.3375 3.35687 13.109C3.12837 12.8805 3 12.5706 3 12.2475V3.71843C3 3.39528 3.12837 3.08537 3.35687 2.85687C3.58537 2.62837 3.89528 2.5 4.21843 2.5H6.6553" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M3 1C2.44771 1 2 1.44772 2 2V13C2 13.5523 2.44772 14 3 14H10.5C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13H3V2L10.5 2C10.7761 2 11 1.77614 11 1.5C11 1.22386 10.7761 1 10.5 1H3ZM12.6036 4.89645C12.4083 4.70118 12.0917 4.70118 11.8964 4.89645C11.7012 5.09171 11.7012 5.40829 11.8964 5.60355L13.2929 7H6.5C6.22386 7 6 7.22386 6 7.5C6 7.77614 6.22386 8 6.5 8H13.2929L11.8964 9.39645C11.7012 9.59171 11.7012 9.90829 11.8964 10.1036C12.0917 10.2988 12.4083 10.2988 12.6036 10.1036L14.8536 7.85355C15.0488 7.65829 15.0488 7.34171 14.8536 7.14645L12.6036 4.89645Z"
+    fill="currentColor"
+  />
 </svg>
--- a/assets/icons/file_icons/surrealql.svg
+++ b/assets/icons/file_icons/surrealql.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.628 11.0743V10.4575H8.45562L8.65084 10.2445C8.75911 10.1264 8.96952 9.79454 9.11862 9.50789C9.52153 8.73047 9.51798 7.25107 9.11862 6.43992C8.58614 5.35722 7.49453 4.56381 6.24942 4.35703C4.59252 4.08192 2.86196 5.00312 2.14045 6.54287C1.77038 7.33182 1.77038 8.64437 2.14045 9.43333C2.45905 10.1122 3.11309 10.8204 3.73609 11.1595C4.51439 11.5828 5.18264 11.676 7.51312 11.6848L9.62627 11.6928L9.628 11.0743ZM5.30605 10.169C4.24109 10.0111 3.45215 9.07124 3.45659 7.96813C3.45659 7.33004 3.70064 6.80022 4.18697 6.36182C4.67685 5.91986 5.1312 5.77344 5.86602 5.82048C7.00287 5.89236 7.82382 6.79845 7.82382 7.98056C7.82382 8.61332 7.71996 8.91682 7.33036 9.42534C6.90172 9.98444 6.08345 10.2853 5.30692 10.1699M15.1374 10.9802V10.2684H11.8138V4.47509H10.1986V11.6928H15.1374V10.9802Z" fill="black"/>
-</svg>
--- a/assets/icons/mic.svg
+++ b/assets/icons/mic.svg
@@ -1,5 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 12.2028V14.3042" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.2027 6.94928V8.11672C12.2027 9.20041 11.7599 10.2397 10.9717 11.006C10.1836 11.7723 9.11457 12.2028 7.99992 12.2028C6.88527 12.2028 5.81627 11.7723 5.02809 11.006C4.23991 10.2397 3.79712 9.20041 3.79712 8.11672V6.94928" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.1015 3.63555C10.1015 2.56426 9.16065 1.6958 8.00008 1.6958C6.83951 1.6958 5.89868 2.56426 5.89868 3.63555V8.16165C5.89868 9.23294 6.83951 10.1014 8.00008 10.1014C9.16065 10.1014 10.1015 9.23294 10.1015 8.16165V3.63555Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.72742 8.83338C3.63539 8.57302 3.34973 8.43656 3.08937 8.52858C2.82901 8.6206 2.69255 8.90626 2.78458 9.16662C2.86101 9.38288 2.95188 9.59228 3.056 9.79364C3.81427 11.2601 5.27842 12.3044 7.00014 12.4753L7.00014 14L5.50014 14C5.22399 14 5.00014 14.2239 5.00014 14.5C5.00014 14.7761 5.22399 15 5.50014 15L7.50014 15L9.50014 15C9.77628 15 10.0001 14.7761 10.0001 14.5C10.0001 14.2239 9.77628 14 9.50014 14L8.00014 14L8.00014 12.4753C9.72168 12.3043 11.1857 11.26 11.9439 9.79364C12.048 9.59228 12.1389 9.38288 12.2153 9.16662C12.3073 8.90626 12.1709 8.6206 11.9105 8.52858C11.6501 8.43656 11.3645 8.57302 11.2725 8.83338C11.2114 9.00607 11.1388 9.17337 11.0556 9.33433C10.3899 10.6218 9.04706 11.5 7.49994 11.5C5.95282 11.5 4.60997 10.6218 3.94428 9.33433C3.86104 9.17337 3.78845 9.00607 3.72742 8.83338ZM5.5 3.5L5.5 7.5C5.5 8.60457 6.39543 9.5 7.5 9.5C8.60457 9.5 9.5 8.60457 9.5 7.5L9.5 3.5C9.5 2.39543 8.60457 1.5 7.5 1.5C6.39543 1.5 5.5 2.39543 5.5 3.5ZM4.5 7.5C4.5 9.15685 5.84315 10.5 7.5 10.5C9.15685 10.5 10.5 9.15685 10.5 7.5L10.5 3.5C10.5 1.84315 9.15685 0.5 7.5 0.5C5.84315 0.5 4.5 1.84315 4.5 3.5L4.5 7.5Z" fill="black"/>
 </svg>
--- a/assets/icons/mic_mute.svg
+++ b/assets/icons/mic_mute.svg
@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L13 13" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 9C12 8.74858 12 8.49375 12 8.23839V7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.00043 7V8.09869C3.98856 8.86731 4.22157 9.62164 4.66938 10.2643C5.11718 10.907 5.75924 11.4085 6.51267 11.7042C7.2661 11.9999 8.09632 12.0761 8.89619 11.923C9.47851 11.8115 10.0253 11.5823 10.5 11.2539" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 6V3.62904C9.99714 3.26103 9.8347 2.90448 9.53885 2.6168C9.24299 2.32913 8.83093 2.12707 8.36903 2.04316C7.90713 1.95926 7.42226 1.9984 6.99252 2.15427C6.56278 2.31015 6.21317 2.57369 6 2.90245" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 6V8.00088C6.00031 8.39636 6.10356 8.78287 6.29674 9.11159C6.48991 9.44031 6.76433 9.69649 7.08534 9.84779C7.40634 9.99909 7.75954 10.0387 8.10032 9.96165C8.4411 9.88459 8.75417 9.69431 9 9.41483" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 12V14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.87 1.83637C13.0557 1.63204 13.0407 1.31581 12.8363 1.13006C12.632 0.944307 12.3158 0.959365 12.13 1.16369L10.4589 3.00199C10.2216 1.58215 8.98719 0.5 7.5 0.5C5.84315 0.5 4.5 1.84315 4.5 3.5L4.5 7.5C4.5 8.0754 4.66199 8.61297 4.94286 9.06958L4.24966 9.8321C4.1363 9.6744 4.03412 9.5081 3.94428 9.33433C3.86104 9.17337 3.78845 9.00607 3.72742 8.83338C3.63539 8.57302 3.34973 8.43656 3.08937 8.52858C2.82901 8.6206 2.69255 8.90626 2.78458 9.16662C2.86101 9.38288 2.95188 9.59228 3.056 9.79364C3.20094 10.074 3.37167 10.3388 3.56506 10.5852L2.13003 12.1637C1.94428 12.368 1.95933 12.6842 2.16366 12.87C2.36799 13.0558 2.68422 13.0407 2.86997 12.8364L4.25951 11.3079C5.01297 11.9497 5.95951 12.372 7.00014 12.4753L7.00014 14L5.50014 14C5.22399 14 5.00014 14.2239 5.00014 14.5C5.00014 14.7761 5.22399 15 5.50014 15L7.50014 15L9.50014 15C9.77628 15 10.0001 14.7761 10.0001 14.5C10.0001 14.2239 9.77628 14 9.50014 14L8.00014 14L8.00014 12.4753C9.72168 12.3043 11.1857 11.26 11.9439 9.79364C12.048 9.59228 12.1389 9.38288 12.2153 9.16662C12.3073 8.90626 12.1709 8.6206 11.9105 8.52858C11.6501 8.43656 11.3645 8.57302 11.2725 8.83338C11.2114 9.00607 11.1388 9.17337 11.0556 9.33433C10.3899 10.6218 9.04706 11.5 7.49994 11.5C6.523 11.5 5.62751 11.1498 4.93254 10.5675L5.60604 9.82669C6.12251 10.2476 6.78178 10.5 7.5 10.5C9.15685 10.5 10.5 9.15685 10.5 7.5L10.5 4.44333L12.87 1.83637ZM9.5 4.05673L9.5 3.5C9.5 2.39543 8.60457 1.5 7.5 1.5C6.39543 1.5 5.5 2.39543 5.5 3.5L5.5 7.5C5.5 7.77755 5.55653 8.04189 5.65872 8.28214L9.5 4.05673ZM6.28022 9.08509L9.5 5.54333L9.5 7.5C9.5 8.60457 8.60457 9.5 7.5 9.5C7.04083 9.5 6.6178 9.34527 6.28022 9.08509Z" fill="black"/>
 </svg>
--- a/assets/icons/screen.svg
+++ b/assets/icons/screen.svg
@@ -1,5 +1,8 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 3H3.2C2.53726 3 2 3.51167 2 4.14286V9.85714C2 10.4883 2.53726 11 3.2 11H12.8C13.4627 11 14 10.4883 14 9.85714V4.14286C14 3.51167 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 14H10.6666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 11.3333V14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M1 3.25C1 3.11193 1.11193 3 1.25 3H13.75C13.8881 3 14 3.11193 14 3.25V10.75C14 10.8881 13.8881 11 13.75 11H1.25C1.11193 11 1 10.8881 1 10.75V3.25ZM1.25 2C0.559643 2 0 2.55964 0 3.25V10.75C0 11.4404 0.559644 12 1.25 12H5.07341L4.82991 13.2986C4.76645 13.6371 5.02612 13.95 5.37049 13.95H9.62951C9.97389 13.95 10.2336 13.6371 10.1701 13.2986L9.92659 12H13.75C14.4404 12 15 11.4404 15 10.75V3.25C15 2.55964 14.4404 2 13.75 2H1.25ZM9.01091 12H5.98909L5.79222 13.05H9.20778L9.01091 12Z"
+    fill="currentColor"
+  />
 </svg>
--- a/assets/icons/shield_check.svg
+++ b/assets/icons/shield_check.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.0001 8.62505C13.0001 11.75 10.8126 13.3125 8.21266 14.2187C8.07651 14.2648 7.92862 14.2626 7.79392 14.2125C5.18771 13.3125 3.00024 11.75 3.00024 8.62505V4.25012C3.00024 4.08436 3.06609 3.92539 3.1833 3.80818C3.30051 3.69098 3.45948 3.62513 3.62523 3.62513C4.87521 3.62513 6.43769 2.87514 7.52517 1.92516C7.65758 1.81203 7.82601 1.74988 8.00016 1.74988C8.17431 1.74988 8.34275 1.81203 8.47515 1.92516C9.56889 2.88139 11.1251 3.62513 12.3751 3.62513C12.5408 3.62513 12.6998 3.69098 12.817 3.80818C12.9342 3.92539 13.0001 4.08436 13.0001 4.25012V8.62505Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8.00002L7.33333 9.33335L10 6.66669" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -232,7 +232,7 @@
      "ctrl-n": "agent::NewThread",
      "ctrl-alt-n": "agent::NewTextThread",
      "ctrl-shift-h": "agent::OpenHistory",
-      "ctrl-alt-c": "agent::OpenSettings",
+      "ctrl-alt-c": "agent::OpenConfiguration",
      "ctrl-alt-p": "agent::OpenRulesLibrary",
      "ctrl-i": "agent::ToggleProfileSelector",
      "ctrl-alt-/": "agent::ToggleModelSelector",
@@ -495,7 +495,7 @@
      "shift-f12": "editor::GoToImplementation",
      "alt-ctrl-f12": "editor::GoToTypeDefinitionSplit",
      "alt-shift-f12": "editor::FindAllReferences",
-      "ctrl-m": "editor::MoveToEnclosingBracket", // from jetbrains
+      "ctrl-m": "editor::MoveToEnclosingBracket",
      "ctrl-|": "editor::MoveToEnclosingBracket",
      "ctrl-{": "editor::Fold",
      "ctrl-}": "editor::UnfoldLines",
@@ -598,7 +598,6 @@
      "ctrl-shift-t": "pane::ReopenClosedItem",
      "ctrl-k ctrl-s": "zed::OpenKeymapEditor",
      "ctrl-k ctrl-t": "theme_selector::Toggle",
-      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
      "ctrl-p": "file_finder::Toggle",
      "ctrl-tab": "tab_switcher::Toggle",
@@ -873,6 +872,8 @@
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
+      "ctrl-enter": "git::Commit",
+      "ctrl-shift-enter": "git::Amend",
      "alt-enter": "menu::SecondaryConfirm",
      "delete": ["git::RestoreFile", { "skip_prompt": false }],
      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
@@ -909,9 +910,7 @@
      "ctrl-g backspace": "git::RestoreTrackedFiles",
      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend"
+      "ctrl-shift-space": "git::UnstageAll"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -272,7 +272,7 @@
      "cmd-n": "agent::NewThread",
      "cmd-alt-n": "agent::NewTextThread",
      "cmd-shift-h": "agent::OpenHistory",
-      "cmd-alt-c": "agent::OpenSettings",
+      "cmd-alt-c": "agent::OpenConfiguration",
      "cmd-alt-p": "agent::OpenRulesLibrary",
      "cmd-i": "agent::ToggleProfileSelector",
      "cmd-alt-/": "agent::ToggleModelSelector",
@@ -549,7 +549,7 @@
      "alt-cmd-f12": "editor::GoToTypeDefinitionSplit",
      "alt-shift-f12": "editor::FindAllReferences",
      "cmd-|": "editor::MoveToEnclosingBracket",
-      "ctrl-m": "editor::MoveToEnclosingBracket", // From Jetbrains
+      "ctrl-m": "editor::MoveToEnclosingBracket",
      "alt-cmd-[": "editor::Fold",
      "alt-cmd-]": "editor::UnfoldLines",
      "cmd-k cmd-l": "editor::ToggleFold",
@@ -665,7 +665,6 @@
      "cmd-shift-t": "pane::ReopenClosedItem",
      "cmd-k cmd-s": "zed::OpenKeymapEditor",
      "cmd-k cmd-t": "theme_selector::Toggle",
-      "ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
      "cmd-t": "project_symbols::Toggle",
      "cmd-p": "file_finder::Toggle",
      "ctrl-tab": "tab_switcher::Toggle",
@@ -951,6 +950,8 @@
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
+      "cmd-enter": "git::Commit",
+      "cmd-shift-enter": "git::Amend",
      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
      "delete": ["git::RestoreFile", { "skip_prompt": false }],
      "cmd-backspace": ["git::RestoreFile", { "skip_prompt": true }],
@@ -1000,9 +1001,7 @@
      "ctrl-g backspace": "git::RestoreTrackedFiles",
      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
      "cmd-ctrl-y": "git::StageAll",
-      "cmd-ctrl-shift-y": "git::UnstageAll",
-      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend"
+      "cmd-ctrl-shift-y": "git::UnstageAll"
    }
  },
  {
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -8,7 +8,7 @@
      "ctrl-shift-i": "agent::ToggleFocus",
      "ctrl-l": "agent::ToggleFocus",
      "ctrl-shift-l": "agent::ToggleFocus",
-      "ctrl-shift-j": "agent::OpenSettings"
+      "ctrl-shift-j": "agent::OpenConfiguration"
    }
  },
  {
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -4,7 +4,6 @@
      "ctrl-alt-s": "zed::OpenSettings",
      "ctrl-{": "pane::ActivatePreviousItem",
      "ctrl-}": "pane::ActivateNextItem",
-      "shift-escape": null, // Unmap workspace::zoom
      "ctrl-f2": "debugger::Stop",
      "f6": "debugger::Pause",
      "f7": "debugger::StepInto",
@@ -45,8 +44,8 @@
      "ctrl-alt-right": "pane::GoForward",
      "alt-f7": "editor::FindAllReferences",
      "ctrl-alt-f7": "editor::FindAllReferences",
-      "ctrl-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
-      "ctrl-alt-b": "editor::GoToDefinitionSplit", // Conflicts with workspace::ToggleRightDock
+      // "ctrl-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
+      // "ctrl-alt-b": "editor::GoToDefinitionSplit", // Conflicts with workspace::ToggleLeftDock
      "ctrl-shift-b": "editor::GoToTypeDefinition",
      "ctrl-alt-shift-b": "editor::GoToTypeDefinitionSplit",
      "f2": "editor::GoToDiagnostic",
@@ -95,33 +94,18 @@
      "ctrl-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
      "alt-shift-f10": "task::Spawn",
      "ctrl-e": "file_finder::Toggle",
-      // "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+      "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
      "ctrl-shift-n": "file_finder::Toggle",
      "ctrl-shift-a": "command_palette::Toggle",
      "shift shift": "command_palette::Toggle",
      "ctrl-alt-shift-n": "project_symbols::Toggle",
      "alt-0": "git_panel::ToggleFocus",
-      "alt-1": "project_panel::ToggleFocus",
+      "alt-1": "workspace::ToggleLeftDock",
      "alt-5": "debug_panel::ToggleFocus",
      "alt-6": "diagnostics::Deploy",
      "alt-7": "outline_panel::ToggleFocus"
    }
  },
-  {
-    "context": "Pane", // this is to override the default Pane mappings to switch tabs
-    "bindings": {
-      "alt-1": "project_panel::ToggleFocus",
-      "alt-2": null, // Bookmarks (left dock)
-      "alt-3": null, // Find Panel (bottom dock)
-      "alt-4": null, // Run Panel (bottom dock)
-      "alt-5": "debug_panel::ToggleFocus",
-      "alt-6": "diagnostics::Deploy",
-      "alt-7": "outline_panel::ToggleFocus",
-      "alt-8": null, // Services (bottom dock)
-      "alt-9": null, // Git History (bottom dock)
-      "alt-0": "git_panel::ToggleFocus"
-    }
-  },
  {
    "context": "Workspace || Editor",
    "bindings": {
@@ -167,9 +151,6 @@
  { "context": "OutlinePanel", "bindings": { "alt-7": "workspace::CloseActiveDock" } },
  {
    "context": "Dock || Workspace || Terminal || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
-    "bindings": {
-      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock"
-    }
+    "bindings": { "escape": "editor::ToggleFocus" }
  }
 ]
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -8,7 +8,7 @@
      "cmd-shift-i": "agent::ToggleFocus",
      "cmd-l": "agent::ToggleFocus",
      "cmd-shift-l": "agent::ToggleFocus",
-      "cmd-shift-j": "agent::OpenSettings"
+      "cmd-shift-j": "agent::OpenConfiguration"
    }
  },
  {
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -4,7 +4,6 @@
      "cmd-{": "pane::ActivatePreviousItem",
      "cmd-}": "pane::ActivateNextItem",
      "cmd-0": "git_panel::ToggleFocus", // overrides `cmd-0` zoom reset
-      "shift-escape": null, // Unmap workspace::zoom
      "ctrl-f2": "debugger::Stop",
      "f6": "debugger::Pause",
      "f7": "debugger::StepInto",
@@ -97,7 +96,7 @@
      "cmd-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
      "ctrl-alt-r": "task::Spawn",
      "cmd-e": "file_finder::Toggle",
-      // "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+      "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
      "cmd-shift-o": "file_finder::Toggle",
      "cmd-shift-a": "command_palette::Toggle",
      "shift shift": "command_palette::Toggle",
@@ -109,21 +108,6 @@
      "cmd-7": "outline_panel::ToggleFocus"
    }
  },
-  {
-    "context": "Pane", // this is to override the default Pane mappings to switch tabs
-    "bindings": {
-      "cmd-1": "project_panel::ToggleFocus",
-      "cmd-2": null, // Bookmarks (left dock)
-      "cmd-3": null, // Find Panel (bottom dock)
-      "cmd-4": null, // Run Panel (bottom dock)
-      "cmd-5": "debug_panel::ToggleFocus",
-      "cmd-6": "diagnostics::Deploy",
-      "cmd-7": "outline_panel::ToggleFocus",
-      "cmd-8": null, // Services (bottom dock)
-      "cmd-9": null, // Git History (bottom dock)
-      "cmd-0": "git_panel::ToggleFocus"
-    }
-  },
  {
    "context": "Workspace || Editor",
    "bindings": {
@@ -162,15 +146,11 @@
    }
  },
  { "context": "GitPanel", "bindings": { "cmd-0": "workspace::CloseActiveDock" } },
-  { "context": "ProjectPanel", "bindings": { "cmd-1": "workspace::CloseActiveDock" } },
  { "context": "DebugPanel", "bindings": { "cmd-5": "workspace::CloseActiveDock" } },
  { "context": "Diagnostics > Editor", "bindings": { "cmd-6": "pane::CloseActiveItem" } },
  { "context": "OutlinePanel", "bindings": { "cmd-7": "workspace::CloseActiveDock" } },
  {
    "context": "Dock || Workspace || Terminal || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
-    "bindings": {
-      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock"
-    }
+    "bindings": { "escape": "editor::ToggleFocus" }
  }
 ]
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1877,25 +1877,5 @@
    "save_breakpoints": true,
    "dock": "bottom",
    "button": true
-  },
-  // Configures any number of settings profiles that are temporarily applied on
-  // top of your existing user settings when selected from
-  // `settings profile selector: toggle`.
-  // Examples:
-  // "profiles": {
-  //   "Presenting": {
-  //     "agent_font_size": 20.0,
-  //     "buffer_font_size": 20.0,
-  //     "theme": "One Light",
-  //     "ui_font_size": 20.0
-  //   },
-  //   "Python (ty)": {
-  //     "languages": {
-  //       "Python": {
-  //         "language_servers": ["ty"]
-  //       }
-  //     }
-  //   }
-  // }
-  "profiles": []
+  }
 }
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -166,7 +166,6 @@ pub struct ToolCall {
    pub content: Vec<ToolCallContent>,
    pub status: ToolCallStatus,
    pub locations: Vec<acp::ToolCallLocation>,
-    pub raw_input: Option<serde_json::Value>,
 }

 impl ToolCall {
@@ -194,50 +193,6 @@ impl ToolCall {
                .collect(),
            locations: tool_call.locations,
            status,
-            raw_input: tool_call.raw_input,
-        }
-    }
-
-    fn update(
-        &mut self,
-        fields: acp::ToolCallUpdateFields,
-        language_registry: Arc<LanguageRegistry>,
-        cx: &mut App,
-    ) {
-        let acp::ToolCallUpdateFields {
-            kind,
-            status,
-            label,
-            content,
-            locations,
-            raw_input,
-        } = fields;
-
-        if let Some(kind) = kind {
-            self.kind = kind;
-        }
-
-        if let Some(status) = status {
-            self.status = ToolCallStatus::Allowed { status };
-        }
-
-        if let Some(label) = label {
-            self.label = cx.new(|cx| Markdown::new_text(label.into(), cx));
-        }
-
-        if let Some(content) = content {
-            self.content = content
-                .into_iter()
-                .map(|chunk| ToolCallContent::from_acp(chunk, language_registry.clone(), cx))
-                .collect();
-        }
-
-        if let Some(locations) = locations {
-            self.locations = locations;
-        }
-
-        if let Some(raw_input) = raw_input {
-            self.raw_input = Some(raw_input);
        }
    }

@@ -283,7 +238,6 @@ impl Display for ToolCallStatus {
            match self {
                ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
                ToolCallStatus::Allowed { status } => match status {
-                    acp::ToolCallStatus::Pending => "Pending",
                    acp::ToolCallStatus::InProgress => "In Progress",
                    acp::ToolCallStatus::Completed => "Completed",
                    acp::ToolCallStatus::Failed => "Failed",
@@ -391,7 +345,7 @@ impl ToolCallContent {
        cx: &mut App,
    ) -> Self {
        match content {
-            acp::ToolCallContent::ContentBlock(content) => Self::ContentBlock {
+            acp::ToolCallContent::ContentBlock { content } => Self::ContentBlock {
                content: ContentBlock::new(content, &language_registry, cx),
            },
            acp::ToolCallContent::Diff { diff } => Self::Diff {
@@ -580,9 +534,6 @@ pub struct AcpThread {
 pub enum AcpThreadEvent {
    NewEntry,
    EntryUpdated(usize),
-    ToolAuthorizationRequired,
-    Stopped,
-    Error,
 }

 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -679,62 +630,12 @@ impl AcpThread {
        false
    }

-    pub fn used_tools_since_last_user_message(&self) -> bool {
-        for entry in self.entries.iter().rev() {
-            match entry {
-                AgentThreadEntry::UserMessage(..) => return false,
-                AgentThreadEntry::AssistantMessage(..) => continue,
-                AgentThreadEntry::ToolCall(..) => return true,
-            }
-        }
-
-        false
+    pub fn push_entry(&mut self, entry: AgentThreadEntry, cx: &mut Context<Self>) {
+        self.entries.push(entry);
+        cx.emit(AcpThreadEvent::NewEntry);
    }

-    pub fn handle_session_update(
-        &mut self,
-        update: acp::SessionUpdate,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        match update {
-            acp::SessionUpdate::UserMessage(content_block) => {
-                self.push_user_content_block(content_block, cx);
-            }
-            acp::SessionUpdate::AgentMessageChunk(content_block) => {
-                self.push_assistant_content_block(content_block, false, cx);
-            }
-            acp::SessionUpdate::AgentThoughtChunk(content_block) => {
-                self.push_assistant_content_block(content_block, true, cx);
-            }
-            acp::SessionUpdate::ToolCall(tool_call) => {
-                self.upsert_tool_call(tool_call, cx);
-            }
-            acp::SessionUpdate::ToolCallUpdate(tool_call_update) => {
-                self.update_tool_call(tool_call_update, cx)?;
-            }
-            acp::SessionUpdate::Plan(plan) => {
-                self.update_plan(plan, cx);
-            }
-        }
-        Ok(())
-    }
-
-    pub fn push_user_content_block(&mut self, chunk: acp::ContentBlock, cx: &mut Context<Self>) {
-        let language_registry = self.project.read(cx).languages().clone();
-        let entries_len = self.entries.len();
-
-        if let Some(last_entry) = self.entries.last_mut()
-            && let AgentThreadEntry::UserMessage(UserMessage { content }) = last_entry
-        {
-            content.append(chunk, &language_registry, cx);
-            cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1));
-        } else {
-            let content = ContentBlock::new(chunk, &language_registry, cx);
-            self.push_entry(AgentThreadEntry::UserMessage(UserMessage { content }), cx);
-        }
-    }
-
-    pub fn push_assistant_content_block(
+    pub fn push_assistant_chunk(
        &mut self,
        chunk: acp::ContentBlock,
        is_thought: bool,
@@ -777,22 +678,23 @@ impl AcpThread {
        }
    }

-    fn push_entry(&mut self, entry: AgentThreadEntry, cx: &mut Context<Self>) {
-        self.entries.push(entry);
-        cx.emit(AcpThreadEvent::NewEntry);
-    }
-
    pub fn update_tool_call(
        &mut self,
-        update: acp::ToolCallUpdate,
+        id: acp::ToolCallId,
+        status: acp::ToolCallStatus,
+        content: Option<Vec<acp::ToolCallContent>>,
        cx: &mut Context<Self>,
    ) -> Result<()> {
        let languages = self.project.read(cx).languages().clone();
+        let (ix, current_call) = self.tool_call_mut(&id).context("Tool call not found")?;

-        let (ix, current_call) = self
-            .tool_call_mut(&update.id)
-            .context("Tool call not found")?;
-        current_call.update(update.fields, languages, cx);
+        if let Some(content) = content {
+            current_call.content = content
+                .into_iter()
+                .map(|chunk| ToolCallContent::from_acp(chunk, languages.clone(), cx))
+                .collect();
+        }
+        current_call.status = ToolCallStatus::Allowed { status };

        cx.emit(AcpThreadEvent::EntryUpdated(ix));

@@ -849,37 +751,6 @@ impl AcpThread {
            })
    }

-    pub fn set_project_location(&self, location: acp::ToolCallLocation, cx: &mut Context<Self>) {
-        self.project.update(cx, |project, cx| {
-            let Some(path) = project.project_path_for_absolute_path(&location.path, cx) else {
-                return;
-            };
-            let buffer = project.open_buffer(path, cx);
-            cx.spawn(async move |project, cx| {
-                let buffer = buffer.await?;
-
-                project.update(cx, |project, cx| {
-                    let position = if let Some(line) = location.line {
-                        let snapshot = buffer.read(cx).snapshot();
-                        let point = snapshot.clip_point(Point::new(line, 0), Bias::Left);
-                        snapshot.anchor_before(point)
-                    } else {
-                        Anchor::MIN
-                    };
-
-                    project.set_agent_location(
-                        Some(AgentLocation {
-                            buffer: buffer.downgrade(),
-                            position,
-                        }),
-                        cx,
-                    );
-                })
-            })
-            .detach_and_log_err(cx);
-        });
-    }
-
    pub fn request_tool_call_permission(
        &mut self,
        tool_call: acp::ToolCall,
@@ -894,7 +765,6 @@ impl AcpThread {
        };

        self.upsert_tool_call_inner(tool_call, status, cx);
-        cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
        rx
    }

@@ -931,25 +801,6 @@ impl AcpThread {
        cx.emit(AcpThreadEvent::EntryUpdated(ix));
    }

-    /// Returns true if the last turn is awaiting tool authorization
-    pub fn waiting_for_tool_confirmation(&self) -> bool {
-        for entry in self.entries.iter().rev() {
-            match &entry {
-                AgentThreadEntry::ToolCall(call) => match call.status {
-                    ToolCallStatus::WaitingForConfirmation { .. } => return true,
-                    ToolCallStatus::Allowed { .. }
-                    | ToolCallStatus::Rejected
-                    | ToolCallStatus::Canceled => continue,
-                },
-                AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
-                    // Reached the beginning of the turn
-                    return false;
-                }
-            }
-        }
-        false
-    }
-
    pub fn plan(&self) -> &Plan {
        &self.plan
    }
@@ -973,6 +824,56 @@ impl AcpThread {
        cx.notify();
    }

+    pub fn set_project_location(&self, location: acp::ToolCallLocation, cx: &mut Context<Self>) {
+        self.project.update(cx, |project, cx| {
+            let Some(path) = project.project_path_for_absolute_path(&location.path, cx) else {
+                return;
+            };
+            let buffer = project.open_buffer(path, cx);
+            cx.spawn(async move |project, cx| {
+                let buffer = buffer.await?;
+
+                project.update(cx, |project, cx| {
+                    let position = if let Some(line) = location.line {
+                        let snapshot = buffer.read(cx).snapshot();
+                        let point = snapshot.clip_point(Point::new(line, 0), Bias::Left);
+                        snapshot.anchor_before(point)
+                    } else {
+                        Anchor::MIN
+                    };
+
+                    project.set_agent_location(
+                        Some(AgentLocation {
+                            buffer: buffer.downgrade(),
+                            position,
+                        }),
+                        cx,
+                    );
+                })
+            })
+            .detach_and_log_err(cx);
+        });
+    }
+
+    /// Returns true if the last turn is awaiting tool authorization
+    pub fn waiting_for_tool_confirmation(&self) -> bool {
+        for entry in self.entries.iter().rev() {
+            match &entry {
+                AgentThreadEntry::ToolCall(call) => match call.status {
+                    ToolCallStatus::WaitingForConfirmation { .. } => return true,
+                    ToolCallStatus::Allowed { .. }
+                    | ToolCallStatus::Rejected
+                    | ToolCallStatus::Canceled => continue,
+                },
+                AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
+                    // Reached the beginning of the turn
+                    return false;
+                }
+            }
+        }
+        false
+    }
+
    pub fn authenticate(&self, cx: &mut App) -> impl use<> + Future<Output = Result<()>> {
        self.connection.authenticate(cx)
    }
@@ -1018,7 +919,7 @@ impl AcpThread {
                let result = this
                    .update(cx, |this, cx| {
                        this.connection.prompt(
-                            acp::PromptArguments {
+                            acp::PromptToolArguments {
                                prompt: message,
                                session_id: this.session_id.clone(),
                            },
@@ -1034,18 +935,12 @@ impl AcpThread {
            .log_err();
        }));

-        cx.spawn(async move |this, cx| match rx.await {
-            Ok(Err(e)) => {
-                this.update(cx, |_, cx| cx.emit(AcpThreadEvent::Error))
-                    .log_err();
-                Err(e)?
+        async move {
+            match rx.await {
+                Ok(Err(e)) => Err(e)?,
+                _ => Ok(()),
            }
-            _ => {
-                this.update(cx, |_, cx| cx.emit(AcpThreadEvent::Stopped))
-                    .log_err();
-                Ok(())
-            }
-        })
+        }
        .boxed()
    }

@@ -1253,87 +1148,7 @@ mod tests {
    }

    #[gpui::test]
-    async fn test_push_user_content_block(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (thread, _fake_server) = fake_acp_thread(project, cx);
-
-        // Test creating a new user message
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(
-                acp::ContentBlock::Text(acp::TextContent {
-                    annotations: None,
-                    text: "Hello, ".to_string(),
-                }),
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 1);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
-            } else {
-                panic!("Expected UserMessage");
-            }
-        });
-
-        // Test appending to existing user message
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(
-                acp::ContentBlock::Text(acp::TextContent {
-                    annotations: None,
-                    text: "world!".to_string(),
-                }),
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 1);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
-            } else {
-                panic!("Expected UserMessage");
-            }
-        });
-
-        // Test creating new user message after assistant message
-        thread.update(cx, |thread, cx| {
-            thread.push_assistant_content_block(
-                acp::ContentBlock::Text(acp::TextContent {
-                    annotations: None,
-                    text: "Assistant response".to_string(),
-                }),
-                false,
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(
-                acp::ContentBlock::Text(acp::TextContent {
-                    annotations: None,
-                    text: "New user message".to_string(),
-                }),
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 3);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
-                assert_eq!(user_msg.content.to_markdown(cx), "New user message");
-            } else {
-                panic!("Expected UserMessage at index 2");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_thinking_concatenation(cx: &mut gpui::TestAppContext) {
+    async fn test_thinking_concatenation(cx: &mut TestAppContext) {
        init_test(cx);

        let fs = FakeFs::new(cx.executor());
@@ -1619,7 +1434,6 @@ mod tests {
                name: "test",
                connection,
                child_status: io_task,
-                current_thread: thread_rc,
            };

            AcpThread::new(
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -20,7 +20,7 @@ pub trait AgentConnection {

    fn authenticate(&self, cx: &mut App) -> Task<Result<()>>;

-    fn prompt(&self, params: acp::PromptArguments, cx: &mut App) -> Task<Result<()>>;
+    fn prompt(&self, params: acp::PromptToolArguments, cx: &mut App) -> Task<Result<()>>;

    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
 }
--- a/crates/acp_thread/src/old_acp_support.rs
+++ b/crates/acp_thread/src/old_acp_support.rs
@@ -1,4 +1,4 @@
-// Translates old acp agents into the new schema
+///! Translates old acp agents into the new schema
 use agent_client_protocol as acp;
 use agentic_coding_protocol::{self as acp_old, AgentRequest as _};
 use anyhow::{Context as _, Result};
@@ -7,9 +7,8 @@ use gpui::{AppContext as _, AsyncApp, Entity, Task, WeakEntity};
 use project::Project;
 use std::{cell::RefCell, error::Error, fmt, path::Path, rc::Rc};
 use ui::App;
-use util::ResultExt as _;

-use crate::{AcpThread, AgentConnection};
+use crate::{AcpThread, AcpThreadEvent, AgentConnection, ToolCallContent, ToolCallStatus};

 #[derive(Clone)]
 pub struct OldAcpClientDelegate {
@@ -41,13 +40,13 @@ impl acp_old::Client for OldAcpClientDelegate {
                .borrow()
                .update(cx, |thread, cx| match params.chunk {
                    acp_old::AssistantMessageChunk::Text { text } => {
-                        thread.push_assistant_content_block(text.into(), false, cx)
+                        thread.push_assistant_chunk(text.into(), false, cx)
                    }
                    acp_old::AssistantMessageChunk::Thought { thought } => {
-                        thread.push_assistant_content_block(thought.into(), true, cx)
+                        thread.push_assistant_chunk(thought.into(), true, cx)
                    }
                })
-                .log_err();
+                .ok();
        })?;

        Ok(())
@@ -183,23 +182,31 @@ impl acp_old::Client for OldAcpClientDelegate {

        cx.update(|cx| {
            self.thread.borrow().update(cx, |thread, cx| {
-                thread.update_tool_call(
-                    acp::ToolCallUpdate {
-                        id: acp::ToolCallId(request.tool_call_id.0.to_string().into()),
-                        fields: acp::ToolCallUpdateFields {
-                            status: Some(into_new_tool_call_status(request.status)),
-                            content: Some(
-                                request
-                                    .content
-                                    .into_iter()
-                                    .map(into_new_tool_call_content)
-                                    .collect::<Vec<_>>(),
-                            ),
-                            ..Default::default()
-                        },
-                    },
-                    cx,
-                )
+                let languages = thread.project.read(cx).languages().clone();
+
+                if let Some((ix, tool_call)) = thread
+                    .tool_call_mut(&acp::ToolCallId(request.tool_call_id.0.to_string().into()))
+                {
+                    tool_call.status = ToolCallStatus::Allowed {
+                        status: into_new_tool_call_status(request.status),
+                    };
+                    tool_call.content = request
+                        .content
+                        .into_iter()
+                        .map(|content| {
+                            ToolCallContent::from_acp(
+                                into_new_tool_call_content(content),
+                                languages.clone(),
+                                cx,
+                            )
+                        })
+                        .collect();
+
+                    cx.emit(AcpThreadEvent::EntryUpdated(ix));
+                    anyhow::Ok(())
+                } else {
+                    anyhow::bail!("Tool call not found")
+                }
            })
        })?
        .context("Failed to update thread")??;
@@ -278,7 +285,6 @@ fn into_new_tool_call(id: acp::ToolCallId, request: acp_old::PushToolCallParams)
            .into_iter()
            .map(into_new_tool_call_location)
            .collect(),
-        raw_input: None,
    }
 }

@@ -305,7 +311,12 @@ fn into_new_tool_call_status(status: acp_old::ToolCallStatus) -> acp::ToolCallSt

 fn into_new_tool_call_content(content: acp_old::ToolCallContent) -> acp::ToolCallContent {
    match content {
-        acp_old::ToolCallContent::Markdown { markdown } => markdown.into(),
+        acp_old::ToolCallContent::Markdown { markdown } => acp::ToolCallContent::ContentBlock {
+            content: acp::ContentBlock::Text(acp::TextContent {
+                annotations: None,
+                text: markdown,
+            }),
+        },
        acp_old::ToolCallContent::Diff { diff } => acp::ToolCallContent::Diff {
            diff: into_new_diff(diff),
        },
@@ -365,7 +376,6 @@ pub struct OldAcpAgentConnection {
    pub name: &'static str,
    pub connection: acp_old::AgentConnection,
    pub child_status: Task<Result<()>>,
-    pub current_thread: Rc<RefCell<WeakEntity<AcpThread>>>,
 }

 impl AgentConnection for OldAcpAgentConnection {
@@ -385,7 +395,6 @@ impl AgentConnection for OldAcpAgentConnection {
            }
            .into_any(),
        );
-        let current_thread = self.current_thread.clone();
        cx.spawn(async move |cx| {
            let result = task.await?;
            let result = acp_old::InitializeParams::response_from_any(result)?;
@@ -399,7 +408,6 @@ impl AgentConnection for OldAcpAgentConnection {
                    let session_id = acp::SessionId("acp-old-no-id".into());
                    AcpThread::new(self.clone(), project, session_id, cx)
                });
-                current_thread.replace(thread.downgrade());
                thread
            })
        })
@@ -415,7 +423,7 @@ impl AgentConnection for OldAcpAgentConnection {
        })
    }

-    fn prompt(&self, params: acp::PromptArguments, cx: &mut App) -> Task<Result<()>> {
+    fn prompt(&self, params: acp::PromptToolArguments, cx: &mut App) -> Task<Result<()>> {
        let chunks = params
            .prompt
            .into_iter()
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -25,7 +25,6 @@ assistant_context.workspace = true
 assistant_tool.workspace = true
 chrono.workspace = true
 client.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 component.workspace = true
 context_server.workspace = true
@@ -36,9 +35,9 @@ futures.workspace = true
 git.workspace = true
 gpui.workspace = true
 heed.workspace = true
-http_client.workspace = true
 icons.workspace = true
 indoc.workspace = true
+http_client.workspace = true
 itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
@@ -47,6 +46,7 @@ paths.workspace = true
 postage.workspace = true
 project.workspace = true
 prompt_store.workspace = true
+proto.workspace = true
 ref-cast.workspace = true
 rope.workspace = true
 schemars.workspace = true
@@ -63,6 +63,7 @@ time.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
+zed_llm_client.workspace = true
 zstd.workspace = true

 [dev-dependencies]
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -308,12 +308,7 @@ mod tests {
            unimplemented!()
        }

-        fn needs_confirmation(
-            &self,
-            _input: &serde_json::Value,
-            _project: &Entity<Project>,
-            _cx: &App,
-        ) -> bool {
+        fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
            unimplemented!()
        }

--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -47,7 +47,7 @@ impl Tool for ContextServerTool {
        }
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        true
    }

--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -13,7 +13,6 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use client::{ModelRequestUsage, RequestUsage};
-use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, Plan, UsageLimit};
 use collections::HashMap;
 use feature_flags::{self, FeatureFlagAppExt};
 use futures::{FutureExt, StreamExt as _, future::Shared};
@@ -37,6 +36,7 @@ use project::{
    git_store::{GitStore, GitStoreCheckpoint, RepositoryState},
 };
 use prompt_store::{ModelContext, PromptBuilder};
+use proto::Plan;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -49,6 +49,7 @@ use std::{
 use thiserror::Error;
 use util::{ResultExt as _, post_inc};
 use uuid::Uuid;
+use zed_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};

 const MAX_RETRY_ATTEMPTS: u8 = 4;
 const BASE_RETRY_DELAY: Duration = Duration::from_secs(5);
@@ -941,7 +942,7 @@ impl Thread {
    }

    pub fn tool_uses_for_message(&self, id: MessageId, cx: &App) -> Vec<ToolUse> {
-        self.tool_use.tool_uses_for_message(id, &self.project, cx)
+        self.tool_use.tool_uses_for_message(id, cx)
    }

    pub fn tool_results_for_message(
@@ -1680,7 +1681,7 @@ impl Thread {

        let completion_mode = request
            .mode
-            .unwrap_or(cloud_llm_client::CompletionMode::Normal);
+            .unwrap_or(zed_llm_client::CompletionMode::Normal);

        self.last_received_chunk_at = Some(Instant::now());

@@ -2036,12 +2037,6 @@ impl Thread {
                                        if let Some(retry_strategy) =
                                            Thread::get_retry_strategy(completion_error)
                                        {
-                                            log::info!(
-                                                "Retrying with {:?} for language model completion error {:?}",
-                                                retry_strategy,
-                                                completion_error
-                                            );
-
                                            retry_scheduled = thread
                                                .handle_retryable_error_with_delay(
                                                    &completion_error,
@@ -2251,14 +2246,15 @@ impl Thread {
                ..
            }
            | AuthenticationError { .. }
-            | PermissionError { .. }
-            | NoApiKey { .. }
-            | ApiEndpointNotFound { .. }
-            | PromptTooLarge { .. } => None,
+            | PermissionError { .. } => None,
            // These errors might be transient, so retry them
-            SerializeRequest { .. } | BuildRequestBody { .. } => Some(RetryStrategy::Fixed {
+            SerializeRequest { .. }
+            | BuildRequestBody { .. }
+            | PromptTooLarge { .. }
+            | ApiEndpointNotFound { .. }
+            | NoApiKey { .. } => Some(RetryStrategy::Fixed {
                delay: BASE_RETRY_DELAY,
-                max_attempts: 1,
+                max_attempts: 2,
            }),
            // Retry all other 4xx and 5xx errors once.
            HttpResponseError { status_code, .. }
@@ -2556,7 +2552,7 @@ impl Thread {
            return self.handle_hallucinated_tool_use(tool_use.id, tool_use.name, window, cx);
        }

-        if tool.needs_confirmation(&tool_use.input, &self.project, cx)
+        if tool.needs_confirmation(&tool_use.input, cx)
            && !AgentSettings::get_global(cx).always_allow_tool_actions
        {
            self.tool_use.confirm_tool_use(
@@ -3254,10 +3250,8 @@ impl Thread {
    }

    fn update_model_request_usage(&self, amount: u32, limit: UsageLimit, cx: &mut Context<Self>) {
-        self.project
-            .read(cx)
-            .user_store()
-            .update(cx, |user_store, cx| {
+        self.project.update(cx, |project, cx| {
+            project.user_store().update(cx, |user_store, cx| {
                user_store.update_model_request_usage(
                    ModelRequestUsage(RequestUsage {
                        amount: amount as i32,
@@ -3265,7 +3259,8 @@ impl Thread {
                    }),
                    cx,
                )
-            });
+            })
+        });
    }

    pub fn deny_tool_use(
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -41,9 +41,6 @@ use std::{
 };
 use util::ResultExt as _;

-pub static ZED_STATELESS: std::sync::LazyLock<bool> =
-    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
    #[serde(rename = "json")]
@@ -877,11 +874,7 @@ impl ThreadsDatabase {

        let needs_migration_from_heed = mdb_path.exists();

-        let connection = if *ZED_STATELESS {
-            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
-        } else {
-            Connection::open_file(&sqlite_path.to_string_lossy())
-        };
+        let connection = Connection::open_file(&sqlite_path.to_string_lossy());

        connection.exec(indoc! {"
                CREATE TABLE IF NOT EXISTS threads (
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -165,12 +165,7 @@ impl ToolUseState {
        self.pending_tool_uses_by_id.values().collect()
    }

-    pub fn tool_uses_for_message(
-        &self,
-        id: MessageId,
-        project: &Entity<Project>,
-        cx: &App,
-    ) -> Vec<ToolUse> {
+    pub fn tool_uses_for_message(&self, id: MessageId, cx: &App) -> Vec<ToolUse> {
        let Some(tool_uses_for_message) = &self.tool_uses_by_assistant_message.get(&id) else {
            return Vec::new();
        };
@@ -216,10 +211,7 @@ impl ToolUseState {

            let (icon, needs_confirmation) =
                if let Some(tool) = self.tools.read(cx).tool(&tool_use.name, cx) {
-                    (
-                        tool.icon(),
-                        tool.needs_confirmation(&tool_use.input, project, cx),
-                    )
+                    (tool.icon(), tool.needs_confirmation(&tool_use.input, cx))
                } else {
                    (IconName::Cog, false)
                };
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -29,7 +29,6 @@ itertools.workspace = true
 log.workspace = true
 paths.workspace = true
 project.workspace = true
-rand.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -41,7 +40,6 @@ ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
-indoc.workspace = true
 which.workspace = true
 workspace-hack.workspace = true

--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -1,14 +1,11 @@
 mod claude;
-mod codex;
 mod gemini;
-mod mcp_server;
 mod settings;

 #[cfg(test)]
 mod e2e_tests;

 pub use claude::*;
-pub use codex::*;
 pub use gemini::*;
 pub use settings::*;

--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -2,13 +2,13 @@ mod mcp_server;
 pub mod tools;

 use collections::HashMap;
-use context_server::listener::McpServerTool;
 use project::Project;
 use settings::SettingsStore;
 use smol::process::Child;
 use std::cell::RefCell;
 use std::fmt::Display;
 use std::path::Path;
+use std::pin::pin;
 use std::rc::Rc;
 use uuid::Uuid;

@@ -44,7 +44,7 @@ impl AgentServer for ClaudeCode {
    }

    fn empty_state_message(&self) -> &'static str {
-        "How can I help you today?"
+        ""
    }

    fn logo(&self) -> ui::IconName {
@@ -65,6 +65,19 @@ impl AgentServer for ClaudeCode {
    }
 }

+#[cfg(unix)]
+fn send_interrupt(pid: libc::pid_t) -> anyhow::Result<()> {
+    let pid = nix::unistd::Pid::from_raw(pid);
+
+    nix::sys::signal::kill(pid, nix::sys::signal::SIGINT)
+        .map_err(|e| anyhow!("Failed to interrupt process: {}", e))
+}
+
+#[cfg(windows)]
+fn send_interrupt(_pid: i32) -> anyhow::Result<()> {
+    panic!("Cancel not implemented on Windows")
+}
+
 struct ClaudeAgentConnection {
    sessions: Rc<RefCell<HashMap<acp::SessionId, ClaudeAgentSession>>>,
 }
@@ -113,6 +126,7 @@ impl AgentConnection for ClaudeAgentConnection {

            let (incoming_message_tx, mut incoming_message_rx) = mpsc::unbounded();
            let (outgoing_tx, outgoing_rx) = mpsc::unbounded();
+            let (cancel_tx, mut cancel_rx) = mpsc::unbounded::<oneshot::Sender<Result<()>>>();

            let session_id = acp::SessionId(Uuid::new_v4().to_string().into());

@@ -122,28 +136,50 @@ impl AgentConnection for ClaudeAgentConnection {
                let session_id = session_id.clone();
                async move {
                    let mut outgoing_rx = Some(outgoing_rx);
+                    let mut mode = ClaudeSessionMode::Start;

-                    let mut child = spawn_claude(
-                        &command,
-                        ClaudeSessionMode::Start,
-                        session_id.clone(),
-                        &mcp_config_path,
-                        &cwd,
-                    )
-                    .await?;
+                    loop {
+                        let mut child = spawn_claude(
+                            &command,
+                            mode,
+                            session_id.clone(),
+                            &mcp_config_path,
+                            &cwd,
+                        )
+                        .await?;
+                        mode = ClaudeSessionMode::Resume;

-                    let pid = child.id();
-                    log::trace!("Spawned (pid: {})", pid);
+                        let pid = child.id();
+                        log::trace!("Spawned (pid: {})", pid);

-                    ClaudeAgentSession::handle_io(
-                        outgoing_rx.take().unwrap(),
-                        incoming_message_tx.clone(),
-                        child.stdin.take().unwrap(),
-                        child.stdout.take().unwrap(),
-                    )
-                    .await?;
+                        let mut io_fut = pin!(
+                            ClaudeAgentSession::handle_io(
+                                outgoing_rx.take().unwrap(),
+                                incoming_message_tx.clone(),
+                                child.stdin.take().unwrap(),
+                                child.stdout.take().unwrap(),
+                            )
+                            .fuse()
+                        );

-                    log::trace!("Stopped (pid: {})", pid);
+                        select_biased! {
+                            done_tx = cancel_rx.next() => {
+                                if let Some(done_tx) = done_tx {
+                                    log::trace!("Interrupted (pid: {})", pid);
+                                    let result = send_interrupt(pid as i32);
+                                    outgoing_rx.replace(io_fut.await?);
+                                    done_tx.send(result).log_err();
+                                    continue;
+                                }
+                            }
+                            result = io_fut => {
+                                result?;
+                            }
+                        }
+
+                        log::trace!("Stopped (pid: {})", pid);
+                        break;
+                    }

                    drop(mcp_config_path);
                    anyhow::Ok(())
@@ -176,6 +212,7 @@ impl AgentConnection for ClaudeAgentConnection {
            let session = ClaudeAgentSession {
                outgoing_tx,
                end_turn_tx,
+                cancel_tx,
                _handler_task: handler_task,
                _mcp_server: Some(permission_mcp_server),
            };
@@ -190,7 +227,7 @@ impl AgentConnection for ClaudeAgentConnection {
        Task::ready(Err(anyhow!("Authentication not supported")))
    }

-    fn prompt(&self, params: acp::PromptArguments, cx: &mut App) -> Task<Result<()>> {
+    fn prompt(&self, params: acp::PromptToolArguments, cx: &mut App) -> Task<Result<()>> {
        let sessions = self.sessions.borrow();
        let Some(session) = sessions.get(&params.session_id) else {
            return Task::ready(Err(anyhow!(
@@ -240,24 +277,37 @@ impl AgentConnection for ClaudeAgentConnection {
        })
    }

-    fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
+    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
        let sessions = self.sessions.borrow();
        let Some(session) = sessions.get(&session_id) else {
            log::warn!("Attempted to cancel nonexistent session {}", session_id);
            return;
        };

-        session
-            .outgoing_tx
-            .unbounded_send(SdkMessage::new_interrupt_message())
-            .log_err();
+        let (done_tx, done_rx) = oneshot::channel();
+        if session
+            .cancel_tx
+            .unbounded_send(done_tx)
+            .log_err()
+            .is_some()
+        {
+            let end_turn_tx = session.end_turn_tx.clone();
+            cx.foreground_executor()
+                .spawn(async move {
+                    done_rx.await??;
+                    if let Some(end_turn_tx) = end_turn_tx.take() {
+                        end_turn_tx.send(Ok(())).ok();
+                    }
+                    anyhow::Ok(())
+                })
+                .detach_and_log_err(cx);
+        }
    }
 }

 #[derive(Clone, Copy)]
 enum ClaudeSessionMode {
    Start,
-    #[expect(dead_code)]
    Resume,
 }

@@ -282,16 +332,10 @@ async fn spawn_claude(
            &format!(
                "mcp__{}__{}",
                mcp_server::SERVER_NAME,
-                mcp_server::PermissionTool::NAME,
+                mcp_server::PERMISSION_TOOL
            ),
            "--allowedTools",
-            &format!(
-                "mcp__{}__{},mcp__{}__{}",
-                mcp_server::SERVER_NAME,
-                mcp_server::EditTool::NAME,
-                mcp_server::SERVER_NAME,
-                mcp_server::ReadTool::NAME
-            ),
+            "mcp__zed__Read,mcp__zed__Edit",
            "--disallowedTools",
            "Read,Edit",
        ])
@@ -313,6 +357,7 @@ async fn spawn_claude(
 struct ClaudeAgentSession {
    outgoing_tx: UnboundedSender<SdkMessage>,
    end_turn_tx: Rc<RefCell<Option<oneshot::Sender<Result<()>>>>>,
+    cancel_tx: UnboundedSender<oneshot::Sender<Result<()>>>,
    _mcp_server: Option<ClaudeZedMcpServer>,
    _handler_task: Task<()>,
 }
@@ -325,8 +370,6 @@ impl ClaudeAgentSession {
        cx: &mut AsyncApp,
    ) {
        match message {
-            // we should only be sending these out, they don't need to be in the thread
-            SdkMessage::ControlRequest { .. } => {}
            SdkMessage::Assistant {
                message,
                session_id: _,
@@ -350,7 +393,7 @@ impl ClaudeAgentSession {
                        ContentChunk::Text { text } | ContentChunk::UntaggedText(text) => {
                            thread
                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), false, cx)
+                                    thread.push_assistant_chunk(text.into(), false, cx)
                                })
                                .log_err();
                        }
@@ -387,15 +430,9 @@ impl ClaudeAgentSession {
                            thread
                                .update(cx, |thread, cx| {
                                    thread.update_tool_call(
-                                        acp::ToolCallUpdate {
-                                            id: acp::ToolCallId(tool_use_id.into()),
-                                            fields: acp::ToolCallUpdateFields {
-                                                status: Some(acp::ToolCallStatus::Completed),
-                                                content: (!content.is_empty())
-                                                    .then(|| vec![content.into()]),
-                                                ..Default::default()
-                                            },
-                                        },
+                                        acp::ToolCallId(tool_use_id.into()),
+                                        acp::ToolCallStatus::Completed,
+                                        (!content.is_empty()).then(|| vec![content.into()]),
                                        cx,
                                    )
                                })
@@ -408,7 +445,7 @@ impl ClaudeAgentSession {
                        | ContentChunk::WebSearchToolResult => {
                            thread
                                .update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(
+                                    thread.push_assistant_chunk(
                                        format!("Unsupported content: {:?}", chunk).into(),
                                        false,
                                        cx,
@@ -420,25 +457,17 @@ impl ClaudeAgentSession {
                }
            }
            SdkMessage::Result {
-                is_error,
-                subtype,
-                result,
-                ..
+                is_error, subtype, ..
            } => {
                if let Some(end_turn_tx) = end_turn_tx.borrow_mut().take() {
                    if is_error {
-                        end_turn_tx
-                            .send(Err(anyhow!(
-                                "Error: {}",
-                                result.unwrap_or_else(|| subtype.to_string())
-                            )))
-                            .ok();
+                        end_turn_tx.send(Err(anyhow!("Error: {subtype}"))).ok();
                    } else {
                        end_turn_tx.send(Ok(())).ok();
                    }
                }
            }
-            SdkMessage::System { .. } | SdkMessage::ControlResponse { .. } => {}
+            SdkMessage::System { .. } => {}
        }
    }

@@ -607,12 +636,14 @@ enum SdkMessage {
        #[serde(skip_serializing_if = "Option::is_none")]
        session_id: Option<String>,
    },
+
    // A user message
    User {
        message: Message, // from Anthropic SDK
        #[serde(skip_serializing_if = "Option::is_none")]
        session_id: Option<String>,
    },
+
    // Emitted as the last message in a conversation
    Result {
        subtype: ResultErrorType,
@@ -637,26 +668,6 @@ enum SdkMessage {
        #[serde(rename = "permissionMode")]
        permission_mode: PermissionMode,
    },
-    /// Messages used to control the conversation, outside of chat messages to the model
-    ControlRequest {
-        request_id: String,
-        request: ControlRequest,
-    },
-    /// Response to a control request
-    ControlResponse { response: ControlResponse },
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "subtype", rename_all = "snake_case")]
-enum ControlRequest {
-    /// Cancel the current conversation
-    Interrupt,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct ControlResponse {
-    request_id: String,
-    subtype: ResultErrorType,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -677,24 +688,6 @@ impl Display for ResultErrorType {
    }
 }

-impl SdkMessage {
-    fn new_interrupt_message() -> Self {
-        use rand::Rng;
-        // In the Claude Code TS SDK they just generate a random 12 character string,
-        // `Math.random().toString(36).substring(2, 15)`
-        let request_id = rand::thread_rng()
-            .sample_iter(&rand::distributions::Alphanumeric)
-            .take(12)
-            .map(char::from)
-            .collect();
-
-        Self::ControlRequest {
-            request_id,
-            request: ControlRequest::Interrupt,
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct McpServer {
    name: String,
@@ -715,7 +708,7 @@ pub(crate) mod tests {
    use super::*;
    use serde_json::json;

-    crate::common_e2e_tests!(ClaudeCode, allow_option_id = "allow");
+    crate::common_e2e_tests!(ClaudeCode);

    pub fn local_command() -> AgentServerCommand {
        AgentServerCommand {
--- a/crates/agent_servers/src/claude/mcp_server.rs
+++ b/crates/agent_servers/src/claude/mcp_server.rs
@@ -1,24 +1,49 @@
 use std::path::PathBuf;

-use crate::claude::tools::{ClaudeTool, EditToolParams, ReadToolParams};
 use acp_thread::AcpThread;
 use agent_client_protocol as acp;
 use anyhow::{Context, Result};
 use collections::HashMap;
-use context_server::listener::{McpServerTool, ToolResponse};
 use context_server::types::{
-    Implementation, InitializeParams, InitializeResponse, ProtocolVersion, ServerCapabilities,
-    ToolAnnotations, ToolResponseContent, ToolsCapabilities, requests,
+    CallToolParams, CallToolResponse, Implementation, InitializeParams, InitializeResponse,
+    ListToolsResponse, ProtocolVersion, ServerCapabilities, Tool, ToolAnnotations,
+    ToolResponseContent, ToolsCapabilities, requests,
 };
-use gpui::{App, AsyncApp, Task, WeakEntity};
+use gpui::{App, AsyncApp, Entity, Task, WeakEntity};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

+use crate::claude::tools::{ClaudeTool, EditToolParams, ReadToolParams};
+
 pub struct ClaudeZedMcpServer {
    server: context_server::listener::McpServer,
 }

 pub const SERVER_NAME: &str = "zed";
+pub const READ_TOOL: &str = "Read";
+pub const EDIT_TOOL: &str = "Edit";
+pub const PERMISSION_TOOL: &str = "Confirmation";
+
+#[derive(Deserialize, JsonSchema, Debug)]
+struct PermissionToolParams {
+    tool_name: String,
+    input: serde_json::Value,
+    tool_use_id: Option<String>,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct PermissionToolResponse {
+    behavior: PermissionToolBehavior,
+    updated_input: serde_json::Value,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "snake_case")]
+enum PermissionToolBehavior {
+    Allow,
+    Deny,
+}

 impl ClaudeZedMcpServer {
    pub async fn new(
@@ -27,28 +52,18 @@ impl ClaudeZedMcpServer {
    ) -> Result<Self> {
        let mut mcp_server = context_server::listener::McpServer::new(cx).await?;
        mcp_server.handle_request::<requests::Initialize>(Self::handle_initialize);
-
-        mcp_server.add_tool(PermissionTool {
-            thread_rx: thread_rx.clone(),
-        });
-        mcp_server.add_tool(ReadTool {
-            thread_rx: thread_rx.clone(),
-        });
-        mcp_server.add_tool(EditTool {
-            thread_rx: thread_rx.clone(),
+        mcp_server.handle_request::<requests::ListTools>(Self::handle_list_tools);
+        mcp_server.handle_request::<requests::CallTool>(move |request, cx| {
+            Self::handle_call_tool(request, thread_rx.clone(), cx)
        });

        Ok(Self { server: mcp_server })
    }

    pub fn server_config(&self) -> Result<McpServerConfig> {
-        #[cfg(not(test))]
        let zed_path = std::env::current_exe()
            .context("finding current executable path for use in mcp_server")?;

-        #[cfg(test)]
-        let zed_path = crate::e2e_tests::get_zed_path();
-
        Ok(McpServerConfig {
            command: zed_path,
            args: vec![
@@ -81,6 +96,193 @@ impl ClaudeZedMcpServer {
            })
        })
    }
+
+    fn handle_list_tools(_: (), cx: &App) -> Task<Result<ListToolsResponse>> {
+        cx.foreground_executor().spawn(async move {
+            Ok(ListToolsResponse {
+                tools: vec![
+                    Tool {
+                        name: PERMISSION_TOOL.into(),
+                        input_schema: schemars::schema_for!(PermissionToolParams).into(),
+                        description: None,
+                        annotations: None,
+                    },
+                    Tool {
+                        name: READ_TOOL.into(),
+                        input_schema: schemars::schema_for!(ReadToolParams).into(),
+                        description: Some("Read the contents of a file. In sessions with mcp__zed__Read always use it instead of Read as it contains the most up-to-date contents.".to_string()),
+                        annotations: Some(ToolAnnotations {
+                            title: Some("Read file".to_string()),
+                            read_only_hint: Some(true),
+                            destructive_hint: Some(false),
+                            open_world_hint: Some(false),
+                            // if time passes the contents might change, but it's not going to do anything different
+                            // true or false seem too strong, let's try a none.
+                            idempotent_hint: None,
+                        }),
+                    },
+                    Tool {
+                        name: EDIT_TOOL.into(),
+                        input_schema: schemars::schema_for!(EditToolParams).into(),
+                        description: Some("Edits a file. In sessions with mcp__zed__Edit always use it instead of Edit as it will show the diff to the user better.".to_string()),
+                        annotations: Some(ToolAnnotations {
+                            title: Some("Edit file".to_string()),
+                            read_only_hint: Some(false),
+                            destructive_hint: Some(false),
+                            open_world_hint: Some(false),
+                            idempotent_hint: Some(false),
+                        }),
+                    },
+                ],
+                next_cursor: None,
+                meta: None,
+            })
+        })
+    }
+
+    fn handle_call_tool(
+        request: CallToolParams,
+        mut thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
+        cx: &App,
+    ) -> Task<Result<CallToolResponse>> {
+        cx.spawn(async move |cx| {
+            let Some(thread) = thread_rx.recv().await?.upgrade() else {
+                anyhow::bail!("Thread closed");
+            };
+
+            if request.name.as_str() == PERMISSION_TOOL {
+                let input =
+                    serde_json::from_value(request.arguments.context("Arguments required")?)?;
+
+                let result = Self::handle_permissions_tool_call(input, thread, cx).await?;
+                Ok(CallToolResponse {
+                    content: vec![ToolResponseContent::Text {
+                        text: serde_json::to_string(&result)?,
+                    }],
+                    is_error: None,
+                    meta: None,
+                })
+            } else if request.name.as_str() == READ_TOOL {
+                let input =
+                    serde_json::from_value(request.arguments.context("Arguments required")?)?;
+
+                let content = Self::handle_read_tool_call(input, thread, cx).await?;
+                Ok(CallToolResponse {
+                    content,
+                    is_error: None,
+                    meta: None,
+                })
+            } else if request.name.as_str() == EDIT_TOOL {
+                let input =
+                    serde_json::from_value(request.arguments.context("Arguments required")?)?;
+
+                Self::handle_edit_tool_call(input, thread, cx).await?;
+                Ok(CallToolResponse {
+                    content: vec![],
+                    is_error: None,
+                    meta: None,
+                })
+            } else {
+                anyhow::bail!("Unsupported tool");
+            }
+        })
+    }
+
+    fn handle_read_tool_call(
+        ReadToolParams {
+            abs_path,
+            offset,
+            limit,
+        }: ReadToolParams,
+        thread: Entity<AcpThread>,
+        cx: &AsyncApp,
+    ) -> Task<Result<Vec<ToolResponseContent>>> {
+        cx.spawn(async move |cx| {
+            let content = thread
+                .update(cx, |thread, cx| {
+                    thread.read_text_file(abs_path, offset, limit, false, cx)
+                })?
+                .await?;
+
+            Ok(vec![ToolResponseContent::Text { text: content }])
+        })
+    }
+
+    fn handle_edit_tool_call(
+        params: EditToolParams,
+        thread: Entity<AcpThread>,
+        cx: &AsyncApp,
+    ) -> Task<Result<()>> {
+        cx.spawn(async move |cx| {
+            let content = thread
+                .update(cx, |threads, cx| {
+                    threads.read_text_file(params.abs_path.clone(), None, None, true, cx)
+                })?
+                .await?;
+
+            let new_content = content.replace(&params.old_text, &params.new_text);
+            if new_content == content {
+                return Err(anyhow::anyhow!("The old_text was not found in the content"));
+            }
+
+            thread
+                .update(cx, |threads, cx| {
+                    threads.write_text_file(params.abs_path, new_content, cx)
+                })?
+                .await?;
+
+            Ok(())
+        })
+    }
+
+    fn handle_permissions_tool_call(
+        params: PermissionToolParams,
+        thread: Entity<AcpThread>,
+        cx: &AsyncApp,
+    ) -> Task<Result<PermissionToolResponse>> {
+        cx.spawn(async move |cx| {
+            let claude_tool = ClaudeTool::infer(&params.tool_name, params.input.clone());
+
+            let tool_call_id =
+                acp::ToolCallId(params.tool_use_id.context("Tool ID required")?.into());
+
+            let allow_option_id = acp::PermissionOptionId("allow".into());
+            let reject_option_id = acp::PermissionOptionId("reject".into());
+
+            let chosen_option = thread
+                .update(cx, |thread, cx| {
+                    thread.request_tool_call_permission(
+                        claude_tool.as_acp(tool_call_id),
+                        vec![
+                            acp::PermissionOption {
+                                id: allow_option_id.clone(),
+                                label: "Allow".into(),
+                                kind: acp::PermissionOptionKind::AllowOnce,
+                            },
+                            acp::PermissionOption {
+                                id: reject_option_id,
+                                label: "Reject".into(),
+                                kind: acp::PermissionOptionKind::RejectOnce,
+                            },
+                        ],
+                        cx,
+                    )
+                })?
+                .await?;
+
+            if chosen_option == allow_option_id {
+                Ok(PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Allow,
+                    updated_input: params.input,
+                })
+            } else {
+                Ok(PermissionToolResponse {
+                    behavior: PermissionToolBehavior::Deny,
+                    updated_input: params.input,
+                })
+            }
+        })
+    }
 }

 #[derive(Serialize)]
@@ -97,206 +299,3 @@ pub struct McpServerConfig {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub env: Option<HashMap<String, String>>,
 }
-
-// Tools
-
-#[derive(Clone)]
-pub struct PermissionTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-#[derive(Deserialize, JsonSchema, Debug)]
-pub struct PermissionToolParams {
-    tool_name: String,
-    input: serde_json::Value,
-    tool_use_id: Option<String>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PermissionToolResponse {
-    behavior: PermissionToolBehavior,
-    updated_input: serde_json::Value,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-enum PermissionToolBehavior {
-    Allow,
-    Deny,
-}
-
-impl McpServerTool for PermissionTool {
-    type Input = PermissionToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Confirmation";
-
-    fn description(&self) -> &'static str {
-        "Request permission for tool calls"
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let claude_tool = ClaudeTool::infer(&input.tool_name, input.input.clone());
-        let tool_call_id = acp::ToolCallId(input.tool_use_id.context("Tool ID required")?.into());
-        let allow_option_id = acp::PermissionOptionId("allow".into());
-        let reject_option_id = acp::PermissionOptionId("reject".into());
-
-        let chosen_option = thread
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_permission(
-                    claude_tool.as_acp(tool_call_id),
-                    vec![
-                        acp::PermissionOption {
-                            id: allow_option_id.clone(),
-                            label: "Allow".into(),
-                            kind: acp::PermissionOptionKind::AllowOnce,
-                        },
-                        acp::PermissionOption {
-                            id: reject_option_id.clone(),
-                            label: "Reject".into(),
-                            kind: acp::PermissionOptionKind::RejectOnce,
-                        },
-                    ],
-                    cx,
-                )
-            })?
-            .await?;
-
-        let response = if chosen_option == allow_option_id {
-            PermissionToolResponse {
-                behavior: PermissionToolBehavior::Allow,
-                updated_input: input.input,
-            }
-        } else {
-            debug_assert_eq!(chosen_option, reject_option_id);
-            PermissionToolResponse {
-                behavior: PermissionToolBehavior::Deny,
-                updated_input: input.input,
-            }
-        };
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text {
-                text: serde_json::to_string(&response)?,
-            }],
-            structured_content: (),
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct ReadTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for ReadTool {
-    type Input = ReadToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Read";
-
-    fn description(&self) -> &'static str {
-        "Read the contents of a file. In sessions with mcp__zed__Read always use it instead of Read as it contains the most up-to-date contents."
-    }
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Read file".to_string()),
-            read_only_hint: Some(true),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: None,
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path, input.offset, input.limit, false, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![ToolResponseContent::Text { text: content }],
-            structured_content: (),
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct EditTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for EditTool {
-    type Input = EditToolParams;
-    type Output = ();
-
-    const NAME: &'static str = "Edit";
-
-    fn description(&self) -> &'static str {
-        "Edits a file. In sessions with mcp__zed__Edit always use it instead of Edit as it will show the diff to the user better."
-    }
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: Some("Edit file".to_string()),
-            read_only_hint: Some(false),
-            destructive_hint: Some(false),
-            open_world_hint: Some(false),
-            idempotent_hint: Some(false),
-        }
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.abs_path.clone(), None, None, true, cx)
-            })?
-            .await?;
-
-        let new_content = content.replace(&input.old_text, &input.new_text);
-        if new_content == content {
-            return Err(anyhow::anyhow!("The old_text was not found in the content"));
-        }
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(input.abs_path, new_content, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: (),
-        })
-    }
-}
--- a/crates/agent_servers/src/claude/tools.rs
+++ b/crates/agent_servers/src/claude/tools.rs
@@ -311,7 +311,6 @@ impl ClaudeTool {
            label: self.label(),
            content: self.content(),
            locations: self.locations(),
-            raw_input: None,
        }
    }
 }
--- a/crates/agent_servers/src/codex.rs
+++ b/crates/agent_servers/src/codex.rs
@@ -1,319 +0,0 @@
-use agent_client_protocol as acp;
-use anyhow::anyhow;
-use collections::HashMap;
-use context_server::listener::McpServerTool;
-use context_server::types::requests;
-use context_server::{ContextServer, ContextServerCommand, ContextServerId};
-use futures::channel::{mpsc, oneshot};
-use project::Project;
-use settings::SettingsStore;
-use smol::stream::StreamExt as _;
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::{path::Path, sync::Arc};
-use util::ResultExt;
-
-use anyhow::{Context, Result};
-use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
-
-use crate::mcp_server::ZedMcpServer;
-use crate::{AgentServer, AgentServerCommand, AllAgentServersSettings, mcp_server};
-use acp_thread::{AcpThread, AgentConnection};
-
-#[derive(Clone)]
-pub struct Codex;
-
-impl AgentServer for Codex {
-    fn name(&self) -> &'static str {
-        "Codex"
-    }
-
-    fn empty_state_headline(&self) -> &'static str {
-        "Welcome to Codex"
-    }
-
-    fn empty_state_message(&self) -> &'static str {
-        "What can I help with?"
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::AiOpenAi
-    }
-
-    fn connect(
-        &self,
-        _root_dir: &Path,
-        project: &Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        let project = project.clone();
-        let working_directory = project.read(cx).active_project_directory(cx);
-        cx.spawn(async move |cx| {
-            let settings = cx.read_global(|settings: &SettingsStore, _| {
-                settings.get::<AllAgentServersSettings>(None).codex.clone()
-            })?;
-
-            let Some(command) =
-                AgentServerCommand::resolve("codex", &["mcp"], settings, &project, cx).await
-            else {
-                anyhow::bail!("Failed to find codex binary");
-            };
-
-            let client: Arc<ContextServer> = ContextServer::stdio(
-                ContextServerId("codex-mcp-server".into()),
-                ContextServerCommand {
-                    path: command.path,
-                    args: command.args,
-                    env: command.env,
-                },
-                working_directory,
-            )
-            .into();
-            ContextServer::start(client.clone(), cx).await?;
-
-            let (notification_tx, mut notification_rx) = mpsc::unbounded();
-            client
-                .client()
-                .context("Failed to subscribe")?
-                .on_notification(acp::SESSION_UPDATE_METHOD_NAME, {
-                    move |notification, _cx| {
-                        let notification_tx = notification_tx.clone();
-                        log::trace!(
-                            "ACP Notification: {}",
-                            serde_json::to_string_pretty(&notification).unwrap()
-                        );
-
-                        if let Some(notification) =
-                            serde_json::from_value::<acp::SessionNotification>(notification)
-                                .log_err()
-                        {
-                            notification_tx.unbounded_send(notification).ok();
-                        }
-                    }
-                });
-
-            let sessions = Rc::new(RefCell::new(HashMap::default()));
-
-            let notification_handler_task = cx.spawn({
-                let sessions = sessions.clone();
-                async move |cx| {
-                    while let Some(notification) = notification_rx.next().await {
-                        CodexConnection::handle_session_notification(
-                            notification,
-                            sessions.clone(),
-                            cx,
-                        )
-                    }
-                }
-            });
-
-            let connection = CodexConnection {
-                client,
-                sessions,
-                _notification_handler_task: notification_handler_task,
-            };
-            Ok(Rc::new(connection) as _)
-        })
-    }
-}
-
-struct CodexConnection {
-    client: Arc<context_server::ContextServer>,
-    sessions: Rc<RefCell<HashMap<acp::SessionId, CodexSession>>>,
-    _notification_handler_task: Task<()>,
-}
-
-struct CodexSession {
-    thread: WeakEntity<AcpThread>,
-    cancel_tx: Option<oneshot::Sender<()>>,
-    _mcp_server: ZedMcpServer,
-}
-
-impl AgentConnection for CodexConnection {
-    fn name(&self) -> &'static str {
-        "Codex"
-    }
-
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let client = self.client.client();
-        let sessions = self.sessions.clone();
-        let cwd = cwd.to_path_buf();
-        cx.spawn(async move |cx| {
-            let client = client.context("MCP server is not initialized yet")?;
-            let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
-
-            let mcp_server = ZedMcpServer::new(thread_rx, cx).await?;
-
-            let response = client
-                .request::<requests::CallTool>(context_server::types::CallToolParams {
-                    name: acp::NEW_SESSION_TOOL_NAME.into(),
-                    arguments: Some(serde_json::to_value(acp::NewSessionArguments {
-                        mcp_servers: [(
-                            mcp_server::SERVER_NAME.to_string(),
-                            mcp_server.server_config()?,
-                        )]
-                        .into(),
-                        client_tools: acp::ClientTools {
-                            request_permission: Some(acp::McpToolId {
-                                mcp_server: mcp_server::SERVER_NAME.into(),
-                                tool_name: mcp_server::RequestPermissionTool::NAME.into(),
-                            }),
-                            read_text_file: Some(acp::McpToolId {
-                                mcp_server: mcp_server::SERVER_NAME.into(),
-                                tool_name: mcp_server::ReadTextFileTool::NAME.into(),
-                            }),
-                            write_text_file: Some(acp::McpToolId {
-                                mcp_server: mcp_server::SERVER_NAME.into(),
-                                tool_name: mcp_server::WriteTextFileTool::NAME.into(),
-                            }),
-                        },
-                        cwd,
-                    })?),
-                    meta: None,
-                })
-                .await?;
-
-            if response.is_error.unwrap_or_default() {
-                return Err(anyhow!(response.text_contents()));
-            }
-
-            let result = serde_json::from_value::<acp::NewSessionOutput>(
-                response.structured_content.context("Empty response")?,
-            )?;
-
-            let thread =
-                cx.new(|cx| AcpThread::new(self.clone(), project, result.session_id.clone(), cx))?;
-
-            thread_tx.send(thread.downgrade())?;
-
-            let session = CodexSession {
-                thread: thread.downgrade(),
-                cancel_tx: None,
-                _mcp_server: mcp_server,
-            };
-            sessions.borrow_mut().insert(result.session_id, session);
-
-            Ok(thread)
-        })
-    }
-
-    fn authenticate(&self, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Err(anyhow!("Authentication not supported")))
-    }
-
-    fn prompt(
-        &self,
-        params: agent_client_protocol::PromptArguments,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let client = self.client.client();
-        let sessions = self.sessions.clone();
-
-        cx.foreground_executor().spawn(async move {
-            let client = client.context("MCP server is not initialized yet")?;
-
-            let (new_cancel_tx, cancel_rx) = oneshot::channel();
-            {
-                let mut sessions = sessions.borrow_mut();
-                let session = sessions
-                    .get_mut(&params.session_id)
-                    .context("Session not found")?;
-                session.cancel_tx.replace(new_cancel_tx);
-            }
-
-            let result = client
-                .request_with::<requests::CallTool>(
-                    context_server::types::CallToolParams {
-                        name: acp::PROMPT_TOOL_NAME.into(),
-                        arguments: Some(serde_json::to_value(params)?),
-                        meta: None,
-                    },
-                    Some(cancel_rx),
-                    None,
-                )
-                .await;
-
-            if let Err(err) = &result
-                && err.is::<context_server::client::RequestCanceled>()
-            {
-                return Ok(());
-            }
-
-            let response = result?;
-
-            if response.is_error.unwrap_or_default() {
-                return Err(anyhow!(response.text_contents()));
-            }
-
-            Ok(())
-        })
-    }
-
-    fn cancel(&self, session_id: &agent_client_protocol::SessionId, _cx: &mut App) {
-        let mut sessions = self.sessions.borrow_mut();
-
-        if let Some(cancel_tx) = sessions
-            .get_mut(session_id)
-            .and_then(|session| session.cancel_tx.take())
-        {
-            cancel_tx.send(()).ok();
-        }
-    }
-}
-
-impl CodexConnection {
-    pub fn handle_session_notification(
-        notification: acp::SessionNotification,
-        threads: Rc<RefCell<HashMap<acp::SessionId, CodexSession>>>,
-        cx: &mut AsyncApp,
-    ) {
-        let threads = threads.borrow();
-        let Some(thread) = threads
-            .get(&notification.session_id)
-            .and_then(|session| session.thread.upgrade())
-        else {
-            log::error!(
-                "Thread not found for session ID: {}",
-                notification.session_id
-            );
-            return;
-        };
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.handle_session_update(notification.update, cx)
-            })
-            .log_err();
-    }
-}
-
-impl Drop for CodexConnection {
-    fn drop(&mut self) {
-        self.client.stop().log_err();
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use crate::AgentServerCommand;
-    use std::path::Path;
-
-    crate::common_e2e_tests!(Codex, allow_option_id = "approve");
-
-    pub fn local_command() -> AgentServerCommand {
-        let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("../../../codex/codex-rs/target/debug/codex");
-
-        AgentServerCommand {
-            path: cli_path,
-            args: vec![],
-            env: None,
-        }
-    }
-}
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -1,8 +1,4 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
+use std::{path::Path, sync::Arc, time::Duration};

 use crate::{AgentServer, AgentServerSettings, AllAgentServersSettings};
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
@@ -12,6 +8,7 @@ use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::{Entity, TestAppContext};
 use indoc::indoc;
 use project::{FakeFs, Project};
+use serde_json::json;
 use settings::{Settings, SettingsStore};
 use util::path;

@@ -26,11 +23,7 @@ pub async fn test_basic(server: impl AgentServer + 'static, cx: &mut TestAppCont
        .unwrap();

    thread.read_with(cx, |thread, _| {
-        assert!(
-            thread.entries().len() >= 2,
-            "Expected at least 2 entries. Got: {:?}",
-            thread.entries()
-        );
+        assert_eq!(thread.entries().len(), 2);
        assert!(matches!(
            thread.entries()[0],
            AgentThreadEntry::UserMessage(_)
@@ -86,44 +79,37 @@ pub async fn test_path_mentions(server: impl AgentServer + 'static, cx: &mut Tes
        .unwrap();

    thread.read_with(cx, |thread, cx| {
+        assert_eq!(thread.entries().len(), 3);
        assert!(matches!(
            thread.entries()[0],
            AgentThreadEntry::UserMessage(_)
        ));
-        let assistant_message = &thread
-            .entries()
-            .iter()
-            .rev()
-            .find_map(|entry| match entry {
-                AgentThreadEntry::AssistantMessage(msg) => Some(msg),
-                _ => None,
-            })
-            .unwrap();
-
+        assert!(matches!(thread.entries()[1], AgentThreadEntry::ToolCall(_)));
+        let AgentThreadEntry::AssistantMessage(assistant_message) = &thread.entries()[2] else {
+            panic!("Expected AssistantMessage")
+        };
        assert!(
            assistant_message.to_markdown(cx).contains("Hello, world!"),
            "unexpected assistant message: {:?}",
            assistant_message.to_markdown(cx)
        );
    });
-
-    drop(tempdir);
 }

 pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestAppContext) {
-    let _fs = init_test(cx).await;
-
-    let tempdir = tempfile::tempdir().unwrap();
-    let foo_path = tempdir.path().join("foo");
-    std::fs::write(&foo_path, "Lorem ipsum dolor").expect("failed to write file");
-
-    let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
+    let fs = init_test(cx).await;
+    fs.insert_tree(
+        path!("/private/tmp"),
+        json!({"foo": "Lorem ipsum dolor", "bar": "bar", "baz": "baz"}),
+    )
+    .await;
+    let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;

    thread
        .update(cx, |thread, cx| {
            thread.send_raw(
-                &format!("Read {} and tell me what you see.", foo_path.display()),
+                "Read the '/private/tmp/foo' file and tell me what you see.",
                cx,
            )
        })
@@ -146,13 +132,10 @@ pub async fn test_tool_call(server: impl AgentServer + 'static, cx: &mut TestApp
                .any(|entry| { matches!(entry, AgentThreadEntry::AssistantMessage(_)) })
        );
    });
-
-    drop(tempdir);
 }

 pub async fn test_tool_call_with_confirmation(
    server: impl AgentServer + 'static,
-    allow_option_id: acp::PermissionOptionId,
    cx: &mut TestAppContext,
 ) {
    let fs = init_test(cx).await;
@@ -160,7 +143,7 @@ pub async fn test_tool_call_with_confirmation(
    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
    let full_turn = thread.update(cx, |thread, cx| {
        thread.send_raw(
-            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
+            r#"Run `touch hello.txt && echo "Hello, world!" | tee hello.txt`"#,
            cx,
        )
    });
@@ -180,10 +163,10 @@ pub async fn test_tool_call_with_confirmation(
    )
    .await;

-    let tool_call_id = thread.read_with(cx, |thread, cx| {
+    let tool_call_id = thread.read_with(cx, |thread, _cx| {
        let AgentThreadEntry::ToolCall(ToolCall {
            id,
-            label,
+            content,
            status: ToolCallStatus::WaitingForConfirmation { .. },
            ..
        }) = &thread
@@ -195,8 +178,7 @@ pub async fn test_tool_call_with_confirmation(
            panic!();
        };

-        let label = label.read(cx).source();
-        assert!(label.contains("touch"), "Got: {}", label);
+        assert!(content.iter().any(|c| c.to_markdown(_cx).contains("touch")));

        id.clone()
    });
@@ -204,7 +186,7 @@ pub async fn test_tool_call_with_confirmation(
    thread.update(cx, |thread, cx| {
        thread.authorize_tool_call(
            tool_call_id,
-            allow_option_id,
+            acp::PermissionOptionId("0".into()),
            acp::PermissionOptionKind::AllowOnce,
            cx,
        );
@@ -248,7 +230,7 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon
    let thread = new_test_thread(server, project.clone(), "/private/tmp", cx).await;
    let full_turn = thread.update(cx, |thread, cx| {
        thread.send_raw(
-            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
+            r#"Run `touch hello.txt && echo "Hello, world!" >> hello.txt`"#,
            cx,
        )
    });
@@ -268,10 +250,10 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon
    )
    .await;

-    thread.read_with(cx, |thread, cx| {
+    thread.read_with(cx, |thread, _cx| {
        let AgentThreadEntry::ToolCall(ToolCall {
            id,
-            label,
+            content,
            status: ToolCallStatus::WaitingForConfirmation { .. },
            ..
        }) = &thread.entries()[first_tool_call_ix]
@@ -279,8 +261,7 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon
            panic!("{:?}", thread.entries()[1]);
        };

-        let label = label.read(cx).source();
-        assert!(label.contains("touch"), "Got: {}", label);
+        assert!(content.iter().any(|c| c.to_markdown(_cx).contains("touch")));

        id.clone()
    });
@@ -313,7 +294,7 @@ pub async fn test_cancel(server: impl AgentServer + 'static, cx: &mut TestAppCon

 #[macro_export]
 macro_rules! common_e2e_tests {
-    ($server:expr, allow_option_id = $allow_option_id:expr) => {
+    ($server:expr) => {
        mod common_e2e {
            use super::*;

@@ -338,12 +319,7 @@ macro_rules! common_e2e_tests {
            #[::gpui::test]
            #[cfg_attr(not(feature = "e2e"), ignore)]
            async fn tool_call_with_confirmation(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_tool_call_with_confirmation(
-                    $server,
-                    ::agent_client_protocol::PermissionOptionId($allow_option_id.into()),
-                    cx,
-                )
-                .await;
+                $crate::e2e_tests::test_tool_call_with_confirmation($server, cx).await;
            }

            #[::gpui::test]
@@ -375,9 +351,6 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
                gemini: Some(AgentServerSettings {
                    command: crate::gemini::tests::local_command(),
                }),
-                codex: Some(AgentServerSettings {
-                    command: crate::codex::tests::local_command(),
-                }),
            },
            cx,
        );
@@ -436,24 +409,3 @@ pub async fn run_until_first_tool_call(
        }
    }
 }
-
-pub fn get_zed_path() -> PathBuf {
-    let mut zed_path = std::env::current_exe().unwrap();
-
-    while zed_path
-        .file_name()
-        .map_or(true, |name| name.to_string_lossy() != "debug")
-    {
-        if !zed_path.pop() {
-            panic!("Could not find target directory");
-        }
-    }
-
-    zed_path.push("zed");
-
-    if !zed_path.exists() {
-        panic!("\n🚨 Run `cargo build` at least once before running e2e tests\n\n");
-    }
-
-    zed_path
-}
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -107,7 +107,6 @@ impl AgentServer for Gemini {
                name,
                connection,
                child_status,
-                current_thread: thread_rc,
            });

            Ok(connection)
@@ -189,7 +188,7 @@ pub(crate) mod tests {
    use crate::AgentServerCommand;
    use std::path::Path;

-    crate::common_e2e_tests!(Gemini, allow_option_id = "0");
+    crate::common_e2e_tests!(Gemini);

    pub fn local_command() -> AgentServerCommand {
        let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))
--- a/crates/agent_servers/src/mcp_server.rs
+++ b/crates/agent_servers/src/mcp_server.rs
@@ -1,207 +0,0 @@
-use acp_thread::AcpThread;
-use agent_client_protocol as acp;
-use anyhow::Result;
-use context_server::listener::{McpServerTool, ToolResponse};
-use context_server::types::{
-    Implementation, InitializeParams, InitializeResponse, ProtocolVersion, ServerCapabilities,
-    ToolsCapabilities, requests,
-};
-use futures::channel::oneshot;
-use gpui::{App, AsyncApp, Task, WeakEntity};
-use indoc::indoc;
-
-pub struct ZedMcpServer {
-    server: context_server::listener::McpServer,
-}
-
-pub const SERVER_NAME: &str = "zed";
-
-impl ZedMcpServer {
-    pub async fn new(
-        thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-        cx: &AsyncApp,
-    ) -> Result<Self> {
-        let mut mcp_server = context_server::listener::McpServer::new(cx).await?;
-        mcp_server.handle_request::<requests::Initialize>(Self::handle_initialize);
-
-        mcp_server.add_tool(RequestPermissionTool {
-            thread_rx: thread_rx.clone(),
-        });
-        mcp_server.add_tool(ReadTextFileTool {
-            thread_rx: thread_rx.clone(),
-        });
-        mcp_server.add_tool(WriteTextFileTool {
-            thread_rx: thread_rx.clone(),
-        });
-
-        Ok(Self { server: mcp_server })
-    }
-
-    pub fn server_config(&self) -> Result<acp::McpServerConfig> {
-        #[cfg(not(test))]
-        let zed_path = anyhow::Context::context(
-            std::env::current_exe(),
-            "finding current executable path for use in mcp_server",
-        )?;
-
-        #[cfg(test)]
-        let zed_path = crate::e2e_tests::get_zed_path();
-
-        Ok(acp::McpServerConfig {
-            command: zed_path,
-            args: vec![
-                "--nc".into(),
-                self.server.socket_path().display().to_string(),
-            ],
-            env: None,
-        })
-    }
-
-    fn handle_initialize(_: InitializeParams, cx: &App) -> Task<Result<InitializeResponse>> {
-        cx.foreground_executor().spawn(async move {
-            Ok(InitializeResponse {
-                protocol_version: ProtocolVersion("2025-06-18".into()),
-                capabilities: ServerCapabilities {
-                    experimental: None,
-                    logging: None,
-                    completions: None,
-                    prompts: None,
-                    resources: None,
-                    tools: Some(ToolsCapabilities {
-                        list_changed: Some(false),
-                    }),
-                },
-                server_info: Implementation {
-                    name: SERVER_NAME.into(),
-                    version: "0.1.0".into(),
-                },
-                meta: None,
-            })
-        })
-    }
-}
-
-// Tools
-
-#[derive(Clone)]
-pub struct RequestPermissionTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for RequestPermissionTool {
-    type Input = acp::RequestPermissionArguments;
-    type Output = acp::RequestPermissionOutput;
-
-    const NAME: &'static str = "Confirmation";
-
-    fn description(&self) -> &'static str {
-        indoc! {"
-            Request permission for tool calls.
-
-            This tool is meant to be called programmatically by the agent loop, not the LLM.
-        "}
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let result = thread
-            .update(cx, |thread, cx| {
-                thread.request_tool_call_permission(input.tool_call, input.options, cx)
-            })?
-            .await;
-
-        let outcome = match result {
-            Ok(option_id) => acp::RequestPermissionOutcome::Selected { option_id },
-            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Canceled,
-        };
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: acp::RequestPermissionOutput { outcome },
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct ReadTextFileTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for ReadTextFileTool {
-    type Input = acp::ReadTextFileArguments;
-    type Output = acp::ReadTextFileOutput;
-
-    const NAME: &'static str = "Read";
-
-    fn description(&self) -> &'static str {
-        "Reads the content of the given file in the project including unsaved changes."
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(input.path, input.line, input.limit, false, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: acp::ReadTextFileOutput { content },
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct WriteTextFileTool {
-    thread_rx: watch::Receiver<WeakEntity<AcpThread>>,
-}
-
-impl McpServerTool for WriteTextFileTool {
-    type Input = acp::WriteTextFileArguments;
-    type Output = ();
-
-    const NAME: &'static str = "Write";
-
-    fn description(&self) -> &'static str {
-        "Write to a file replacing its contents"
-    }
-
-    async fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> Result<ToolResponse<Self::Output>> {
-        let mut thread_rx = self.thread_rx.clone();
-        let Some(thread) = thread_rx.recv().await?.upgrade() else {
-            anyhow::bail!("Thread closed");
-        };
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.write_text_file(input.path, input.content, cx)
-            })?
-            .await?;
-
-        Ok(ToolResponse {
-            content: vec![],
-            structured_content: (),
-        })
-    }
-}
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -13,7 +13,6 @@ pub fn init(cx: &mut App) {
 pub struct AllAgentServersSettings {
    pub gemini: Option<AgentServerSettings>,
    pub claude: Option<AgentServerSettings>,
-    pub codex: Option<AgentServerSettings>,
 }

 #[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
@@ -30,21 +29,13 @@ impl settings::Settings for AllAgentServersSettings {
    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
        let mut settings = AllAgentServersSettings::default();

-        for AllAgentServersSettings {
-            gemini,
-            claude,
-            codex,
-        } in sources.defaults_and_customizations()
-        {
+        for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() {
            if gemini.is_some() {
                settings.gemini = gemini.clone();
            }
            if claude.is_some() {
                settings.claude = claude.clone();
            }
-            if codex.is_some() {
-                settings.codex = codex.clone();
-            }
        }

        Ok(settings)
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -13,7 +13,6 @@ path = "src/agent_settings.rs"

 [dependencies]
 anyhow.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 gpui.workspace = true
 language_model.workspace = true
@@ -21,6 +20,7 @@ schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 workspace-hack.workspace = true
+zed_llm_client.workspace = true

 [dev-dependencies]
 fs.workspace = true
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -321,11 +321,11 @@ pub enum CompletionMode {
    Burn,
 }

-impl From<CompletionMode> for cloud_llm_client::CompletionMode {
+impl From<CompletionMode> for zed_llm_client::CompletionMode {
    fn from(value: CompletionMode) -> Self {
        match value {
-            CompletionMode::Normal => cloud_llm_client::CompletionMode::Normal,
-            CompletionMode::Burn => cloud_llm_client::CompletionMode::Max,
+            CompletionMode::Normal => zed_llm_client::CompletionMode::Normal,
+            CompletionMode::Burn => zed_llm_client::CompletionMode::Max,
        }
    }
 }
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -31,7 +31,6 @@ audio.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 client.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 component.workspace = true
@@ -47,9 +46,9 @@ futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
 html_to_markdown.workspace = true
+indoc.workspace = true
 http_client.workspace = true
 indexed_docs.workspace = true
-indoc.workspace = true
 inventory.workspace = true
 itertools.workspace = true
 jsonschema.workspace = true
@@ -98,6 +97,7 @@ watch.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
+zed_llm_client.workspace = true

 [dev-dependencies]
 assistant_tools.workspace = true
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -1,7 +1,5 @@
 use acp_thread::{AgentConnection, Plan};
 use agent_servers::AgentServer;
-use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
-use audio::{Audio, Sound};
 use std::cell::RefCell;
 use std::collections::BTreeMap;
 use std::path::Path;
@@ -20,10 +18,10 @@ use editor::{
 use file_icons::FileIcons;
 use gpui::{
    Action, Animation, AnimationExt, App, BorderStyle, EdgesRefinement, Empty, Entity, EntityId,
-    FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, PlatformDisplay, SharedString,
-    StyleRefinement, Subscription, Task, TextStyle, TextStyleRefinement, Transformation,
-    UnderlineStyle, WeakEntity, Window, WindowHandle, div, linear_color_stop, linear_gradient,
-    list, percentage, point, prelude::*, pulsating_between,
+    FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, SharedString, StyleRefinement,
+    Subscription, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity,
+    Window, div, linear_color_stop, linear_gradient, list, percentage, point, prelude::*,
+    pulsating_between,
 };
 use language::language_settings::SoftWrap;
 use language::{Buffer, Language};
@@ -47,10 +45,7 @@ use crate::acp::completion_provider::{ContextPickerCompletionProvider, MentionSe
 use crate::acp::message_history::MessageHistory;
 use crate::agent_diff::AgentDiff;
 use crate::message_editor::{MAX_EDITOR_LINES, MIN_EDITOR_LINES};
-use crate::ui::{AgentNotification, AgentNotificationEvent};
-use crate::{
-    AgentDiffPane, AgentPanel, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll,
-};
+use crate::{AgentDiffPane, ExpandMessageEditor, Follow, KeepAll, OpenAgentDiff, RejectAll};

 const RESPONSE_PADDING_X: Pixels = px(19.);

@@ -64,8 +59,6 @@ pub struct AcpThreadView {
    message_set_from_history: bool,
    _message_editor_subscription: Subscription,
    mention_set: Arc<Mutex<MentionSet>>,
-    notifications: Vec<WindowHandle<AgentNotification>>,
-    notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
    last_error: Option<Entity<Markdown>>,
    list_state: ListState,
    auth_task: Option<Task<()>>,
@@ -181,8 +174,6 @@ impl AcpThreadView {
            message_set_from_history: false,
            _message_editor_subscription: message_editor_subscription,
            mention_set,
-            notifications: Vec::new(),
-            notification_subscriptions: HashMap::default(),
            diff_editors: Default::default(),
            list_state: list_state,
            last_error: None,
@@ -390,9 +381,7 @@ impl AcpThreadView {
            return;
        }

-        let Some(thread) = self.thread() else {
-            return;
-        };
+        let Some(thread) = self.thread() else { return };
        let task = thread.update(cx, |thread, cx| thread.send(chunks.clone(), cx));

        cx.spawn(async move |this, cx| {
@@ -575,30 +564,6 @@ impl AcpThreadView {
                self.sync_thread_entry_view(index, window, cx);
                self.list_state.splice(index..index + 1, 1);
            }
-            AcpThreadEvent::ToolAuthorizationRequired => {
-                self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
-            }
-            AcpThreadEvent::Stopped => {
-                let used_tools = thread.read(cx).used_tools_since_last_user_message();
-                self.notify_with_sound(
-                    if used_tools {
-                        "Finished running tools"
-                    } else {
-                        "New message"
-                    },
-                    IconName::ZedAssistant,
-                    window,
-                    cx,
-                );
-            }
-            AcpThreadEvent::Error => {
-                self.notify_with_sound(
-                    "Agent stopped due to an error",
-                    IconName::Warning,
-                    window,
-                    cx,
-                );
-            }
        }
        cx.notify();
    }
@@ -907,10 +872,7 @@ impl AcpThreadView {
        let header_id = SharedString::from(format!("tool-call-header-{}", entry_ix));

        let status_icon = match &tool_call.status {
-            ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::Pending,
-            }
-            | ToolCallStatus::WaitingForConfirmation { .. } => None,
+            ToolCallStatus::WaitingForConfirmation { .. } => None,
            ToolCallStatus::Allowed {
                status: acp::ToolCallStatus::InProgress,
                ..
@@ -995,8 +957,6 @@ impl AcpThreadView {
                                Icon::new(match tool_call.kind {
                                    acp::ToolKind::Read => IconName::ToolRead,
                                    acp::ToolKind::Edit => IconName::ToolPencil,
-                                    acp::ToolKind::Delete => IconName::ToolDeleteFile,
-                                    acp::ToolKind::Move => IconName::ArrowRightLeft,
                                    acp::ToolKind::Search => IconName::ToolSearch,
                                    acp::ToolKind::Execute => IconName::ToolTerminal,
                                    acp::ToolKind::Think => IconName::ToolBulb,
@@ -1108,7 +1068,6 @@ impl AcpThreadView {
                                            options,
                                            entry_ix,
                                            tool_call.id.clone(),
-                                            tool_call.content.is_empty(),
                                            cx,
                                        )),
                                    ToolCallStatus::Allowed { .. } | ToolCallStatus::Canceled => {
@@ -1167,7 +1126,6 @@ impl AcpThreadView {
        options: &[acp::PermissionOption],
        entry_ix: usize,
        tool_call_id: acp::ToolCallId,
-        empty_content: bool,
        cx: &Context<Self>,
    ) -> Div {
        h_flex()
@@ -1175,10 +1133,8 @@ impl AcpThreadView {
            .px_1p5()
            .gap_1()
            .justify_end()
-            .when(!empty_content, |this| {
-                this.border_t_1()
-                    .border_color(self.tool_card_border_color(cx))
-            })
+            .border_t_1()
+            .border_color(self.tool_card_border_color(cx))
            .children(options.iter().map(|option| {
                let option_id = SharedString::from(option.id.0.clone());
                Button::new((option_id, entry_ix), option.label.clone())
@@ -2195,154 +2151,6 @@ impl AcpThreadView {
        self.list_state.scroll_to(ListOffset::default());
        cx.notify();
    }
-
-    fn notify_with_sound(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.play_notification_sound(window, cx);
-        self.show_notification(caption, icon, window, cx);
-    }
-
-    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
-        let settings = AgentSettings::get_global(cx);
-        if settings.play_sound_when_agent_done && !window.is_window_active() {
-            Audio::play_sound(Sound::AgentDone, cx);
-        }
-    }
-
-    fn show_notification(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if window.is_window_active() || !self.notifications.is_empty() {
-            return;
-        }
-
-        let title = self.title(cx);
-
-        match AgentSettings::get_global(cx).notify_when_agent_waiting {
-            NotifyWhenAgentWaiting::PrimaryScreen => {
-                if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title, window, primary, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::AllScreens => {
-                let caption = caption.into();
-                for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::Never => {
-                // Don't show anything
-            }
-        }
-    }
-
-    fn pop_up(
-        &mut self,
-        icon: IconName,
-        caption: SharedString,
-        title: SharedString,
-        window: &mut Window,
-        screen: Rc<dyn PlatformDisplay>,
-        cx: &mut Context<Self>,
-    ) {
-        let options = AgentNotification::window_options(screen, cx);
-
-        let project_name = self.workspace.upgrade().and_then(|workspace| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .next()
-                .map(|worktree| worktree.read(cx).root_name().to_string())
-        });
-
-        if let Some(screen_window) = cx
-            .open_window(options, |_, cx| {
-                cx.new(|_| {
-                    AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
-                })
-            })
-            .log_err()
-        {
-            if let Some(pop_up) = screen_window.entity(cx).log_err() {
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push(cx.subscribe_in(&pop_up, window, {
-                        |this, _, event, window, cx| match event {
-                            AgentNotificationEvent::Accepted => {
-                                let handle = window.window_handle();
-                                cx.activate(true);
-
-                                let workspace_handle = this.workspace.clone();
-
-                                // If there are multiple Zed windows, activate the correct one.
-                                cx.defer(move |cx| {
-                                    handle
-                                        .update(cx, |_view, window, _cx| {
-                                            window.activate_window();
-
-                                            if let Some(workspace) = workspace_handle.upgrade() {
-                                                workspace.update(_cx, |workspace, cx| {
-                                                    workspace.focus_panel::<AgentPanel>(window, cx);
-                                                });
-                                            }
-                                        })
-                                        .log_err();
-                                });
-
-                                this.dismiss_notifications(cx);
-                            }
-                            AgentNotificationEvent::Dismissed => {
-                                this.dismiss_notifications(cx);
-                            }
-                        }
-                    }));
-
-                self.notifications.push(screen_window);
-
-                // If the user manually refocuses the original window, dismiss the popup.
-                self.notification_subscriptions
-                    .entry(screen_window)
-                    .or_insert_with(Vec::new)
-                    .push({
-                        let pop_up_weak = pop_up.downgrade();
-
-                        cx.observe_window_activation(window, move |_, window, cx| {
-                            if window.is_window_active() {
-                                if let Some(pop_up) = pop_up_weak.upgrade() {
-                                    pop_up.update(cx, |_, cx| {
-                                        cx.emit(AgentNotificationEvent::Dismissed);
-                                    });
-                                }
-                            }
-                        })
-                    });
-            }
-        }
-    }
-
-    fn dismiss_notifications(&mut self, cx: &mut Context<Self>) {
-        for window in self.notifications.drain(..) {
-            window
-                .update(cx, |_, window, _| {
-                    window.remove_window();
-                })
-                .ok();
-
-            self.notification_subscriptions.remove(&window);
-        }
-    }
 }

 impl Focusable for AcpThreadView {
@@ -2624,331 +2432,3 @@ fn plan_label_markdown_style(
        ..default_md_style
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use agent_client_protocol::SessionId;
-    use editor::EditorSettings;
-    use fs::FakeFs;
-    use futures::future::try_join_all;
-    use gpui::{SemanticVersion, TestAppContext, VisualTestContext};
-    use rand::Rng;
-    use settings::SettingsStore;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_notification_for_stop_event(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default(), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_error(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(SaboteurAgentConnection), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId("1".into());
-        let tool_call = acp::ToolCall {
-            id: tool_call_id.clone(),
-            label: "Label".into(),
-            kind: acp::ToolKind::Edit,
-            status: acp::ToolCallStatus::Pending,
-            content: vec!["hi".into()],
-            locations: vec![],
-            raw_input: None,
-        };
-        let connection = StubAgentConnection::new(vec![acp::SessionUpdate::ToolCall(tool_call)])
-            .with_permission_requests(HashMap::from_iter([(
-                tool_call_id,
-                vec![acp::PermissionOption {
-                    id: acp::PermissionOptionId("1".into()),
-                    label: "Allow".into(),
-                    kind: acp::PermissionOptionKind::AllowOnce,
-                }],
-            )]));
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.chat(&Chat, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    async fn setup_thread_view(
-        agent: impl AgentServer + 'static,
-        cx: &mut TestAppContext,
-    ) -> (Entity<AcpThreadView>, &mut VisualTestContext) {
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpThreadView::new(
-                    Rc::new(agent),
-                    workspace.downgrade(),
-                    project,
-                    Rc::new(RefCell::new(MessageHistory::default())),
-                    1,
-                    None,
-                    window,
-                    cx,
-                )
-            })
-        });
-        cx.run_until_parked();
-        (thread_view, cx)
-    }
-
-    struct StubAgentServer<C> {
-        connection: C,
-    }
-
-    impl<C> StubAgentServer<C> {
-        fn new(connection: C) -> Self {
-            Self { connection }
-        }
-    }
-
-    impl StubAgentServer<StubAgentConnection> {
-        fn default() -> Self {
-            Self::new(StubAgentConnection::default())
-        }
-    }
-
-    impl<C> AgentServer for StubAgentServer<C>
-    where
-        C: 'static + AgentConnection + Send + Clone,
-    {
-        fn logo(&self) -> ui::IconName {
-            unimplemented!()
-        }
-
-        fn name(&self) -> &'static str {
-            unimplemented!()
-        }
-
-        fn empty_state_headline(&self) -> &'static str {
-            unimplemented!()
-        }
-
-        fn empty_state_message(&self) -> &'static str {
-            unimplemented!()
-        }
-
-        fn connect(
-            &self,
-            _root_dir: &Path,
-            _project: &Entity<Project>,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<Rc<dyn AgentConnection>>> {
-            Task::ready(Ok(Rc::new(self.connection.clone())))
-        }
-    }
-
-    #[derive(Clone, Default)]
-    struct StubAgentConnection {
-        sessions: Arc<Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
-        permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        updates: Vec<acp::SessionUpdate>,
-    }
-
-    impl StubAgentConnection {
-        fn new(updates: Vec<acp::SessionUpdate>) -> Self {
-            Self {
-                updates,
-                permission_requests: HashMap::default(),
-                sessions: Arc::default(),
-            }
-        }
-
-        fn with_permission_requests(
-            mut self,
-            permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        ) -> Self {
-            self.permission_requests = permission_requests;
-            self
-        }
-    }
-
-    impl AgentConnection for StubAgentConnection {
-        fn name(&self) -> &'static str {
-            "StubAgentConnection"
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::AsyncApp,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = SessionId(
-                rand::thread_rng()
-                    .sample_iter(&rand::distributions::Alphanumeric)
-                    .take(7)
-                    .map(char::from)
-                    .collect::<String>()
-                    .into(),
-            );
-            let thread = cx
-                .new(|cx| AcpThread::new(self.clone(), project, session_id.clone(), cx))
-                .unwrap();
-            self.sessions.lock().insert(session_id, thread.downgrade());
-            Task::ready(Ok(thread))
-        }
-
-        fn authenticate(&self, _cx: &mut App) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(&self, params: acp::PromptArguments, cx: &mut App) -> Task<gpui::Result<()>> {
-            let sessions = self.sessions.lock();
-            let thread = sessions.get(&params.session_id).unwrap();
-            let mut tasks = vec![];
-            for update in &self.updates {
-                let thread = thread.clone();
-                let update = update.clone();
-                let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) = &update
-                    && let Some(options) = self.permission_requests.get(&tool_call.id)
-                {
-                    Some((tool_call.clone(), options.clone()))
-                } else {
-                    None
-                };
-                let task = cx.spawn(async move |cx| {
-                    if let Some((tool_call, options)) = permission_request {
-                        let permission = thread.update(cx, |thread, cx| {
-                            thread.request_tool_call_permission(
-                                tool_call.clone(),
-                                options.clone(),
-                                cx,
-                            )
-                        })?;
-                        permission.await?;
-                    }
-                    thread.update(cx, |thread, cx| {
-                        thread.handle_session_update(update.clone(), cx).unwrap();
-                    })?;
-                    anyhow::Ok(())
-                });
-                tasks.push(task);
-            }
-            cx.spawn(async move |_| {
-                try_join_all(tasks).await?;
-                Ok(())
-            })
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-    }
-
-    #[derive(Clone)]
-    struct SaboteurAgentConnection;
-
-    impl AgentConnection for SaboteurAgentConnection {
-        fn name(&self) -> &'static str {
-            "SaboteurAgentConnection"
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::AsyncApp,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx
-                .new(|cx| AcpThread::new(self, project, SessionId("test".into()), cx))
-                .unwrap()))
-        }
-
-        fn authenticate(&self, _cx: &mut App) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(&self, _params: acp::PromptArguments, _cx: &mut App) -> Task<gpui::Result<()>> {
-            Task::ready(Err(anyhow::anyhow!("Error prompting")))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-            AgentSettings::register(cx);
-            workspace::init_settings(cx);
-            ThemeSettings::register(cx);
-            release_channel::init(SemanticVersion::default(), cx);
-            EditorSettings::register(cx);
-        });
-    }
-}
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -14,7 +14,6 @@ use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
 use anyhow::Context as _;
 use assistant_tool::ToolUseStatus;
 use audio::{Audio, Sound};
-use cloud_llm_client::CompletionIntent;
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
 use editor::scroll::Autoscroll;
@@ -53,6 +52,7 @@ use util::ResultExt as _;
 use util::markdown::MarkdownCodeBlock;
 use workspace::{CollaboratorId, Workspace};
 use zed_actions::assistant::OpenRulesLibrary;
+use zed_llm_client::CompletionIntent;

 const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
 const EDIT_PREVIOUS_MESSAGE_MIN_LINES: usize = 1;
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -7,7 +7,6 @@ use std::{sync::Arc, time::Duration};

 use agent_settings::AgentSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
-use cloud_llm_client::Plan;
 use collections::HashMap;
 use context_server::ContextServerId;
 use extension::ExtensionManifest;
@@ -26,6 +25,7 @@ use project::{
    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
    project_settings::{ContextServerSettings, ProjectSettings},
 };
+use proto::Plan;
 use settings::{Settings, update_settings_file};
 use ui::{
    Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
@@ -180,18 +180,11 @@ impl AgentConfiguration {
        let current_plan = if is_zed_provider {
            self.workspace
                .upgrade()
-                .and_then(|workspace| workspace.read(cx).user_store().read(cx).plan())
+                .and_then(|workspace| workspace.read(cx).user_store().read(cx).current_plan())
        } else {
            None
        };

-        let is_signed_in = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                workspace.client().status().borrow().is_connected()
-            })
-            .unwrap_or(false);
-
        v_flex()
            .w_full()
            .when(is_expanded, |this| this.mb_2())
@@ -240,8 +233,8 @@ impl AgentConfiguration {
                                                    .size(LabelSize::Large),
                                            )
                                            .map(|this| {
-                                                if is_zed_provider && is_signed_in {
-                                                    this.child(
+                                                if is_zed_provider {
+                                                    this.gap_2().child(
                                                        self.render_zed_plan_info(current_plan, cx),
                                                    )
                                                } else {
@@ -404,11 +397,9 @@ impl AgentConfiguration {
        let fs = self.fs.clone();

        SwitchField::new(
-            "always-allow-tool-actions-switch",
-            "Allow running commands without asking for confirmation",
-            Some(
-                "The agent can perform potentially destructive actions without asking for your confirmation.".into(),
-            ),
+            "single-file-review",
+            "Enable single-file agent reviews",
+            "Agent edits are also displayed in single-file editors for review.",
            always_allow_tool_actions,
            move |state, _window, cx| {
                let allow = state == &ToggleState::Selected;
@@ -426,7 +417,7 @@ impl AgentConfiguration {
        SwitchField::new(
            "single-file-review",
            "Enable single-file agent reviews",
-            Some("Agent edits are also displayed in single-file editors for review.".into()),
+            "Agent edits are also displayed in single-file editors for review.",
            single_file_review,
            move |state, _window, cx| {
                let allow = state == &ToggleState::Selected;
@@ -444,9 +435,7 @@ impl AgentConfiguration {
        SwitchField::new(
            "sound-notification",
            "Play sound when finished generating",
-            Some(
-                "Hear a notification sound when the agent is done generating changes or needs your input.".into(),
-            ),
+            "Hear a notification sound when the agent is done generating changes or needs your input.",
            play_sound_when_agent_done,
            move |state, _window, cx| {
                let allow = state == &ToggleState::Selected;
@@ -464,9 +453,7 @@ impl AgentConfiguration {
        SwitchField::new(
            "modifier-send",
            "Use modifier to submit a message",
-            Some(
-                "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.".into(),
-            ),
+            "Make a modifier (cmd-enter on macOS, ctrl-enter on Linux) required to send messages.",
            use_modifier_to_send,
            move |state, _window, cx| {
                let allow = state == &ToggleState::Selected;
@@ -508,7 +495,7 @@ impl AgentConfiguration {
                .blend(cx.theme().colors().text_accent.opacity(0.2));

            let (plan_name, label_color, bg_color) = match plan {
-                Plan::ZedFree => ("Free", Color::Default, free_chip_bg),
+                Plan::Free => ("Free", Color::Default, free_chip_bg),
                Plan::ZedProTrial => ("Pro Trial", Color::Accent, pro_chip_bg),
                Plan::ZedPro => ("Pro", Color::Accent, pro_chip_bg),
            };
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -30,7 +30,7 @@ use std::{
    sync::Arc,
    time::Duration,
 };
-use ui::{ButtonSize, IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
+use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
 use util::ResultExt;
 use workspace::{
    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
@@ -791,32 +791,22 @@ fn render_diff_hunk_controls(
 ) -> AnyElement {
    let editor = editor.clone();

-    // Get controls positioning from editor state
-    let controls_above = editor.read(cx).diff_hunk_controls_above();
-
-    let mut container = h_flex()
+    h_flex()
        .h(line_height)
        .mr_0p5()
        .gap_1()
        .px_0p5()
-        .py_0p5()
+        .pb_1()
        .border_x_1()
+        .border_b_1()
        .border_color(cx.theme().colors().border)
+        .rounded_b_md()
        .bg(cx.theme().colors().editor_background)
        .gap_1()
        .block_mouse_except_scroll()
-        .shadow_md();
-
-    if controls_above {
-        container = container.border_t_1().rounded_t_md();
-    } else {
-        container = container.border_b_1().rounded_b_md();
-    }
-
-    container
+        .shadow_md()
        .children(vec![
            Button::new(("reject", row as u64), "Reject")
-                .size(ButtonSize::Compact)
                .disabled(is_created_file)
                .key_binding(
                    KeyBinding::for_action_in(
@@ -845,7 +835,6 @@ fn render_diff_hunk_controls(
                    }
                }),
            Button::new(("keep", row as u64), "Keep")
-                .size(ButtonSize::Compact)
                .key_binding(
                    KeyBinding::for_action_in(&Keep, &editor.read(cx).focus_handle(cx), window, cx)
                        .map(|kb| kb.size(rems_from_px(12.))),
@@ -1532,9 +1521,6 @@ impl AgentDiff {
                    self.update_reviewing_editors(workspace, window, cx);
                }
            }
-            AcpThreadEvent::Stopped
-            | AcpThreadEvent::ToolAuthorizationRequired
-            | AcpThreadEvent::Error => {}
        }
    }

--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -44,7 +44,6 @@ use assistant_context::{AssistantContext, ContextEvent, ContextSummary};
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 use client::{DisableAiSettings, UserStore, zed_urls};
-use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
 use feature_flags::{self, FeatureFlagAppExt};
 use fs::Fs;
@@ -60,6 +59,7 @@ use language_model::{
 };
 use project::{Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
+use proto::Plan;
 use rules_library::{RulesLibrary, open_rules_library};
 use search::{BufferSearchBar, buffer_search};
 use settings::{Settings, update_settings_file};
@@ -77,9 +77,10 @@ use workspace::{
 };
 use zed_actions::{
    DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
-    agent::{OpenOnboardingModal, OpenSettings, ResetOnboarding, ToggleModelSelector},
+    agent::{OpenConfiguration, OpenOnboardingModal, ResetOnboarding, ToggleModelSelector},
    assistant::{OpenRulesLibrary, ToggleFocus},
 };
+use zed_llm_client::{CompletionIntent, UsageLimit};

 const AGENT_PANEL_KEY: &str = "agent_panel";

@@ -104,7 +105,7 @@ pub fn init(cx: &mut App) {
                        panel.update(cx, |panel, cx| panel.open_history(window, cx));
                    }
                })
-                .register_action(|workspace, _: &OpenSettings, window, cx| {
+                .register_action(|workspace, _: &OpenConfiguration, window, cx| {
                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
@@ -563,8 +564,22 @@ impl AgentPanel {
        let inline_assist_context_store =
            cx.new(|_cx| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));

-        let thread_id = thread.read(cx).id().clone();
+        let message_editor = cx.new(|cx| {
+            MessageEditor::new(
+                fs.clone(),
+                workspace.clone(),
+                user_store.clone(),
+                message_editor_context_store.clone(),
+                prompt_store.clone(),
+                thread_store.downgrade(),
+                context_store.downgrade(),
+                thread.clone(),
+                window,
+                cx,
+            )
+        });

+        let thread_id = thread.read(cx).id().clone();
        let history_store = cx.new(|cx| {
            HistoryStore::new(
                thread_store.clone(),
@@ -574,21 +589,6 @@ impl AgentPanel {
            )
        });

-        let message_editor = cx.new(|cx| {
-            MessageEditor::new(
-                fs.clone(),
-                workspace.clone(),
-                message_editor_context_store.clone(),
-                prompt_store.clone(),
-                thread_store.downgrade(),
-                context_store.downgrade(),
-                Some(history_store.downgrade()),
-                thread.clone(),
-                window,
-                cx,
-            )
-        });
-
        cx.observe(&history_store, |_, _, cx| cx.notify()).detach();

        let active_thread = cx.new(|cx| {
@@ -846,11 +846,11 @@ impl AgentPanel {
            MessageEditor::new(
                self.fs.clone(),
                self.workspace.clone(),
+                self.user_store.clone(),
                context_store.clone(),
                self.prompt_store.clone(),
                self.thread_store.downgrade(),
                self.context_store.downgrade(),
-                Some(self.history_store.downgrade()),
                thread.clone(),
                window,
                cx,
@@ -1119,11 +1119,11 @@ impl AgentPanel {
            MessageEditor::new(
                self.fs.clone(),
                self.workspace.clone(),
+                self.user_store.clone(),
                context_store,
                self.prompt_store.clone(),
                self.thread_store.downgrade(),
                self.context_store.downgrade(),
-                Some(self.history_store.downgrade()),
                thread.clone(),
                window,
                cx,
@@ -1987,20 +1987,6 @@ impl AgentPanel {
                                                );
                                            }),
                                    )
-                                    .item(
-                                        ContextMenuEntry::new("New Codex Thread")
-                                            .icon(IconName::AiOpenAi)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    NewExternalAgentThread {
-                                                        agent: Some(crate::ExternalAgent::Codex),
-                                                    }
-                                                    .boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
                            });
                        menu
                    }))
@@ -2026,69 +2012,65 @@ impl AgentPanel {
            )
            .anchor(Corner::TopRight)
            .with_handle(self.agent_panel_menu_handle.clone())
-            .menu({
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
-                        menu = menu.context(focus_handle.clone());
-                        if let Some(usage) = usage {
-                            menu = menu
-                                .header_with_link("Prompt Usage", "Manage", account_url.clone())
-                                .custom_entry(
-                                    move |_window, cx| {
-                                        let used_percentage = match usage.limit {
-                                            UsageLimit::Limited(limit) => {
-                                                Some((usage.amount as f32 / limit as f32) * 100.)
-                                            }
-                                            UsageLimit::Unlimited => None,
-                                        };
-
-                                        h_flex()
-                                            .flex_1()
-                                            .gap_1p5()
-                                            .children(used_percentage.map(|percent| {
-                                                ProgressBar::new("usage", percent, 100., cx)
-                                            }))
-                                            .child(
-                                                Label::new(match usage.limit {
-                                                    UsageLimit::Limited(limit) => {
-                                                        format!("{} / {limit}", usage.amount)
-                                                    }
-                                                    UsageLimit::Unlimited => {
-                                                        format!("{} / ∞", usage.amount)
-                                                    }
-                                                })
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                            )
-                                            .into_any_element()
-                                    },
-                                    move |_, cx| cx.open_url(&zed_urls::account_url(cx)),
-                                )
-                                .separator()
-                        }
-
+            .menu(move |window, cx| {
+                Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
+                    if let Some(usage) = usage {
                        menu = menu
-                            .header("MCP Servers")
-                            .action(
-                                "View Server Extensions",
-                                Box::new(zed_actions::Extensions {
-                                    category_filter: Some(
-                                        zed_actions::ExtensionCategoryFilter::ContextServers,
-                                    ),
-                                    id: None,
-                                }),
+                            .header_with_link("Prompt Usage", "Manage", account_url.clone())
+                            .custom_entry(
+                                move |_window, cx| {
+                                    let used_percentage = match usage.limit {
+                                        UsageLimit::Limited(limit) => {
+                                            Some((usage.amount as f32 / limit as f32) * 100.)
+                                        }
+                                        UsageLimit::Unlimited => None,
+                                    };
+
+                                    h_flex()
+                                        .flex_1()
+                                        .gap_1p5()
+                                        .children(used_percentage.map(|percent| {
+                                            ProgressBar::new("usage", percent, 100., cx)
+                                        }))
+                                        .child(
+                                            Label::new(match usage.limit {
+                                                UsageLimit::Limited(limit) => {
+                                                    format!("{} / {limit}", usage.amount)
+                                                }
+                                                UsageLimit::Unlimited => {
+                                                    format!("{} / ∞", usage.amount)
+                                                }
+                                            })
+                                            .size(LabelSize::Small)
+                                            .color(Color::Muted),
+                                        )
+                                        .into_any_element()
+                                },
+                                move |_, cx| cx.open_url(&zed_urls::account_url(cx)),
                            )
-                            .action("Add Custom Server…", Box::new(AddContextServer))
-                            .separator();
+                            .separator()
+                    }

-                        menu = menu
-                            .action("Rules…", Box::new(OpenRulesLibrary::default()))
-                            .action("Settings", Box::new(OpenSettings))
-                            .action(zoom_in_label, Box::new(ToggleZoom));
-                        menu
-                    }))
-                }
+                    menu = menu
+                        .header("MCP Servers")
+                        .action(
+                            "View Server Extensions",
+                            Box::new(zed_actions::Extensions {
+                                category_filter: Some(
+                                    zed_actions::ExtensionCategoryFilter::ContextServers,
+                                ),
+                                id: None,
+                            }),
+                        )
+                        .action("Add Custom Server…", Box::new(AddContextServer))
+                        .separator();
+
+                    menu = menu
+                        .action("Rules…", Box::new(OpenRulesLibrary::default()))
+                        .action("Settings", Box::new(OpenConfiguration))
+                        .action(zoom_in_label, Box::new(ToggleZoom));
+                    menu
+                }))
            });

        h_flex()
@@ -2289,10 +2271,10 @@ impl AgentPanel {
            | ActiveView::Configuration => return false,
        }

-        let plan = self.user_store.read(cx).plan();
+        let plan = self.user_store.read(cx).current_plan();
        let has_previous_trial = self.user_store.read(cx).trial_started_at().is_some();

-        matches!(plan, Some(Plan::ZedFree)) && has_previous_trial
+        matches!(plan, Some(Plan::Free)) && has_previous_trial
    }

    fn should_render_onboarding(&self, cx: &mut Context<Self>) -> bool {
@@ -2301,21 +2283,20 @@ impl AgentPanel {
        }

        match &self.active_view {
-            ActiveView::Thread { .. } | ActiveView::TextThread { .. } => {
-                let history_is_empty = self
-                    .history_store
-                    .update(cx, |store, cx| store.recent_entries(1, cx).is_empty());
-
-                let has_configured_non_zed_providers = LanguageModelRegistry::read_global(cx)
-                    .providers()
-                    .iter()
-                    .any(|provider| {
-                        provider.is_authenticated(cx)
-                            && provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
-                    });
-
-                history_is_empty || !has_configured_non_zed_providers
-            }
+            ActiveView::Thread { thread, .. } => thread
+                .read(cx)
+                .thread()
+                .read(cx)
+                .configured_model()
+                .map_or(true, |model| {
+                    model.provider.id() == language_model::ZED_CLOUD_PROVIDER_ID
+                }),
+            ActiveView::TextThread { .. } => LanguageModelRegistry::global(cx)
+                .read(cx)
+                .default_model()
+                .map_or(true, |model| {
+                    model.provider.id() == language_model::ZED_CLOUD_PROVIDER_ID
+                }),
            ActiveView::ExternalAgentThread { .. }
            | ActiveView::History
            | ActiveView::Configuration => false,
@@ -2336,8 +2317,9 @@ impl AgentPanel {

        Some(
            div()
+                .size_full()
                .when(thread_view, |this| {
-                    this.size_full().bg(cx.theme().colors().panel_background)
+                    this.bg(cx.theme().colors().panel_background)
                })
                .when(text_thread_view, |this| {
                    this.bg(cx.theme().colors().editor_background)
@@ -2478,14 +2460,14 @@ impl AgentPanel {
                                                .icon_color(Color::Muted)
                                                .full_width()
                                                .key_binding(KeyBinding::for_action_in(
-                                                    &OpenSettings,
+                                                    &OpenConfiguration,
                                                    &focus_handle,
                                                    window,
                                                    cx,
                                                ))
                                                .on_click(|_event, window, cx| {
                                                    window.dispatch_action(
-                                                        OpenSettings.boxed_clone(),
+                                                        OpenConfiguration.boxed_clone(),
                                                        cx,
                                                    )
                                                }),
@@ -2662,25 +2644,6 @@ impl AgentPanel {
                                                    )
                                                },
                                            ),
-                                        )
-                                        .child(
-                                            NewThreadButton::new(
-                                                "new-codex-thread-btn",
-                                                "New Codex Thread",
-                                                IconName::AiOpenAi,
-                                            )
-                                            .on_click(
-                                                |window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(NewExternalAgentThread {
-                                                            agent: Some(
-                                                                crate::ExternalAgent::Codex,
-                                                            ),
-                                                        }),
-                                                        cx,
-                                                    )
-                                                },
-                                            ),
                                        ),
                                )
                            }),
@@ -2709,11 +2672,16 @@ impl AgentPanel {
                        .style(ButtonStyle::Tinted(ui::TintColor::Warning))
                        .label_size(LabelSize::Small)
                        .key_binding(
-                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, window, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
+                            KeyBinding::for_action_in(
+                                &OpenConfiguration,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                            .map(|kb| kb.size(rems_from_px(12.))),
                        )
                        .on_click(|_event, window, cx| {
-                            window.dispatch_action(OpenSettings.boxed_clone(), cx)
+                            window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
                        }),
                ),
            ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
@@ -2907,7 +2875,7 @@ impl AgentPanel {
    ) -> AnyElement {
        let error_message = match plan {
            Plan::ZedPro => "Upgrade to usage-based billing for more prompts.",
-            Plan::ZedProTrial | Plan::ZedFree => "Upgrade to Zed Pro for more prompts.",
+            Plan::ZedProTrial | Plan::Free => "Upgrade to Zed Pro for more prompts.",
        };

        let icon = Icon::new(IconName::XCircle)
@@ -3217,7 +3185,7 @@ impl Render for AgentPanel {
            .on_action(cx.listener(|this, _: &OpenHistory, window, cx| {
                this.open_history(window, cx);
            }))
-            .on_action(cx.listener(|this, _: &OpenSettings, window, cx| {
+            .on_action(cx.listener(|this, _: &OpenConfiguration, window, cx| {
                this.open_configuration(window, cx);
            }))
            .on_action(cx.listener(Self::open_active_thread_as_markdown))
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -150,7 +150,6 @@ enum ExternalAgent {
    #[default]
    Gemini,
    ClaudeCode,
-    Codex,
 }

 impl ExternalAgent {
@@ -158,7 +157,6 @@ impl ExternalAgent {
        match self {
            ExternalAgent::Gemini => Rc::new(agent_servers::Gemini),
            ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            ExternalAgent::Codex => Rc::new(agent_servers::Codex),
        }
    }
 }
@@ -264,8 +262,6 @@ fn update_command_palette_filter(cx: &mut App) {
        if disable_ai {
            filter.hide_namespace("agent");
            filter.hide_namespace("assistant");
-            filter.hide_namespace("copilot");
-            filter.hide_namespace("supermaven");
            filter.hide_namespace("zed_predict_onboarding");
            filter.hide_namespace("edit_prediction");

@@ -286,7 +282,6 @@ fn update_command_palette_filter(cx: &mut App) {
        } else {
            filter.show_namespace("agent");
            filter.show_namespace("assistant");
-            filter.show_namespace("copilot");
            filter.show_namespace("zed_predict_onboarding");

            filter.show_namespace("edit_prediction");
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -6,7 +6,6 @@ use agent::{
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
-use cloud_llm_client::CompletionIntent;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
 use futures::{
@@ -36,6 +35,7 @@ use std::{
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use zed_llm_client::CompletionIntent;

 pub struct BufferCodegen {
    alternatives: Vec<Entity<CodegenAlternative>>,
--- a/crates/agent_ui/src/debug.rs
+++ b/crates/agent_ui/src/debug.rs
@@ -1,10 +1,10 @@
 #![allow(unused, dead_code)]

 use client::{ModelRequestUsage, RequestUsage};
-use cloud_llm_client::{Plan, UsageLimit};
 use gpui::Global;
 use std::ops::{Deref, DerefMut};
 use ui::prelude::*;
+use zed_llm_client::{Plan, UsageLimit};

 /// Debug only: Used for testing various account states
 ///
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -48,7 +48,7 @@ use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
 use util::{RangeExt, ResultExt, maybe};
 use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
-use zed_actions::agent::OpenSettings;
+use zed_actions::agent::OpenConfiguration;

 pub fn init(
    fs: Arc<dyn Fs>,
@@ -345,7 +345,7 @@ impl InlineAssistant {
                    if let Some(answer) = answer {
                        if answer == 0 {
                            cx.update(|window, cx| {
-                                window.dispatch_action(Box::new(OpenSettings), cx)
+                                window.dispatch_action(Box::new(OpenConfiguration), cx)
                            })
                            .ok();
                        }
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -576,7 +576,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
                        .icon_position(IconPosition::Start)
                        .on_click(|_, window, cx| {
                            window.dispatch_action(
-                                zed_actions::agent::OpenSettings.boxed_clone(),
+                                zed_actions::agent::OpenConfiguration.boxed_clone(),
                                cx,
                            );
                        }),
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -9,7 +9,6 @@ use crate::ui::{
    MaxModeTooltip,
    preview::{AgentPreview, UsageCallout},
 };
-use agent::history_store::HistoryStore;
 use agent::{
    context::{AgentContextKey, ContextLoadResult, load_context},
    context_store::ContextStoreEvent,
@@ -17,7 +16,7 @@ use agent::{
 use agent_settings::{AgentSettings, CompletionMode};
 use ai_onboarding::ApiKeysWithProviders;
 use buffer_diff::BufferDiff;
-use cloud_llm_client::CompletionIntent;
+use client::UserStore;
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
 use editor::display_map::CreaseId;
@@ -30,9 +29,8 @@ use fs::Fs;
 use futures::future::Shared;
 use futures::{FutureExt as _, future};
 use gpui::{
-    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, IntoElement, KeyContext,
-    Subscription, Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point,
-    pulsating_between,
+    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, KeyContext, Subscription, Task,
+    TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
 use language::{Buffer, Language, Point};
 use language_model::{
@@ -42,6 +40,7 @@ use language_model::{
 use multi_buffer;
 use project::Project;
 use prompt_store::PromptStore;
+use proto::Plan;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
@@ -52,6 +51,7 @@ use util::ResultExt as _;
 use workspace::{CollaboratorId, Workspace};
 use zed_actions::agent::Chat;
 use zed_actions::agent::ToggleModelSelector;
+use zed_llm_client::CompletionIntent;

 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
@@ -77,9 +77,9 @@ pub struct MessageEditor {
    editor: Entity<Editor>,
    workspace: WeakEntity<Workspace>,
    project: Entity<Project>,
+    user_store: Entity<UserStore>,
    context_store: Entity<ContextStore>,
    prompt_store: Option<Entity<PromptStore>>,
-    history_store: Option<WeakEntity<HistoryStore>>,
    context_strip: Entity<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    model_selector: Entity<AgentModelSelector>,
@@ -156,11 +156,11 @@ impl MessageEditor {
    pub fn new(
        fs: Arc<dyn Fs>,
        workspace: WeakEntity<Workspace>,
+        user_store: Entity<UserStore>,
        context_store: Entity<ContextStore>,
        prompt_store: Option<Entity<PromptStore>>,
        thread_store: WeakEntity<ThreadStore>,
        text_thread_store: WeakEntity<TextThreadStore>,
-        history_store: Option<WeakEntity<HistoryStore>>,
        thread: Entity<Thread>,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -227,12 +227,12 @@ impl MessageEditor {
        Self {
            editor: editor.clone(),
            project: thread.read(cx).project().clone(),
+            user_store,
            thread,
            incompatible_tools_state: incompatible_tools.clone(),
            workspace,
            context_store,
            prompt_store,
-            history_store,
            context_strip,
            context_picker_menu_handle,
            load_context_task: None,
@@ -1282,12 +1282,24 @@ impl MessageEditor {
            return None;
        }

-        let user_store = self.project.read(cx).user_store().read(cx);
-        if user_store.is_usage_based_billing_enabled() {
+        let user_store = self.user_store.read(cx);
+
+        let ubb_enable = user_store
+            .usage_based_billing_enabled()
+            .map_or(false, |enabled| enabled);
+
+        if ubb_enable {
            return None;
        }

-        let plan = user_store.plan().unwrap_or(cloud_llm_client::Plan::ZedFree);
+        let plan = user_store
+            .current_plan()
+            .map(|plan| match plan {
+                Plan::Free => zed_llm_client::Plan::ZedFree,
+                Plan::ZedPro => zed_llm_client::Plan::ZedPro,
+                Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
+            })
+            .unwrap_or(zed_llm_client::Plan::ZedFree);

        let usage = user_store.model_request_usage()?;

@@ -1649,36 +1661,32 @@ impl Render for MessageEditor {

        let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;

-        let has_configured_providers = LanguageModelRegistry::read_global(cx)
-            .providers()
-            .iter()
-            .filter(|provider| {
-                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
-            })
-            .count()
-            > 0;
+        let in_pro_trial = matches!(
+            self.user_store.read(cx).current_plan(),
+            Some(proto::Plan::ZedProTrial)
+        );

-        let is_signed_out = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                workspace.client().status().borrow().is_signed_out()
-            })
-            .unwrap_or(true);
+        let pro_user = matches!(
+            self.user_store.read(cx).current_plan(),
+            Some(proto::Plan::ZedPro)
+        );

-        let has_history = self
-            .history_store
-            .as_ref()
-            .and_then(|hs| hs.update(cx, |hs, cx| hs.entries(cx).len() > 0).ok())
-            .unwrap_or(false)
-            || self
-                .thread
-                .read_with(cx, |thread, _| thread.messages().len() > 0);
+        let configured_providers: Vec<(IconName, SharedString)> =
+            LanguageModelRegistry::read_global(cx)
+                .providers()
+                .iter()
+                .filter(|provider| {
+                    provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
+                })
+                .map(|provider| (provider.icon(), provider.name().0.clone()))
+                .collect();
+        let has_existing_providers = configured_providers.len() > 0;

        v_flex()
            .size_full()
            .bg(cx.theme().colors().panel_background)
            .when(
-                !has_history && is_signed_out && has_configured_providers,
+                has_existing_providers && !in_pro_trial && !pro_user,
                |this| this.child(cx.new(ApiKeysWithProviders::new)),
            )
            .when(changed_buffers.len() > 0, |parent| {
@@ -1752,6 +1760,7 @@ impl AgentPreview for MessageEditor {
    ) -> Option<AnyElement> {
        if let Some(workspace) = workspace.upgrade() {
            let fs = workspace.read(cx).app_state().fs.clone();
+            let user_store = workspace.read(cx).app_state().user_store.clone();
            let project = workspace.read(cx).project().clone();
            let weak_project = project.downgrade();
            let context_store = cx.new(|_cx| ContextStore::new(weak_project, None));
@@ -1764,11 +1773,11 @@ impl AgentPreview for MessageEditor {
                MessageEditor::new(
                    fs,
                    workspace.downgrade(),
+                    user_store,
                    context_store,
                    None,
                    thread_store.downgrade(),
                    text_thread_store.downgrade(),
-                    None,
                    thread,
                    window,
                    cx,
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -10,7 +10,6 @@ use agent::{
 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};
 use fs::Fs;
@@ -28,6 +27,7 @@ use terminal_view::TerminalView;
 use ui::prelude::*;
 use util::ResultExt;
 use workspace::{Toast, Workspace, notifications::NotificationId};
+use zed_llm_client::CompletionIntent;

 pub fn init(
    fs: Arc<dyn Fs>,
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -5,6 +5,7 @@ mod end_trial_upsell;
 mod new_thread_button;
 mod onboarding_modal;
 pub mod preview;
+mod upsell;

 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ b/crates/agent_ui/src/ui/end_trial_upsell.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use ai_onboarding::{AgentPanelOnboardingCard, BulletItem};
 use client::zed_urls;
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
-use ui::{Divider, List, Tooltip, prelude::*};
+use ui::{Divider, List, prelude::*};

 #[derive(IntoElement, RegisterComponent)]
 pub struct EndTrialUpsell {
@@ -33,19 +33,14 @@ impl RenderOnce for EndTrialUpsell {
            )
            .child(
                List::new()
-                    .child(BulletItem::new("500 prompts with Claude models"))
-                    .child(BulletItem::new(
-                        "Unlimited edit predictions with Zeta, our open-source model",
-                    )),
+                    .child(BulletItem::new("500 prompts per month with Claude models"))
+                    .child(BulletItem::new("Unlimited edit predictions")),
            )
            .child(
                Button::new("cta-button", "Upgrade to Zed Pro")
                    .full_width()
                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                    .on_click(move |_, _window, cx| {
-                        telemetry::event!("Upgrade To Pro Clicked", state = "end-of-trial");
-                        cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
-                    }),
+                    .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))),
            );

        let free_section = v_flex()
@@ -60,43 +55,37 @@ impl RenderOnce for EndTrialUpsell {
                            .color(Color::Muted)
                            .buffer_font(cx),
                    )
-                    .child(
-                        Label::new("(Current Plan)")
-                            .size(LabelSize::Small)
-                            .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.6)))
-                            .buffer_font(cx),
-                    )
                    .child(Divider::horizontal()),
            )
            .child(
                List::new()
-                    .child(BulletItem::new("50 prompts with the Claude models"))
-                    .child(BulletItem::new("2,000 accepted edit predictions")),
+                    .child(BulletItem::new(
+                        "50 prompts per month with the Claude models",
+                    ))
+                    .child(BulletItem::new(
+                        "2000 accepted edit predictions using our open-source Zeta model",
+                    )),
+            )
+            .child(
+                Button::new("dismiss-button", "Stay on Free")
+                    .full_width()
+                    .style(ButtonStyle::Outlined)
+                    .on_click({
+                        let callback = self.dismiss_upsell.clone();
+                        move |_, window, cx| callback(window, cx)
+                    }),
            );

        AgentPanelOnboardingCard::new()
-            .child(Headline::new("Your Zed Pro Trial has expired"))
+            .child(Headline::new("Your Zed Pro trial has expired."))
            .child(
                Label::new("You've been automatically reset to the Free plan.")
+                    .size(LabelSize::Small)
                    .color(Color::Muted)
-                    .mb_2(),
+                    .mb_1(),
            )
            .child(pro_section)
            .child(free_section)
-            .child(
-                h_flex().absolute().top_4().right_4().child(
-                    IconButton::new("dismiss_onboarding", IconName::Close)
-                        .icon_size(IconSize::Small)
-                        .tooltip(Tooltip::text("Dismiss"))
-                        .on_click({
-                            let callback = self.dismiss_upsell.clone();
-                            move |_, window, cx| {
-                                telemetry::event!("Banner Dismissed", source = "AI Onboarding");
-                                callback(window, cx)
-                            }
-                        }),
-                ),
-            )
    }
 }

--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -1,8 +1,8 @@
 use client::{ModelRequestUsage, RequestUsage, zed_urls};
-use cloud_llm_client::{Plan, UsageLimit};
 use component::{empty_example, example_group_with_title, single_example};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
 use ui::{Callout, prelude::*};
+use zed_llm_client::{Plan, UsageLimit};

 #[derive(IntoElement, RegisterComponent)]
 pub struct UsageCallout {
--- a/crates/agent_ui/src/ui/upsell.rs
+++ b/crates/agent_ui/src/ui/upsell.rs
@@ -0,0 +1,163 @@
+use component::{Component, ComponentScope, single_example};
+use gpui::{
+    AnyElement, App, ClickEvent, IntoElement, ParentElement, RenderOnce, SharedString, Styled,
+    Window,
+};
+use theme::ActiveTheme;
+use ui::{
+    Button, ButtonCommon, ButtonStyle, Checkbox, Clickable, Color, Label, LabelCommon,
+    RegisterComponent, ToggleState, h_flex, v_flex,
+};
+
+/// A component that displays an upsell message with a call-to-action button
+///
+/// # Example
+/// ```
+/// let upsell = Upsell::new(
+///     "Upgrade to Zed Pro",
+///     "Get access to advanced AI features and more",
+///     "Upgrade Now",
+///     Box::new(|_, _window, cx| {
+///         cx.open_url("https://zed.dev/pricing");
+///     }),
+///     Box::new(|_, _window, cx| {
+///         // Handle dismiss
+///     }),
+///     Box::new(|checked, window, cx| {
+///         // Handle don't show again
+///     }),
+/// );
+/// ```
+#[derive(IntoElement, RegisterComponent)]
+pub struct Upsell {
+    title: SharedString,
+    message: SharedString,
+    cta_text: SharedString,
+    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
+    on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
+    on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App) + 'static>,
+}
+
+impl Upsell {
+    /// Create a new upsell component
+    pub fn new(
+        title: impl Into<SharedString>,
+        message: impl Into<SharedString>,
+        cta_text: impl Into<SharedString>,
+        on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
+        on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
+        on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App) + 'static>,
+    ) -> Self {
+        Self {
+            title: title.into(),
+            message: message.into(),
+            cta_text: cta_text.into(),
+            on_click,
+            on_dismiss,
+            on_dont_show_again,
+        }
+    }
+}
+
+impl RenderOnce for Upsell {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        v_flex()
+            .w_full()
+            .p_4()
+            .gap_3()
+            .bg(cx.theme().colors().surface_background)
+            .rounded_md()
+            .border_1()
+            .border_color(cx.theme().colors().border)
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        Label::new(self.title)
+                            .size(ui::LabelSize::Large)
+                            .weight(gpui::FontWeight::BOLD),
+                    )
+                    .child(Label::new(self.message).color(Color::Muted)),
+            )
+            .child(
+                h_flex()
+                    .w_full()
+                    .justify_between()
+                    .items_center()
+                    .child(
+                        h_flex()
+                            .items_center()
+                            .gap_1()
+                            .child(
+                                Checkbox::new("dont-show-again", ToggleState::Unselected).on_click(
+                                    move |_, window, cx| {
+                                        (self.on_dont_show_again)(true, window, cx);
+                                    },
+                                ),
+                            )
+                            .child(
+                                Label::new("Don't show again")
+                                    .color(Color::Muted)
+                                    .size(ui::LabelSize::Small),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .child(
+                                Button::new("dismiss-button", "No Thanks")
+                                    .style(ButtonStyle::Subtle)
+                                    .on_click(self.on_dismiss),
+                            )
+                            .child(
+                                Button::new("cta-button", self.cta_text)
+                                    .style(ButtonStyle::Filled)
+                                    .on_click(self.on_click),
+                            ),
+                    ),
+            )
+    }
+}
+
+impl Component for Upsell {
+    fn scope() -> ComponentScope {
+        ComponentScope::Agent
+    }
+
+    fn name() -> &'static str {
+        "Upsell"
+    }
+
+    fn description() -> Option<&'static str> {
+        Some("A promotional component that displays a message with a call-to-action.")
+    }
+
+    fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
+        let examples = vec![
+            single_example(
+                "Default",
+                Upsell::new(
+                    "Upgrade to Zed Pro",
+                    "Get unlimited access to AI features and more with Zed Pro. Unlock advanced AI capabilities and other premium features.",
+                    "Upgrade Now",
+                    Box::new(|_, _, _| {}),
+                    Box::new(|_, _, _| {}),
+                    Box::new(|_, _, _| {}),
+                ).render(window, cx).into_any_element(),
+            ),
+            single_example(
+                "Short Message",
+                Upsell::new(
+                    "Try Zed Pro for free",
+                    "Start your 7-day trial today.",
+                    "Start Trial",
+                    Box::new(|_, _, _| {}),
+                    Box::new(|_, _, _| {}),
+                    Box::new(|_, _, _| {}),
+                ).render(window, cx).into_any_element(),
+            ),
+        ];
+
+        Some(v_flex().gap_4().children(examples).into_any_element())
+    }
+}
--- a/crates/ai_onboarding/Cargo.toml
+++ b/crates/ai_onboarding/Cargo.toml
@@ -16,10 +16,10 @@ default = []

 [dependencies]
 client.workspace = true
-cloud_llm_client.workspace = true
 component.workspace = true
 gpui.workspace = true
 language_model.workspace = true
+proto.workspace = true
 serde.workspace = true
 smallvec.workspace = true
 telemetry.workspace = true
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
@@ -136,7 +136,10 @@ impl RenderOnce for ApiKeysWithoutProviders {
                    .full_width()
                    .style(ButtonStyle::Outlined)
                    .on_click(move |_, window, cx| {
-                        window.dispatch_action(zed_actions::agent::OpenSettings.boxed_clone(), cx);
+                        window.dispatch_action(
+                            zed_actions::agent::OpenConfiguration.boxed_clone(),
+                            cx,
+                        );
                    }),
            )
    }
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;

 use client::{Client, UserStore};
-use cloud_llm_client::Plan;
 use gpui::{Entity, IntoElement, ParentElement};
 use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
 use ui::prelude::*;
@@ -57,8 +56,10 @@ impl AgentPanelOnboarding {

 impl Render for AgentPanelOnboarding {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let enrolled_in_trial = self.user_store.read(cx).plan() == Some(Plan::ZedProTrial);
-        let is_pro_user = self.user_store.read(cx).plan() == Some(Plan::ZedPro);
+        let enrolled_in_trial = matches!(
+            self.user_store.read(cx).current_plan(),
+            Some(proto::Plan::ZedProTrial)
+        );

        AgentPanelOnboardingCard::new()
            .child(
@@ -74,7 +75,7 @@ impl Render for AgentPanelOnboarding {
                }),
            )
            .map(|this| {
-                if enrolled_in_trial || is_pro_user || self.configured_providers.len() >= 1 {
+                if enrolled_in_trial || self.configured_providers.len() >= 1 {
                    this
                } else {
                    this.child(ApiKeysWithoutProviders::new())
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@@ -1,15 +1,12 @@
 mod agent_api_keys_onboarding;
 mod agent_panel_onboarding_card;
 mod agent_panel_onboarding_content;
-mod ai_upsell_card;
 mod edit_prediction_onboarding_content;
 mod young_account_banner;

 pub use agent_api_keys_onboarding::{ApiKeysWithProviders, ApiKeysWithoutProviders};
 pub use agent_panel_onboarding_card::AgentPanelOnboardingCard;
 pub use agent_panel_onboarding_content::AgentPanelOnboarding;
-pub use ai_upsell_card::AiUpsellCard;
-use cloud_llm_client::Plan;
 pub use edit_prediction_onboarding_content::EditPredictionOnboarding;
 pub use young_account_banner::YoungAccountBanner;

@@ -19,7 +16,6 @@ use client::{Client, UserStore, zed_urls};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement, SharedString};
 use ui::{Divider, List, ListItem, RegisterComponent, TintColor, Tooltip, prelude::*};

-#[derive(IntoElement)]
 pub struct BulletItem {
    label: SharedString,
 }
@@ -32,32 +28,22 @@ impl BulletItem {
    }
 }

-impl RenderOnce for BulletItem {
-    fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let line_height = 0.85 * window.line_height();
+impl IntoElement for BulletItem {
+    type Element = AnyElement;

+    fn into_element(self) -> Self::Element {
        ListItem::new("list-item")
            .selectable(false)
-            .child(
-                h_flex()
-                    .w_full()
-                    .min_w_0()
-                    .gap_1()
-                    .items_start()
-                    .child(
-                        h_flex().h(line_height).justify_center().child(
-                            Icon::new(IconName::Dash)
-                                .size(IconSize::XSmall)
-                                .color(Color::Hidden),
-                        ),
-                    )
-                    .child(div().w_full().min_w_0().child(Label::new(self.label))),
+            .start_slot(
+                Icon::new(IconName::Dash)
+                    .size(IconSize::XSmall)
+                    .color(Color::Hidden),
            )
+            .child(div().w_full().child(Label::new(self.label)))
            .into_any_element()
    }
 }

-#[derive(PartialEq)]
 pub enum SignInStatus {
    SignedIn,
    SigningIn,
@@ -80,7 +66,7 @@ impl From<client::Status> for SignInStatus {
 pub struct ZedAiOnboarding {
    pub sign_in_status: SignInStatus,
    pub has_accepted_terms_of_service: bool,
-    pub plan: Option<Plan>,
+    pub plan: Option<proto::Plan>,
    pub account_too_young: bool,
    pub continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
@@ -100,8 +86,8 @@ impl ZedAiOnboarding {

        Self {
            sign_in_status: status.into(),
-            has_accepted_terms_of_service: store.has_accepted_terms_of_service(),
-            plan: store.plan(),
+            has_accepted_terms_of_service: store.current_user_has_accepted_terms().unwrap_or(false),
+            plan: store.current_plan(),
            account_too_young: store.account_too_young(),
            continue_with_zed_ai,
            accept_terms_of_service: Arc::new({
@@ -114,9 +100,11 @@ impl ZedAiOnboarding {
            sign_in: Arc::new(move |_window, cx| {
                cx.spawn({
                    let client = client.clone();
-                    async move |cx| client.sign_in_with_optional_connect(true, cx).await
+                    async move |cx| {
+                        client.authenticate_and_connect(true, cx).await;
+                    }
                })
-                .detach_and_log_err(cx);
+                .detach();
            }),
            dismiss_onboarding: None,
        }
@@ -385,9 +373,7 @@ impl ZedAiOnboarding {
            .child(
                List::new()
                    .child(BulletItem::new("500 prompts with Claude models"))
-                    .child(BulletItem::new(
-                        "Unlimited edit predictions with Zeta, our open-source model",
-                    )),
+                    .child(BulletItem::new("Unlimited edit predictions")),
            )
            .child(
                Button::new("pro", "Continue with Zed Pro")
@@ -410,9 +396,9 @@ impl RenderOnce for ZedAiOnboarding {
        if matches!(self.sign_in_status, SignInStatus::SignedIn) {
            if self.has_accepted_terms_of_service {
                match self.plan {
-                    None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                    Some(Plan::ZedProTrial) => self.render_trial_state(cx),
-                    Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
+                    None | Some(proto::Plan::Free) => self.render_free_plan_state(cx),
+                    Some(proto::Plan::ZedProTrial) => self.render_trial_state(cx),
+                    Some(proto::Plan::ZedPro) => self.render_pro_plan_state(cx),
                }
            } else {
                self.render_accept_terms_of_service()
@@ -432,7 +418,7 @@ impl Component for ZedAiOnboarding {
        fn onboarding(
            sign_in_status: SignInStatus,
            has_accepted_terms_of_service: bool,
-            plan: Option<Plan>,
+            plan: Option<proto::Plan>,
            account_too_young: bool,
        ) -> AnyElement {
            ZedAiOnboarding {
@@ -467,15 +453,25 @@ impl Component for ZedAiOnboarding {
                    ),
                    single_example(
                        "Free Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedFree), false),
+                        onboarding(SignInStatus::SignedIn, true, Some(proto::Plan::Free), false),
                    ),
                    single_example(
                        "Pro Trial",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedProTrial), false),
+                        onboarding(
+                            SignInStatus::SignedIn,
+                            true,
+                            Some(proto::Plan::ZedProTrial),
+                            false,
+                        ),
                    ),
                    single_example(
                        "Pro Plan",
-                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedPro), false),
+                        onboarding(
+                            SignInStatus::SignedIn,
+                            true,
+                            Some(proto::Plan::ZedPro),
+                            false,
+                        ),
                    ),
                ])
                .into_any_element(),
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -1,212 +0,0 @@
-use std::sync::Arc;
-
-use client::{Client, zed_urls};
-use cloud_llm_client::Plan;
-use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
-use ui::{Divider, List, Vector, VectorName, prelude::*};
-
-use crate::{BulletItem, SignInStatus};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct AiUpsellCard {
-    pub sign_in_status: SignInStatus,
-    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub user_plan: Option<Plan>,
-}
-
-impl AiUpsellCard {
-    pub fn new(client: Arc<Client>, user_plan: Option<Plan>) -> Self {
-        let status = *client.status().borrow();
-
-        Self {
-            user_plan,
-            sign_in_status: status.into(),
-            sign_in: Arc::new(move |_window, cx| {
-                cx.spawn({
-                    let client = client.clone();
-                    async move |cx| client.sign_in_with_optional_connect(true, cx).await
-                })
-                .detach_and_log_err(cx);
-            }),
-        }
-    }
-}
-
-impl RenderOnce for AiUpsellCard {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let pro_section = v_flex()
-            .flex_grow()
-            .w_full()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Pro")
-                            .size(LabelSize::Small)
-                            .color(Color::Accent)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(
-                List::new()
-                    .child(BulletItem::new("500 prompts with Claude models"))
-                    .child(BulletItem::new(
-                        "Unlimited edit predictions with Zeta, our open-source model",
-                    )),
-            );
-
-        let free_section = v_flex()
-            .flex_grow()
-            .w_full()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Free")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(
-                List::new()
-                    .child(BulletItem::new("50 prompts with Claude models"))
-                    .child(BulletItem::new("2,000 accepted edit predictions")),
-            );
-
-        let grid_bg = h_flex().absolute().inset_0().w_full().h(px(240.)).child(
-            Vector::new(VectorName::Grid, rems_from_px(500.), rems_from_px(240.))
-                .color(Color::Custom(cx.theme().colors().border.opacity(0.05))),
-        );
-
-        let gradient_bg = div()
-            .absolute()
-            .inset_0()
-            .size_full()
-            .bg(gpui::linear_gradient(
-                180.,
-                gpui::linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.8),
-                    0.,
-                ),
-                gpui::linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.),
-                    0.8,
-                ),
-            ));
-
-        const DESCRIPTION: &str = "Zed offers a complete agentic experience, with robust editing and reviewing features to collaborate with AI.";
-
-        let footer_buttons = match self.sign_in_status {
-            SignInStatus::SignedIn => v_flex()
-                .items_center()
-                .gap_1()
-                .child(
-                    Button::new("sign_in", "Start 14-day Free Pro Trial")
-                        .full_width()
-                        .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                        .on_click(move |_, _window, cx| {
-                            telemetry::event!("Start Trial Clicked", state = "post-sign-in");
-                            cx.open_url(&zed_urls::start_trial_url(cx))
-                        }),
-                )
-                .child(
-                    Label::new("No credit card required")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-            _ => Button::new("sign_in", "Sign In")
-                .full_width()
-                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                .on_click({
-                    let callback = self.sign_in.clone();
-                    move |_, window, cx| {
-                        telemetry::event!("Start Trial Clicked", state = "pre-sign-in");
-                        callback(window, cx)
-                    }
-                })
-                .into_any_element(),
-        };
-
-        v_flex()
-            .relative()
-            .p_4()
-            .pt_3()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .rounded_lg()
-            .overflow_hidden()
-            .child(grid_bg)
-            .child(gradient_bg)
-            .child(Label::new("Try Zed AI").size(LabelSize::Large))
-            .child(
-                div()
-                    .max_w_3_4()
-                    .mb_2()
-                    .child(Label::new(DESCRIPTION).color(Color::Muted)),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .mt_1p5()
-                    .mb_2p5()
-                    .items_start()
-                    .gap_6()
-                    .child(free_section)
-                    .child(pro_section),
-            )
-            .child(footer_buttons)
-    }
-}
-
-impl Component for AiUpsellCard {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn name() -> &'static str {
-        "AI Upsell Card"
-    }
-
-    fn sort_name() -> &'static str {
-        "AI Upsell Card"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A card presenting the Zed AI product during user's first-open onboarding flow.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .p_4()
-                .gap_4()
-                .children(vec![example_group(vec![
-                    single_example(
-                        "Signed Out State",
-                        AiUpsellCard {
-                            sign_in_status: SignInStatus::SignedOut,
-                            sign_in: Arc::new(|_, _| {}),
-                            user_plan: None,
-                        }
-                        .into_any_element(),
-                    ),
-                    single_example(
-                        "Signed In State",
-                        AiUpsellCard {
-                            sign_in_status: SignInStatus::SignedIn,
-                            sign_in: Arc::new(|_, _| {}),
-                            user_plan: None,
-                        }
-                        .into_any_element(),
-                    ),
-                ])])
-                .into_any_element(),
-        )
-    }
-}
--- a/crates/assistant_context/Cargo.toml
+++ b/crates/assistant_context/Cargo.toml
@@ -19,7 +19,6 @@ assistant_slash_commands.workspace = true
 chrono.workspace = true
 client.workspace = true
 clock.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 context_server.workspace = true
 fs.workspace = true
@@ -49,6 +48,7 @@ util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
+zed_llm_client.workspace = true

 [dev-dependencies]
 indoc.workspace = true
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -11,7 +11,6 @@ use assistant_slash_command::{
 use assistant_slash_commands::FileCommandMetadata;
 use client::{self, Client, proto, telemetry::Telemetry};
 use clock::ReplicaId;
-use cloud_llm_client::CompletionIntent;
 use collections::{HashMap, HashSet};
 use fs::{Fs, RenameOptions};
 use futures::{FutureExt, StreamExt, future::Shared};
@@ -47,6 +46,7 @@ use text::{BufferSnapshot, ToPoint};
 use ui::IconName;
 use util::{ResultExt, TryFutureExt, post_inc};
 use uuid::Uuid;
+use zed_llm_client::CompletionIntent;

 pub use crate::context_store::*;

--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -767,11 +767,6 @@ impl ContextStore {
    fn reload(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        let fs = self.fs.clone();
        cx.spawn(async move |this, cx| {
-            pub static ZED_STATELESS: LazyLock<bool> =
-                LazyLock::new(|| std::env::var("ZED_STATELESS").map_or(false, |v| !v.is_empty()));
-            if *ZED_STATELESS {
-                return Ok(());
-            }
            fs.create_dir(contexts_dir()).await?;

            let mut paths = fs.read_dir(contexts_dir()).await?;
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -216,12 +216,7 @@ pub trait Tool: 'static + Send + Sync {

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

    /// Returns true if the tool may perform edits.
    fn may_perform_edits(&self) -> bool;
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -375,12 +375,7 @@ mod tests {
            false
        }

-        fn needs_confirmation(
-            &self,
-            _input: &serde_json::Value,
-            _project: &Entity<Project>,
-            _cx: &App,
-        ) -> bool {
+        fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
            true
        }

--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -21,11 +21,9 @@ assistant_tool.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 client.workspace = true
-cloud_llm_client.workspace = true
 collections.workspace = true
 component.workspace = true
 derive_more.workspace = true
-diffy = "0.4.2"
 editor.workspace = true
 feature_flags.workspace = true
 futures.workspace = true
@@ -65,6 +63,8 @@ web_search.workspace = true
 which.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
+zed_llm_client.workspace = true
+diffy = "0.4.2"

 [dev-dependencies]
 lsp = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -44,7 +44,7 @@ impl Tool for CopyPathTool {
        "copy_path".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -37,7 +37,7 @@ impl Tool for CreateDirectoryTool {
        include_str!("./create_directory_tool/description.md").into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -33,7 +33,7 @@ impl Tool for DeletePathTool {
        "delete_path".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -46,7 +46,7 @@ impl Tool for DiagnosticsTool {
        "diagnostics".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -7,7 +7,6 @@ mod streaming_fuzzy_matcher;
 use crate::{Template, Templates};
 use anyhow::Result;
 use assistant_tool::ActionLog;
-use cloud_llm_client::CompletionIntent;
 use create_file_parser::{CreateFileParser, CreateFileParserEvent};
 pub use edit_parser::EditFormat;
 use edit_parser::{EditParser, EditParserEvent, EditParserMetrics};
@@ -30,6 +29,7 @@ use std::{cmp, iter, mem, ops::Range, path::PathBuf, pin::Pin, sync::Arc, task::
 use streaming_diff::{CharOperation, StreamingDiff};
 use streaming_fuzzy_matcher::StreamingFuzzyMatcher;
 use util::debug_panic;
+use zed_llm_client::CompletionIntent;

 #[derive(Serialize)]
 struct CreateFilePromptTemplate {
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -25,7 +25,6 @@ use language::{
 };
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use paths;
 use project::{
    Project, ProjectPath,
    lsp_store::{FormatTrigger, LspFormatTarget},
@@ -127,47 +126,8 @@ impl Tool for EditFileTool {
        "edit_file".into()
    }

-    fn needs_confirmation(
-        &self,
-        input: &serde_json::Value,
-        project: &Entity<Project>,
-        cx: &App,
-    ) -> bool {
-        if agent_settings::AgentSettings::get_global(cx).always_allow_tool_actions {
-            return false;
-        }
-
-        let Ok(input) = serde_json::from_value::<EditFileToolInput>(input.clone()) else {
-            // If it's not valid JSON, it's going to error and confirming won't do anything.
-            return false;
-        };
-
-        // If any path component matches the local settings folder, then this could affect
-        // the editor in ways beyond the project source, so prompt.
-        let local_settings_folder = paths::local_settings_folder_relative_path();
-        let path = Path::new(&input.path);
-        if path
-            .components()
-            .any(|component| component.as_os_str() == local_settings_folder.as_os_str())
-        {
-            return true;
-        }
-
-        // It's also possible that the global config dir is configured to be inside the project,
-        // so check for that edge case too.
-        if let Ok(canonical_path) = std::fs::canonicalize(&input.path) {
-            if canonical_path.starts_with(paths::config_dir()) {
-                return true;
-            }
-        }
-
-        // Check if path is inside the global config directory
-        // First check if it's already inside project - if not, try to canonicalize
-        let project_path = project.read(cx).find_project_path(&input.path, cx);
-
-        // If the path is inside the project, and it's not one of the above edge cases,
-        // then no confirmation is necessary. Otherwise, confirmation is necessary.
-        project_path.is_none()
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
    }

    fn may_perform_edits(&self) -> bool {
@@ -188,25 +148,7 @@ impl Tool for EditFileTool {

    fn ui_text(&self, input: &serde_json::Value) -> String {
        match serde_json::from_value::<EditFileToolInput>(input.clone()) {
-            Ok(input) => {
-                let path = Path::new(&input.path);
-                let mut description = input.display_description.clone();
-
-                // Add context about why confirmation may be needed
-                let local_settings_folder = paths::local_settings_folder_relative_path();
-                if path
-                    .components()
-                    .any(|c| c.as_os_str() == local_settings_folder.as_os_str())
-                {
-                    description.push_str(" (local settings)");
-                } else if let Ok(canonical_path) = std::fs::canonicalize(&input.path) {
-                    if canonical_path.starts_with(paths::config_dir()) {
-                        description.push_str(" (global settings)");
-                    }
-                }
-
-                description
-            }
+            Ok(input) => input.display_description,
            Err(_) => "Editing file".to_string(),
        }
    }
@@ -1233,20 +1175,19 @@ async fn build_buffer_diff(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use ::fs::Fs;
    use client::TelemetrySettings;
+    use fs::{FakeFs, Fs};
    use gpui::{TestAppContext, UpdateGlobal};
    use language_model::fake_provider::FakeLanguageModel;
    use serde_json::json;
    use settings::SettingsStore;
-    use std::fs;
    use util::path;

    #[gpui::test]
    async fn test_edit_nonexistent_file(cx: &mut TestAppContext) {
        init_test(cx);

-        let fs = project::FakeFs::new(cx.executor());
+        let fs = FakeFs::new(cx.executor());
        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
@@ -1336,7 +1277,7 @@ mod tests {
    ) -> anyhow::Result<ProjectPath> {
        init_test(cx);

-        let fs = project::FakeFs::new(cx.executor());
+        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(
            "/root",
            json!({
@@ -1443,21 +1384,6 @@ mod tests {
            cx.set_global(settings_store);
            language::init(cx);
            TelemetrySettings::register(cx);
-            agent_settings::AgentSettings::register(cx);
-            Project::init_settings(cx);
-        });
-    }
-
-    fn init_test_with_config(cx: &mut TestAppContext, data_dir: &Path) {
-        cx.update(|cx| {
-            // Set custom data directory (config will be under data_dir/config)
-            paths::set_custom_data_dir(data_dir.to_str().unwrap());
-
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            TelemetrySettings::register(cx);
-            agent_settings::AgentSettings::register(cx);
            Project::init_settings(cx);
        });
    }
@@ -1466,7 +1392,7 @@ mod tests {
    async fn test_format_on_save(cx: &mut TestAppContext) {
        init_test(cx);

-        let fs = project::FakeFs::new(cx.executor());
+        let fs = FakeFs::new(cx.executor());
        fs.insert_tree("/root", json!({"src": {}})).await;

        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
@@ -1665,7 +1591,7 @@ mod tests {
    async fn test_remove_trailing_whitespace(cx: &mut TestAppContext) {
        init_test(cx);

-        let fs = project::FakeFs::new(cx.executor());
+        let fs = FakeFs::new(cx.executor());
        fs.insert_tree("/root", json!({"src": {}})).await;

        // Create a simple file with trailing whitespace
@@ -1797,641 +1723,4 @@ mod tests {
            "Trailing whitespace should remain when remove_trailing_whitespace_on_save is disabled"
        );
    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({})).await;
-
-        // Test 1: Path with .zed component should require confirmation
-        let input_with_zed = json!({
-            "display_description": "Edit settings",
-            "path": ".zed/settings.json",
-            "mode": "edit"
-        });
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        cx.update(|cx| {
-            assert!(
-                tool.needs_confirmation(&input_with_zed, &project, cx),
-                "Path with .zed component should require confirmation"
-            );
-        });
-
-        // Test 2: Absolute path should require confirmation
-        let input_absolute = json!({
-            "display_description": "Edit file",
-            "path": "/etc/hosts",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                tool.needs_confirmation(&input_absolute, &project, cx),
-                "Absolute path should require confirmation"
-            );
-        });
-
-        // Test 3: Relative path without .zed should not require confirmation
-        let input_relative = json!({
-            "display_description": "Edit file",
-            "path": "root/src/main.rs",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                !tool.needs_confirmation(&input_relative, &project, cx),
-                "Relative path without .zed should not require confirmation"
-            );
-        });
-
-        // Test 4: Path with .zed in the middle should require confirmation
-        let input_zed_middle = json!({
-            "display_description": "Edit settings",
-            "path": "root/.zed/tasks.json",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                tool.needs_confirmation(&input_zed_middle, &project, cx),
-                "Path with .zed in any component should require confirmation"
-            );
-        });
-
-        // Test 5: When always_allow_tool_actions is enabled, no confirmation needed
-        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);
-
-            assert!(
-                !tool.needs_confirmation(&input_with_zed, &project, cx),
-                "When always_allow_tool_actions is true, no confirmation should be needed"
-            );
-            assert!(
-                !tool.needs_confirmation(&input_absolute, &project, cx),
-                "When always_allow_tool_actions is true, no confirmation should be needed for absolute paths"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_ui_text_shows_correct_context(cx: &mut TestAppContext) {
-        // Set up a custom config directory for testing
-        let temp_dir = tempfile::tempdir().unwrap();
-        init_test_with_config(cx, temp_dir.path());
-
-        let tool = Arc::new(EditFileTool);
-
-        // Test ui_text shows context for various paths
-        let test_cases = vec![
-            (
-                json!({
-                    "display_description": "Update config",
-                    "path": ".zed/settings.json",
-                    "mode": "edit"
-                }),
-                "Update config (local settings)",
-                ".zed path should show local settings context",
-            ),
-            (
-                json!({
-                    "display_description": "Fix bug",
-                    "path": "src/.zed/local.json",
-                    "mode": "edit"
-                }),
-                "Fix bug (local settings)",
-                "Nested .zed path should show local settings context",
-            ),
-            (
-                json!({
-                    "display_description": "Update readme",
-                    "path": "README.md",
-                    "mode": "edit"
-                }),
-                "Update readme",
-                "Normal path should not show additional context",
-            ),
-            (
-                json!({
-                    "display_description": "Edit config",
-                    "path": "config.zed",
-                    "mode": "edit"
-                }),
-                "Edit config",
-                ".zed as extension should not show context",
-            ),
-        ];
-
-        for (input, expected_text, description) in test_cases {
-            cx.update(|_cx| {
-                let ui_text = tool.ui_text(&input);
-                assert_eq!(ui_text, expected_text, "Failed for case: {}", description);
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_outside_project(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-
-        // Create a project in /project directory
-        fs.insert_tree("/project", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        // Test file outside project requires confirmation
-        let input_outside = json!({
-            "display_description": "Edit file",
-            "path": "/outside/file.txt",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                tool.needs_confirmation(&input_outside, &project, cx),
-                "File outside project should require confirmation"
-            );
-        });
-
-        // Test file inside project doesn't require confirmation
-        let input_inside = json!({
-            "display_description": "Edit file",
-            "path": "project/file.txt",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                !tool.needs_confirmation(&input_inside, &project, cx),
-                "File inside project should not require confirmation"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_config_paths(cx: &mut TestAppContext) {
-        // Set up a custom data directory for testing
-        let temp_dir = tempfile::tempdir().unwrap();
-        init_test_with_config(cx, temp_dir.path());
-
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/home/user/myproject", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/home/user/myproject").as_ref()], cx).await;
-
-        // Get the actual local settings folder name
-        let local_settings_folder = paths::local_settings_folder_relative_path();
-
-        // Test various config path patterns
-        let test_cases = vec![
-            (
-                format!("{}/settings.json", local_settings_folder.display()),
-                true,
-                "Top-level local settings file".to_string(),
-            ),
-            (
-                format!(
-                    "myproject/{}/settings.json",
-                    local_settings_folder.display()
-                ),
-                true,
-                "Local settings in project path".to_string(),
-            ),
-            (
-                format!("src/{}/config.toml", local_settings_folder.display()),
-                true,
-                "Local settings in subdirectory".to_string(),
-            ),
-            (
-                ".zed.backup/file.txt".to_string(),
-                true,
-                ".zed.backup is outside project".to_string(),
-            ),
-            (
-                "my.zed/file.txt".to_string(),
-                true,
-                "my.zed is outside project".to_string(),
-            ),
-            (
-                "myproject/src/file.zed".to_string(),
-                false,
-                ".zed as file extension".to_string(),
-            ),
-            (
-                "myproject/normal/path/file.rs".to_string(),
-                false,
-                "Normal file without config paths".to_string(),
-            ),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let input = json!({
-                "display_description": "Edit file",
-                "path": path,
-                "mode": "edit"
-            });
-            cx.update(|cx| {
-                assert_eq!(
-                    tool.needs_confirmation(&input, &project, cx),
-                    should_confirm,
-                    "Failed for case: {} - path: {}",
-                    description,
-                    path
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_global_config(cx: &mut TestAppContext) {
-        // Set up a custom data directory for testing
-        let temp_dir = tempfile::tempdir().unwrap();
-        init_test_with_config(cx, temp_dir.path());
-
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-
-        // Create test files in the global config directory
-        let global_config_dir = paths::config_dir();
-        fs::create_dir_all(&global_config_dir).unwrap();
-        let global_settings_path = global_config_dir.join("settings.json");
-        fs::write(&global_settings_path, "{}").unwrap();
-
-        fs.insert_tree("/project", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        // Test global config paths
-        let test_cases = vec![
-            (
-                global_settings_path.to_str().unwrap().to_string(),
-                true,
-                "Global settings file should require confirmation",
-            ),
-            (
-                global_config_dir
-                    .join("keymap.json")
-                    .to_str()
-                    .unwrap()
-                    .to_string(),
-                true,
-                "Global keymap file should require confirmation",
-            ),
-            (
-                "project/normal_file.rs".to_string(),
-                false,
-                "Normal project file should not require confirmation",
-            ),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let input = json!({
-                "display_description": "Edit file",
-                "path": path,
-                "mode": "edit"
-            });
-            cx.update(|cx| {
-                assert_eq!(
-                    tool.needs_confirmation(&input, &project, cx),
-                    should_confirm,
-                    "Failed for case: {}",
-                    description
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_with_multiple_worktrees(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-
-        // Create multiple worktree directories
-        fs.insert_tree(
-            "/workspace/frontend",
-            json!({
-                "src": {
-                    "main.js": "console.log('frontend');"
-                }
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/workspace/backend",
-            json!({
-                "src": {
-                    "main.rs": "fn main() {}"
-                }
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/workspace/shared",
-            json!({
-                ".zed": {
-                    "settings.json": "{}"
-                }
-            }),
-        )
-        .await;
-
-        // Create project with multiple worktrees
-        let project = Project::test(
-            fs.clone(),
-            [
-                path!("/workspace/frontend").as_ref(),
-                path!("/workspace/backend").as_ref(),
-                path!("/workspace/shared").as_ref(),
-            ],
-            cx,
-        )
-        .await;
-
-        // Test files in different worktrees
-        let test_cases = vec![
-            ("frontend/src/main.js", false, "File in first worktree"),
-            ("backend/src/main.rs", false, "File in second worktree"),
-            (
-                "shared/.zed/settings.json",
-                true,
-                ".zed file in third worktree",
-            ),
-            ("/etc/hosts", true, "Absolute path outside all worktrees"),
-            (
-                "../outside/file.txt",
-                true,
-                "Relative path outside worktrees",
-            ),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let input = json!({
-                "display_description": "Edit file",
-                "path": path,
-                "mode": "edit"
-            });
-            cx.update(|cx| {
-                assert_eq!(
-                    tool.needs_confirmation(&input, &project, cx),
-                    should_confirm,
-                    "Failed for case: {} - path: {}",
-                    description,
-                    path
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_edge_cases(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                ".zed": {
-                    "settings.json": "{}"
-                },
-                "src": {
-                    ".zed": {
-                        "local.json": "{}"
-                    }
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        // Test edge cases
-        let test_cases = vec![
-            // Empty path - find_project_path returns Some for empty paths
-            ("", false, "Empty path is treated as project root"),
-            // Root directory
-            ("/", true, "Root directory should be outside project"),
-            // Parent directory references - find_project_path resolves these
-            (
-                "project/../other",
-                false,
-                "Path with .. is resolved by find_project_path",
-            ),
-            (
-                "project/./src/file.rs",
-                false,
-                "Path with . should work normally",
-            ),
-            // Windows-style paths (if on Windows)
-            #[cfg(target_os = "windows")]
-            ("C:\\Windows\\System32\\hosts", true, "Windows system path"),
-            #[cfg(target_os = "windows")]
-            ("project\\src\\main.rs", false, "Windows-style project path"),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let input = json!({
-                "display_description": "Edit file",
-                "path": path,
-                "mode": "edit"
-            });
-            cx.update(|cx| {
-                assert_eq!(
-                    tool.needs_confirmation(&input, &project, cx),
-                    should_confirm,
-                    "Failed for case: {} - path: {}",
-                    description,
-                    path
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_ui_text_with_all_path_types(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-
-        // Test UI text for various scenarios
-        let test_cases = vec![
-            (
-                json!({
-                    "display_description": "Update config",
-                    "path": ".zed/settings.json",
-                    "mode": "edit"
-                }),
-                "Update config (local settings)",
-                ".zed path should show local settings context",
-            ),
-            (
-                json!({
-                    "display_description": "Fix bug",
-                    "path": "src/.zed/local.json",
-                    "mode": "edit"
-                }),
-                "Fix bug (local settings)",
-                "Nested .zed path should show local settings context",
-            ),
-            (
-                json!({
-                    "display_description": "Update readme",
-                    "path": "README.md",
-                    "mode": "edit"
-                }),
-                "Update readme",
-                "Normal path should not show additional context",
-            ),
-            (
-                json!({
-                    "display_description": "Edit config",
-                    "path": "config.zed",
-                    "mode": "edit"
-                }),
-                "Edit config",
-                ".zed as extension should not show context",
-            ),
-        ];
-
-        for (input, expected_text, description) in test_cases {
-            cx.update(|_cx| {
-                let ui_text = tool.ui_text(&input);
-                assert_eq!(ui_text, expected_text, "Failed for case: {}", description);
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_with_different_modes(cx: &mut TestAppContext) {
-        init_test(cx);
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "existing.txt": "content",
-                ".zed": {
-                    "settings.json": "{}"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        // Test different EditFileMode values
-        let modes = vec![
-            EditFileMode::Edit,
-            EditFileMode::Create,
-            EditFileMode::Overwrite,
-        ];
-
-        for mode in modes {
-            // Test .zed path with different modes
-            let input_zed = json!({
-                "display_description": "Edit settings",
-                "path": "project/.zed/settings.json",
-                "mode": mode
-            });
-            cx.update(|cx| {
-                assert!(
-                    tool.needs_confirmation(&input_zed, &project, cx),
-                    ".zed path should require confirmation regardless of mode: {:?}",
-                    mode
-                );
-            });
-
-            // Test outside path with different modes
-            let input_outside = json!({
-                "display_description": "Edit file",
-                "path": "/outside/file.txt",
-                "mode": mode
-            });
-            cx.update(|cx| {
-                assert!(
-                    tool.needs_confirmation(&input_outside, &project, cx),
-                    "Outside path should require confirmation regardless of mode: {:?}",
-                    mode
-                );
-            });
-
-            // Test normal path with different modes
-            let input_normal = json!({
-                "display_description": "Edit file",
-                "path": "project/normal.txt",
-                "mode": mode
-            });
-            cx.update(|cx| {
-                assert!(
-                    !tool.needs_confirmation(&input_normal, &project, cx),
-                    "Normal path should not require confirmation regardless of mode: {:?}",
-                    mode
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_always_allow_tool_actions_bypasses_all_checks(cx: &mut TestAppContext) {
-        // Set up with custom directories for deterministic testing
-        let temp_dir = tempfile::tempdir().unwrap();
-        init_test_with_config(cx, temp_dir.path());
-
-        let tool = Arc::new(EditFileTool);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-
-        // Enable always_allow_tool_actions
-        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);
-        });
-
-        // Test that all paths that normally require confirmation are bypassed
-        let global_settings_path = paths::config_dir().join("settings.json");
-        fs::create_dir_all(paths::config_dir()).unwrap();
-        fs::write(&global_settings_path, "{}").unwrap();
-
-        let test_cases = vec![
-            ".zed/settings.json",
-            "project/.zed/config.toml",
-            global_settings_path.to_str().unwrap(),
-            "/etc/hosts",
-            "/absolute/path/file.txt",
-            "../outside/project.txt",
-        ];
-
-        for path in test_cases {
-            let input = json!({
-                "display_description": "Edit file",
-                "path": path,
-                "mode": "edit"
-            });
-            cx.update(|cx| {
-                assert!(
-                    !tool.needs_confirmation(&input, &project, cx),
-                    "Path {} should not require confirmation when always_allow_tool_actions is true",
-                    path
-                );
-            });
-        }
-
-        // Disable always_allow_tool_actions and verify confirmation is required again
-        cx.update(|cx| {
-            let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
-            settings.always_allow_tool_actions = false;
-            agent_settings::AgentSettings::override_global(settings, cx);
-        });
-
-        // Verify .zed path requires confirmation again
-        let input = json!({
-            "display_description": "Edit file",
-            "path": ".zed/settings.json",
-            "mode": "edit"
-        });
-        cx.update(|cx| {
-            assert!(
-                tool.needs_confirmation(&input, &project, cx),
-                ".zed path should require confirmation when always_allow_tool_actions is false"
-            );
-        });
-    }
 }
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -116,7 +116,7 @@ impl Tool for FetchTool {
        "fetch".to_string()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -55,7 +55,7 @@ impl Tool for FindPathTool {
        "find_path".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -57,7 +57,7 @@ impl Tool for GrepTool {
        "grep".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -45,7 +45,7 @@ impl Tool for ListDirectoryTool {
        "list_directory".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -42,7 +42,7 @@ impl Tool for MovePathTool {
        "move_path".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -33,7 +33,7 @@ impl Tool for NowTool {
        "now".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/open_tool.rs
+++ b/crates/assistant_tools/src/open_tool.rs
@@ -23,7 +23,7 @@ impl Tool for OpenTool {
        "open".to_string()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        true
    }
    fn may_perform_edits(&self) -> bool {
--- a/crates/assistant_tools/src/project_notifications_tool.rs
+++ b/crates/assistant_tools/src/project_notifications_tool.rs
@@ -19,7 +19,7 @@ impl Tool for ProjectNotificationsTool {
        "project_notifications".to_string()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }
    fn may_perform_edits(&self) -> bool {
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -54,7 +54,7 @@ impl Tool for ReadFileTool {
        "read_file".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -77,7 +77,7 @@ impl Tool for TerminalTool {
        Self::NAME.to_string()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        true
    }

--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -24,7 +24,7 @@ impl Tool for ThinkingTool {
        "thinking".to_string()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -6,7 +6,6 @@ use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{
    ActionLog, Tool, ToolCard, ToolResult, ToolResultContent, ToolResultOutput, ToolUseStatus,
 };
-use cloud_llm_client::{WebSearchResponse, WebSearchResult};
 use futures::{Future, FutureExt, TryFutureExt};
 use gpui::{
    AnyWindowHandle, App, AppContext, Context, Entity, IntoElement, Task, WeakEntity, Window,
@@ -18,6 +17,7 @@ use serde::{Deserialize, Serialize};
 use ui::{IconName, Tooltip, prelude::*};
 use web_search::WebSearchRegistry;
 use workspace::Workspace;
+use zed_llm_client::{WebSearchResponse, WebSearchResult};

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WebSearchToolInput {
@@ -32,7 +32,7 @@ impl Tool for WebSearchTool {
        "web_search".into()
    }

-    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -18,6 +18,6 @@ collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
-rodio = { version = "0.21.1", default-features = false, features = ["wav", "playback", "tracing"] }
+rodio = { version = "0.20.0", default-features = false, features = ["wav"] }
 util.workspace = true
 workspace-hack.workspace = true
--- a/crates/audio/src/assets.rs
+++ b/crates/audio/src/assets.rs
@@ -3,9 +3,12 @@ use std::{io::Cursor, sync::Arc};
 use anyhow::{Context as _, Result};
 use collections::HashMap;
 use gpui::{App, AssetSource, Global};
-use rodio::{Decoder, Source, source::Buffered};
+use rodio::{
+    Decoder, Source,
+    source::{Buffered, SamplesConverter},
+};

-type Sound = Buffered<Decoder<Cursor<Vec<u8>>>>;
+type Sound = Buffered<SamplesConverter<Decoder<Cursor<Vec<u8>>>, f32>>;

 pub struct SoundRegistry {
    cache: Arc<parking_lot::Mutex<HashMap<String, Sound>>>,
@@ -45,7 +48,7 @@ impl SoundRegistry {
            .with_context(|| format!("No asset available for path {path}"))??
            .into_owned();
        let cursor = Cursor::new(bytes);
-        let source = Decoder::new(cursor)?.buffered();
+        let source = Decoder::new(cursor)?.convert_samples::<f32>().buffered();

        self.cache.lock().insert(name.to_string(), source.clone());

--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,7 +1,7 @@
 use assets::SoundRegistry;
 use derive_more::{Deref, DerefMut};
 use gpui::{App, AssetSource, BorrowAppContext, Global};
-use rodio::{OutputStream, OutputStreamBuilder};
+use rodio::{OutputStream, OutputStreamHandle};
 use util::ResultExt;

 mod assets;
@@ -37,7 +37,8 @@ impl Sound {

 #[derive(Default)]
 pub struct Audio {
-    output_handle: Option<OutputStream>,
+    _output_stream: Option<OutputStream>,
+    output_handle: Option<OutputStreamHandle>,
 }

 #[derive(Deref, DerefMut)]
@@ -50,9 +51,11 @@ impl Audio {
        Self::default()
    }

-    fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
+    fn ensure_output_exists(&mut self) -> Option<&OutputStreamHandle> {
        if self.output_handle.is_none() {
-            self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
+            let (_output_stream, output_handle) = OutputStream::try_default().log_err().unzip();
+            self.output_handle = output_handle;
+            self._output_stream = _output_stream;
        }

        self.output_handle.as_ref()
@@ -66,7 +69,7 @@ impl Audio {
        cx.update_global::<GlobalAudio, _>(|this, cx| {
            let output_handle = this.ensure_output_exists()?;
            let source = SoundRegistry::global(cx).get(sound.file()).log_err()?;
-            output_handle.mixer().add(source);
+            output_handle.play_raw(source).log_err()?;
            Some(())
        });
    }
@@ -77,6 +80,7 @@ impl Audio {
        }

        cx.update_global::<GlobalAudio, _>(|this, _| {
+            this._output_stream.take();
            this.output_handle.take();
        });
    }
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -126,7 +126,7 @@ impl ChannelMembership {
                proto::channel_member::Kind::Member => 0,
                proto::channel_member::Kind::Invitee => 1,
            },
-            username_order: &self.user.github_login,
+            username_order: self.user.github_login.as_str(),
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Agus Zubiaga	9da17dd894	move old acp support to its own module Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 13:14:16 -03:00
Agus Zubiaga	4605b80b44	Remove deps	2025-07-24 13:06:39 -03:00
Agus Zubiaga	715e96de6f	Remove dead code Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 13:02:43 -03:00
Agus Zubiaga	0f4e64026b	Remove todo Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 12:59:56 -03:00
Agus Zubiaga	561a5f1f4f	Fix padding Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 12:50:14 -03:00
Agus Zubiaga	ac3f8f7fa1	Return all diffs Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 12:48:26 -03:00
Agus Zubiaga	153ffb2e6b	Tests passing Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Richard Feldman <oss@rtfeldman.com>	2025-07-24 12:37:06 -03:00
Agus Zubiaga	cdfe91ce9e	Move process creation to ClaudeConnection::new_thread Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>	2025-07-24 11:37:55 -03:00
Ben Brandt	bfa6a2290e	Merge branch 'main' into mcp2	2025-07-24 12:48:21 +02:00
Ben Brandt	56ca10dccd	Fix authenticate not working without a thread	2025-07-24 12:38:50 +02:00
Ben Brandt	17684703da	Move mcp_server back to Claude	2025-07-24 12:14:50 +02:00
Ben Brandt	755cff59a1	Put name on connection as well for Thread Title	2025-07-24 12:06:05 +02:00
Ben Brandt	44cae51ea3	Make new_thread nicer with RC receiver	2025-07-24 11:51:19 +02:00
Ben Brandt	45452a81d4	Cleanup unused fields	2025-07-24 11:41:20 +02:00
Ben Brandt	c03585359a	Remove dead code	2025-07-24 11:01:49 +02:00
Ben Brandt	e9a9f6dace	Remove unused code	2025-07-24 10:53:54 +02:00
Ben Brandt	0915e4b34b	Fix clippy warnings	2025-07-24 10:40:05 +02:00
Agus Zubiaga	8f768439b2	Compiling!	2025-07-24 01:03:37 -03:00
Agus Zubiaga	2ffc027c26	Fix all agent_servers errors	2025-07-23 23:26:31 -03:00
Agus Zubiaga	158867f42c	Moar fixes	2025-07-23 21:25:04 -03:00
Agus Zubiaga	172d206e02	Replace codex impl with todo!	2025-07-23 20:32:20 -03:00
Agus Zubiaga	7f20caf208	Moar progress	2025-07-23 20:11:38 -03:00
Agus Zubiaga	2d222f7752	Fix tool call confirmation	2025-07-23 16:17:33 -03:00
Conrad Irwin	1724bb2084	more wip	2025-07-23 10:59:09 -06:00
Agus Zubiaga	8affe205bd	More progress	2025-07-23 12:17:02 -03:00
Ben Brandt	ebf94e20c9	wip Co-authored-by: Agus Zubiaga <agus@zed.dev>	2025-07-23 16:21:20 +02:00
Ben Brandt	edbcc71b87	Merge branch 'main' into mcp2	2025-07-23 14:36:06 +02:00
Ben Brandt	c478cdf30e	Use acp_old everywhere	2025-07-23 14:33:26 +02:00
Ben Brandt	af6ab9d4a6	Update plan + read/write tools	2025-07-23 13:29:31 +02:00
Ben Brandt	eff09b0384	Remove ToolCallConfirmation	2025-07-23 13:22:51 +02:00
Ben Brandt	ce5614cc76	Reject pending tool call confirmations	2025-07-23 13:21:33 +02:00
Ben Brandt	cea8e61fd9	Push request and insert further	2025-07-23 13:11:54 +02:00
Ben Brandt	c3e4f3800d	Convert new toolcallcontent	2025-07-23 12:31:54 +02:00
Conrad Irwin	4cd5cceae8	MOAR	2025-07-23 00:12:09 -06:00
Conrad Irwin	c4d920ff5b	WIPWIPWIPW	2025-07-22 19:01:29 -06:00
Conrad Irwin	966d29dcd9	WIp	2025-07-22 13:49:28 -06:00
Conrad Irwin	cede9d757a	Eliciting better	2025-07-22 13:10:06 -06:00
Conrad Irwin	c0c698b883	WIP elciication t	2025-07-22 12:29:27 -06:00
Ben Brandt	0fa7d58a3e	Pass Zed MCP Server as command args	2025-07-22 15:11:48 +02:00
Ben Brandt	9b91445967	Use pathbuf in McpServerConfig	2025-07-22 15:06:39 +02:00
Ben Brandt	480adade63	Add correct codex path and setup e2e tests (not running yet)	2025-07-22 14:13:05 +02:00
Ben Brandt	47dec0df99	Add local command for codex	2025-07-22 13:56:55 +02:00
Ben Brandt	f20edf1b50	Remove unneeded todo	2025-07-22 12:20:52 +02:00
Ben Brandt	03b94f5831	Merge branch 'main' into mcp-codex	2025-07-22 12:20:13 +02:00
Agus Zubiaga	e7298c0736	Display tool calls	2025-07-21 20:23:27 -03:00
Agus Zubiaga	a822711e99	Stop generation	2025-07-21 19:46:14 -03:00
Agus Zubiaga	4b1ace9a54	Handle Agent Reasoning	2025-07-21 18:29:13 -03:00
Agus Zubiaga	769d6dc632	Stream text	2025-07-21 18:26:28 -03:00
Agus Zubiaga	f56910556f	Connect to Codex MCP server	2025-07-21 15:19:50 -03:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-cloud-download-icon lucide-cloud-download"><path d="M12 13v8l-4-4"/><path d="m12 21 4-4"/><path d="M4.393 15.269A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 2.436 8.284"/></svg>`