Update global ai setting

Update focus outline styles
Introduce global ai setting
2025-07-07 12:15:52 -04:00 · 2025-07-07 12:15:42 -04:00 · 2025-07-07 11:41:55 -04:00 · 2025-07-07 09:33:18 -04:00 · 2025-07-04 21:56:04 -04:00 · 2025-07-04 21:38:49 -04:00
335 changed files with 7368 additions and 20011 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -19,8 +19,6 @@ rustflags = [
    "windows_slim_errors",        # This cfg will reduce the size of `windows::core::Error` from 16 bytes to 4 bytes
    "-C",
    "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows
-    "-C",
-    "link-arg=-fuse-ld=lld",
 ]

 [env]
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -33,6 +33,7 @@ workspace-members = [
    "zed_emmet",
    "zed_glsl",
    "zed_html",
+    "perplexity",
    "zed_proto",
    "zed_ruff",
    "slash_commands_example",
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,6 @@ env:
  CARGO_TERM_COLOR: always
  CARGO_INCREMENTAL: 0
  RUST_BACKTRACE: 1
-  DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-  DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}

 jobs:
  job_spec:
@@ -55,10 +52,9 @@ jobs:
          fi
          # Specify anything which should skip full CI in this regex:
          # - docs/
-          # - script/update_top_ranking_issues/
          # - .github/ISSUE_TEMPLATE/
          # - .github/workflows/  (except .github/workflows/ci.yml)
-          SKIP_REGEX='^(docs/|script/update_top_ranking_issues/|\.github/(ISSUE_TEMPLATE|workflows/(?!ci)))'
+          SKIP_REGEX='^(docs/|\.github/(ISSUE_TEMPLATE|workflows/(?!ci)))'
          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -vP "$SKIP_REGEX") ]]; then
            echo "run_tests=true" >> $GITHUB_OUTPUT
          else
@@ -69,13 +65,13 @@ jobs:
          else
            echo "run_docs=false" >> $GITHUB_OUTPUT
          fi
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -P '^(Cargo.lock|script/.*licenses)') ]]; then
+          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^Cargo.lock') ]]; then
            echo "run_license=true" >> $GITHUB_OUTPUT
          else
            echo "run_license=false" >> $GITHUB_OUTPUT
          fi
          NIX_REGEX='^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)'
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -P "$NIX_REGEX") ]]; then
+          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep "$NIX_REGEX") ]]; then
            echo "run_nix=true" >> $GITHUB_OUTPUT
          else
            echo "run_nix=false" >> $GITHUB_OUTPUT
@@ -394,7 +390,7 @@ jobs:

  windows_tests:
    timeout-minutes: 60
-    name: (Windows) Run Clippy and tests
+    name: (Windows) Run Tests
    needs: [job_spec]
    if: |
      github.repository_owner == 'zed-industries' &&
@@ -415,10 +411,11 @@ jobs:
        with:
          clean: false

-      - name: Configure CI
+      - name: Setup Cargo and Rustup
        run: |
-          New-Item -ItemType Directory -Path "./../.cargo" -Force
-          Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
+          mkdir -p ${{ env.CARGO_HOME }} -ErrorAction Ignore
+          cp ./.cargo/ci-config.toml ${{ env.CARGO_HOME }}/config.toml
+          .\script\install-rustup.ps1

      - name: cargo clippy
        run: |
@@ -433,9 +430,18 @@ jobs:
      - name: Limit target directory size
        run: ./script/clear-target-dir-if-larger-than.ps1 250

+      # - name: Check dev drive space
+      #   working-directory: ${{ env.ZED_WORKSPACE }}
+      #   # `setup-dev-driver.ps1` creates a 100GB drive, with CI taking up ~45GB of the drive.
+      #   run: ./script/exit-ci-if-dev-drive-is-full.ps1 95
+
+      # Since the Windows runners are stateful, so we need to remove the config file to prevent potential bug.
      - name: Clean CI config file
        if: always()
-        run: Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
+        run: |
+          if (Test-Path "${{ env.CARGO_HOME }}/config.toml") {
+            Remove-Item -Path "${{ env.CARGO_HOME }}/config.toml"  -Force
+          }

  tests_pass:
    name: Tests Pass
@@ -496,6 +502,9 @@ jobs:
      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Install Node
        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
@@ -578,6 +587,10 @@ jobs:
      startsWith(github.ref, 'refs/tags/v')
      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
    needs: [linux_tests]
+    env:
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -631,6 +644,10 @@ jobs:
      startsWith(github.ref, 'refs/tags/v')
      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
    needs: [linux_tests]
+    env:
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -683,12 +700,16 @@ jobs:
      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
    needs: [linux_tests]
    name: Build Zed on FreeBSD
+    # env:
+    #   MYTOKEN : ${{ secrets.MYTOKEN }}
+    #   MYTOKEN2: "value2"
    steps:
      - uses: actions/checkout@v4
      - name: Build FreeBSD remote-server
        id: freebsd-build
        uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
        with:
+          # envs: "MYTOKEN MYTOKEN2"
          usesh: true
          release: 13.5
          copyback: true
@@ -742,63 +763,12 @@ jobs:
      # excludes the final package to only cache dependencies
      cachix-filter: "-zed-editor-[0-9.]*-nightly"

-  bundle-windows-x64:
-    timeout-minutes: 120
-    name: Create a Windows installer
-    runs-on: [self-hosted, Windows, X64]
-    if: ${{ 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 }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Determine version and release channel
-        working-directory: ${{ env.ZED_WORKSPACE }}
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
-          script/determine-release-channel.ps1
-
-      - name: Build Zed installer
-        working-directory: ${{ env.ZED_WORKSPACE }}
-        run: script/bundle-windows.ps1
-
-      - name: Upload installer (x86_64) to Workflow - zed (run-bundling)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
-        with:
-          name: ZedEditorUserSetup-x64-${{ github.event.pull_request.head.sha || github.sha }}.exe
-          path: ${{ env.SETUP_PATH }}
-
-      - name: Upload Artifacts to release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        # Re-enable when we are ready to publish windows preview releases
-        if: false && ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) && env.RELEASE_CHANNEL == 'preview' }} # upload only preview
-        with:
-          draft: true
-          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
-          files: ${{ env.SETUP_PATH }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
  auto-release-preview:
    name: Auto release preview
    if: |
      startsWith(github.ref, 'refs/tags/v')
      && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
-    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, bundle-windows-x64, freebsd]
+    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, freebsd]
    runs-on:
      - self-hosted
      - bundle
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -12,9 +12,6 @@ env:
  CARGO_TERM_COLOR: always
  CARGO_INCREMENTAL: 0
  RUST_BACKTRACE: 1
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-  DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-  DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}

 jobs:
  style:
@@ -54,32 +51,6 @@ jobs:
      - name: Run tests
        uses: ./.github/actions/run_tests

-  windows-tests:
-    timeout-minutes: 60
-    name: Run tests on Windows
-    if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Configure CI
-        run: |
-          New-Item -ItemType Directory -Path "./../.cargo" -Force
-          Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-
-      - name: Run tests
-        uses: ./.github/actions/run_tests_windows
-
-      - name: Limit target directory size
-        run: ./script/clear-target-dir-if-larger-than.ps1 1024
-
-      - name: Clean CI config file
-        if: always()
-        run: Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-
  bundle-mac:
    timeout-minutes: 60
    name: Create a macOS bundle
@@ -94,6 +65,9 @@ jobs:
      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
    steps:
      - name: Install Node
        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
@@ -125,6 +99,10 @@ jobs:
    runs-on:
      - buildjet-16vcpu-ubuntu-2004
    needs: tests
+    env:
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -160,6 +138,10 @@ jobs:
    runs-on:
      - buildjet-16vcpu-ubuntu-2204-arm
    needs: tests
+    env:
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -190,6 +172,9 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on: github-8vcpu-ubuntu-2404
    needs: tests
+    env:
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    name: Build Zed on FreeBSD
    # env:
    #   MYTOKEN : ${{ secrets.MYTOKEN }}
@@ -228,49 +213,10 @@ jobs:

  bundle-nix:
    name: Build and cache Nix package
-    if: false
    needs: tests
    secrets: inherit
    uses: ./.github/workflows/nix.yml

-  bundle-windows-x64:
-    timeout-minutes: 60
-    name: Create a Windows installer
-    if: github.repository_owner == 'zed-industries'
-    runs-on: [self-hosted, Windows, X64]
-    needs: windows-tests
-    env:
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Set release channel to nightly
-        working-directory: ${{ env.ZED_WORKSPACE }}
-        run: |
-          $ErrorActionPreference = "Stop"
-          $version = git rev-parse --short HEAD
-          Write-Host "Publishing version: $version on release channel nightly"
-          "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
-
-      - name: Build Zed installer
-        working-directory: ${{ env.ZED_WORKSPACE }}
-        run: script/bundle-windows.ps1
-
-      - name: Upload Zed Nightly
-        working-directory: ${{ env.ZED_WORKSPACE }}
-        run: script/upload-nightly.ps1 windows
-
  update-nightly-tag:
    name: Update nightly tag
    if: github.repository_owner == 'zed-industries'
@@ -279,7 +225,6 @@ jobs:
      - bundle-mac
      - bundle-linux-x86
      - bundle-linux-arm
-      - bundle-windows-x64
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -5,7 +5,9 @@
    "build": {
      "label": "Build Zed",
      "command": "cargo",
-      "args": ["build"]
+      "args": [
+        "build"
+      ]
    }
  },
  {
@@ -14,7 +16,9 @@
    "build": {
      "label": "Build Zed",
      "command": "cargo",
-      "args": ["build"]
+      "args": [
+        "build"
+      ]
    }
-  }
+  },
 ]
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -40,7 +40,7 @@
  },
  "file_types": {
    "Dockerfile": ["Dockerfile*[!dockerignore]"],
-    "JSONC": ["**/assets/**/*.json", "renovate.json"],
+    "JSONC": ["assets/**/*.json", "renovate.json"],
    "Git Ignore": ["dockerignore"]
  },
  "hard_tabs": false,
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,34 +2,6 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "acp"
-version = "0.1.0"
-dependencies = [
- "agent_servers",
- "agentic-coding-protocol",
- "anyhow",
- "assistant_tool",
- "async-pipe",
- "buffer_diff",
- "editor",
- "env_logger 0.11.8",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "markdown",
- "project",
- "serde_json",
- "settings",
- "smol",
- "tempfile",
- "ui",
- "util",
- "workspace-hack",
-]
-
 [[package]]
 name = "activity_indicator"
 version = "0.1.0"
@@ -135,24 +107,6 @@ dependencies = [
 "zstd",
 ]

-[[package]]
-name = "agent_servers"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "futures 0.3.31",
- "gpui",
- "paths",
- "project",
- "schemars",
- "serde",
- "settings",
- "util",
- "which 6.0.3",
- "workspace-hack",
-]
-
 [[package]]
 name = "agent_settings"
 version = "0.1.0"
@@ -176,11 +130,8 @@ dependencies = [
 name = "agent_ui"
 version = "0.1.0"
 dependencies = [
- "acp",
 "agent",
- "agent_servers",
 "agent_settings",
- "agentic-coding-protocol",
 "anyhow",
 "assistant_context",
 "assistant_slash_command",
@@ -240,7 +191,6 @@ dependencies = [
 "settings",
 "smol",
 "streaming_diff",
- "task",
 "telemetry",
 "telemetry_events",
 "terminal",
@@ -262,22 +212,6 @@ dependencies = [
 "zed_llm_client",
 ]

-[[package]]
-name = "agentic-coding-protocol"
-version = "0.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75f520bcc049ebe40c8c99427aa61b48ad78a01bcc96a13b350b903dcfb9438"
-dependencies = [
- "anyhow",
- "chrono",
- "futures 0.3.31",
- "log",
- "parking_lot",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -604,11 +538,8 @@ dependencies = [
 "anyhow",
 "futures 0.3.31",
 "gpui",
- "net",
- "parking_lot",
 "smol",
 "tempfile",
- "unindent",
 "util",
 "workspace-hack",
 ]
@@ -4393,7 +4324,6 @@ dependencies = [
 "futures 0.3.31",
 "fuzzy",
 "gpui",
- "indoc",
 "itertools 0.14.0",
 "language",
 "log",
@@ -4414,7 +4344,6 @@ dependencies = [
 "tasks_ui",
 "telemetry",
 "terminal_view",
- "text",
 "theme",
 "tree-sitter",
 "tree-sitter-go",
@@ -5258,16 +5187,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "explorer_command_injector"
-version = "0.1.0"
-dependencies = [
- "windows 0.61.1",
- "windows-core 0.61.0",
- "windows-registry 0.5.1",
- "workspace-hack",
-]
-
 [[package]]
 name = "exr"
 version = "1.73.0"
@@ -8980,7 +8899,6 @@ dependencies = [
 "gpui",
 "language",
 "lsp",
- "project",
 "serde",
 "serde_json",
 "util",
@@ -9033,7 +8951,6 @@ dependencies = [
 "credentials_provider",
 "deepseek",
 "editor",
- "feature_flags",
 "fs",
 "futures 0.3.31",
 "google_ai",
@@ -9106,6 +9023,7 @@ dependencies = [
 "itertools 0.14.0",
 "language",
 "lsp",
+ "picker",
 "project",
 "release_channel",
 "serde_json",
@@ -10312,18 +10230,6 @@ dependencies = [
 "jni-sys",
 ]

-[[package]]
-name = "net"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-io",
- "smol",
- "tempfile",
- "windows 0.61.1",
- "workspace-hack",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -10908,6 +10814,35 @@ dependencies = [
 "workspace-hack",
 ]

+[[package]]
+name = "onboarding_ui"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client",
+ "command_palette_hooks",
+ "component",
+ "db",
+ "editor",
+ "feature_flags",
+ "gpui",
+ "language",
+ "log",
+ "menu",
+ "project",
+ "serde_json",
+ "settings",
+ "settings_ui",
+ "smallvec",
+ "theme",
+ "ui",
+ "util",
+ "vim_mode_setting",
+ "welcome",
+ "workspace",
+ "zed_actions",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -11429,6 +11364,14 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

+[[package]]
+name = "perplexity"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "zed_extension_api 0.6.0",
+]
+
 [[package]]
 name = "pest"
 version = "2.8.0"
@@ -12620,7 +12563,6 @@ dependencies = [
 "prost 0.9.0",
 "prost-build 0.9.0",
 "serde",
- "typed-path",
 "workspace-hack",
 ]

@@ -13284,7 +13226,6 @@ dependencies = [
 "fs",
 "futures 0.3.31",
 "git",
- "git2",
 "git_hosting_providers",
 "gpui",
 "gpui_tokio",
@@ -14099,7 +14040,7 @@ dependencies = [
 [[package]]
 name = "scap"
 version = "0.0.8"
-source = "git+https://github.com/zed-industries/scap?rev=28dd306ff2e3374404936dec778fc1e975b8dd12#28dd306ff2e3374404936dec778fc1e975b8dd12"
+source = "git+https://github.com/zed-industries/scap?rev=08f0a01417505cc0990b9931a37e5120db92e0d0#08f0a01417505cc0990b9931a37e5120db92e0d0"
 dependencies = [
 "anyhow",
 "cocoa 0.25.0",
@@ -14146,7 +14087,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
 dependencies = [
- "chrono",
 "dyn-clone",
 "indexmap",
 "ref-cast",
@@ -17124,12 +17064,6 @@ dependencies = [
 "utf-8",
 ]

-[[package]]
-name = "typed-path"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c462d18470a2857aa657d338af5fa67170bb48bcc80a296710ce3b0802a32566"
-
 [[package]]
 name = "typeid"
 version = "1.0.3"
@@ -18376,7 +18310,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "client",
- "feature_flags",
 "futures 0.3.31",
 "gpui",
 "http_client",
@@ -18454,6 +18387,7 @@ dependencies = [
 "language",
 "picker",
 "project",
+ "schemars",
 "serde",
 "settings",
 "telemetry",
@@ -19648,7 +19582,6 @@ dependencies = [
 "rustix 1.0.7",
 "rustls 0.23.26",
 "rustls-webpki 0.103.1",
- "schemars",
 "scopeguard",
 "sea-orm",
 "sea-query-binder",
@@ -19695,9 +19628,7 @@ dependencies = [
 "wasmtime-cranelift",
 "wasmtime-environ",
 "winapi",
- "windows 0.61.1",
 "windows-core 0.61.0",
- "windows-future",
 "windows-numerics",
 "windows-sys 0.48.0",
 "windows-sys 0.52.0",
@@ -20044,11 +19975,10 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.196.0"
+version = "0.195.0"
 dependencies = [
 "activity_indicator",
 "agent",
- "agent_servers",
 "agent_settings",
 "agent_ui",
 "anyhow",
@@ -20071,6 +20001,7 @@ dependencies = [
 "collab_ui",
 "collections",
 "command_palette",
+ "command_palette_hooks",
 "component",
 "copilot",
 "dap",
@@ -20121,6 +20052,7 @@ dependencies = [
 "nix 0.29.0",
 "node_runtime",
 "notifications",
+ "onboarding_ui",
 "outline",
 "outline_panel",
 "parking_lot",
@@ -20243,9 +20175,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607f74dee2a18a9ce0f091844944a0e59881359ab62e0768fb0618f55d4c1dc"
+checksum = "c740e29260b8797ad252c202ea09a255b3cbc13f30faaf92fb6b2490336106e0"
 dependencies = [
 "anyhow",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,11 +2,9 @@
 resolver = "2"
 members = [
    "crates/activity_indicator",
-    "crates/acp",
    "crates/agent_ui",
    "crates/agent",
    "crates/agent_settings",
-    "crates/agent_servers",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
@@ -47,7 +45,6 @@ members = [
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/editor",
-    "crates/explorer_command_injector",
    "crates/eval",
    "crates/extension",
    "crates/extension_api",
@@ -102,10 +99,10 @@ members = [
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
-    "crates/net",
    "crates/node_runtime",
    "crates/notifications",
    "crates/ollama",
+    "crates/onboarding_ui",
    "crates/open_ai",
    "crates/open_router",
    "crates/outline",
@@ -192,6 +189,7 @@ members = [
    "extensions/emmet",
    "extensions/glsl",
    "extensions/html",
+    "extensions/perplexity",
    "extensions/proto",
    "extensions/ruff",
    "extensions/slash-commands-example",
@@ -218,12 +216,10 @@ edition = "2024"
 # Workspace member crates
 #

-acp = { path = "crates/acp" }
-agent = { path = "crates/agent" }
 activity_indicator = { path = "crates/activity_indicator" }
+agent = { path = "crates/agent" }
 agent_ui = { path = "crates/agent_ui" }
 agent_settings = { path = "crates/agent_settings" }
-agent_servers = { path = "crates/agent_servers" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
@@ -316,10 +312,10 @@ menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
 mistral = { path = "crates/mistral" }
 multi_buffer = { path = "crates/multi_buffer" }
-net = { path = "crates/net" }
 node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
+onboarding_ui = { path = "crates/onboarding_ui" }
 open_ai = { path = "crates/open_ai" }
 open_router = { path = "crates/open_router", features = ["schemars"] }
 outline = { path = "crates/outline" }
@@ -404,7 +400,6 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #

-agentic-coding-protocol = "0.0.7"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
@@ -546,7 +541,7 @@ rustc-demangle = "0.1.23"
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
-scap = { git = "https://github.com/zed-industries/scap", rev = "28dd306ff2e3374404936dec778fc1e975b8dd12", default-features = false }
+scap = { git = "https://github.com/zed-industries/scap", rev = "08f0a01417505cc0990b9931a37e5120db92e0d0", default-features = false }
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -631,10 +626,8 @@ wasmtime = { version = "29", default-features = false, features = [
 ] }
 wasmtime-wasi = "29"
 which = "6.0.0"
-windows-core = "0.61"
-wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "= 0.8.6"
+zed_llm_client = "= 0.8.5"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
@@ -669,7 +662,6 @@ features = [
    "Win32_Graphics_Gdi",
    "Win32_Graphics_Imaging",
    "Win32_Graphics_Imaging_D2D",
-    "Win32_Networking_WinSock",
    "Win32_Security",
    "Win32_Security_Credentials",
    "Win32_Storage_FileSystem",
--- a/assets/fonts/plex-sans/ZedPlexSans-Medium.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-Medium.ttf
--- a/assets/fonts/plex-sans/ZedPlexSans-MediumItalic.ttf
+++ b/assets/fonts/plex-sans/ZedPlexSans-MediumItalic.ttf
--- a/assets/icons/ai_gemini.svg
+++ b/assets/icons/ai_gemini.svg
@@ -1 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google Gemini</title><path d="M11.04 19.32Q12 21.51 12 24q0-2.49.93-4.68.96-2.19 2.58-3.81t3.81-2.55Q21.51 12 24 12q-2.49 0-4.68-.93a12.3 12.3 0 0 1-3.81-2.58 12.3 12.3 0 0 1-2.58-3.81Q12 2.49 12 0q0 2.49-.96 4.68-.93 2.19-2.55 3.81a12.3 12.3 0 0 1-3.81 2.58Q2.49 12 0 12q2.49 0 4.68.96 2.19.93 3.81 2.55t2.55 3.81"/></svg>
--- a/assets/icons/bolt_filled_alt.svg
+++ b/assets/icons/bolt_filled_alt.svg
@@ -1,3 +1,3 @@
 <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.98749 1.67322C7.08029 1.71878 7.15543 1.79374 7.20121 1.88643C7.24699 1.97912 7.26084 2.08434 7.24061 2.18572L6.72812 4.75007H9.28122C9.37107 4.75006 9.45903 4.77588 9.53463 4.82445C9.61022 4.87302 9.67027 4.94229 9.70761 5.02402C9.74495 5.10574 9.75801 5.19648 9.74524 5.28542C9.73247 5.37437 9.69441 5.45776 9.63559 5.52569L5.57313 10.2131C5.50536 10.2912 5.41366 10.3447 5.31233 10.3653C5.211 10.3858 5.10571 10.3723 5.01285 10.3268C4.92 10.2813 4.8448 10.2064 4.79896 10.1137C4.75311 10.021 4.7392 9.9158 4.75939 9.81439L5.27188 7.25004H2.71878C2.62893 7.25005 2.54097 7.22423 2.46537 7.17566C2.38978 7.12709 2.32973 7.05782 2.29239 6.97609C2.25505 6.89437 2.24199 6.80363 2.25476 6.71469C2.26753 6.62574 2.30559 6.54235 2.36441 6.47443L6.42687 1.78697C6.49466 1.70879 6.58641 1.65524 6.68782 1.63467C6.78923 1.61409 6.89459 1.62765 6.98749 1.67322Z" fill="black"/>
+<path d="M6.75776 5.50003H8.49988C8.70769 5.50003 8.89518 5.62971 8.95455 5.82346C9.04049 6.01876 8.9858 6.23906 8.82956 6.37656L4.82971 9.87643C4.65315 10.0295 4.39488 10.042 4.20614 9.90455C4.01724 9.76705 3.94849 9.51706 4.04052 9.30301L5.24219 6.49999H3.48601C3.2918 6.49999 3.10524 6.37031 3.03197 6.17657C2.9587 5.98126 3.014 5.76096 3.1708 5.62346L7.17018 2.12375C7.34674 1.97001 7.60454 1.95829 7.7936 2.09547C7.98265 2.23275 8.0514 2.48218 7.95922 2.69695L6.75776 5.50003Z" fill="black"/>
 </svg>
--- a/assets/icons/clipboard.svg
+++ b/assets/icons/clipboard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-clipboard"><rect width="8" height="4" x="8" y="2" rx="1" ry="1"/><path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"/></svg>
--- a/assets/icons/file_delete.svg
+++ b/assets/icons/file_delete.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0001 1.33334H4.00008C3.64646 1.33334 3.30732 1.47382 3.05727 1.72387C2.80722 1.97392 2.66675 2.31305 2.66675 2.66668V13.3333C2.66675 13.687 2.80722 14.0261 3.05727 14.2762C3.30732 14.5262 3.64646 14.6667 4.00008 14.6667H12.0001C12.3537 14.6667 12.6928 14.5262 12.9429 14.2762C13.1929 14.0261 13.3334 13.687 13.3334 13.3333V4.66668L10.0001 1.33334Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.66659 6.5L6.33325 9.83333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.33325 6.5L9.66659 9.83333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/search_code.svg
+++ b/assets/icons/search_code.svg
@@ -0,0 +1 @@
+<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-search-code"><path d="m13 13.5 2-2.5-2-2.5"/><path d="m21 21-4.3-4.3"/><path d="M9 8.5 7 11l2 2.5"/><circle cx="11" cy="11" r="8"/></svg>
--- a/assets/icons/tool_bulb.svg
+++ b/assets/icons/tool_bulb.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="M10.4174 10.2159C10.5454 9.58974 10.4174 9.57261 11.3762 8.46959C11.9337 7.82822 12.335 7.09214 12.335 6.27818C12.335 5.28184 11.9309 4.32631 11.2118 3.62179C10.4926 2.91728 9.5171 2.52148 8.50001 2.52148C7.48291 2.52148 6.50748 2.91728 5.78828 3.62179C5.06909 4.32631 4.66504 5.28184 4.66504 6.27818C4.66504 6.9043 4.79288 7.65565 5.62379 8.46959C6.58253 9.59098 6.45474 9.58974 6.58257 10.2159M10.4174 10.2159L10.4174 12.2989C10.4174 12.9504 9.87836 13.4786 9.21329 13.4786H7.78674C7.12167 13.4786 6.58253 12.9504 6.58253 12.2989L6.58257 10.2159M10.4174 10.2159H8.50001H6.58257" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_copy.svg
+++ b/assets/icons/tool_copy.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="M9.5 2.5H6.5C6.22386 2.5 6 2.83579 6 3.25V4.75C6 5.16421 6.22386 5.5 6.5 5.5H9.5C9.77614 5.5 10 5.16421 10 4.75V3.25C10 2.83579 9.77614 2.5 9.5 2.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 3.5H11C11.2652 3.5 11.5196 3.61706 11.7071 3.82544C11.8946 4.03381 12 4.31643 12 4.61111V12.3889C12 12.6836 11.8946 12.9662 11.7071 13.1746C11.5196 13.3829 11.2652 13.5 11 13.5H5C4.73478 13.5 4.48043 13.3829 4.29289 13.1746C4.10536 12.9662 4 12.6836 4 12.3889V4.61111C4 4.31643 4.10536 4.03381 4.29289 3.82544C4.48043 3.61706 4.73478 3.5 5 3.5H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_delete_file.svg
+++ b/assets/icons/tool_delete_file.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.50002 2.5H5C4.73478 2.5 4.48043 2.6159 4.29289 2.82219C4.10535 3.02848 4 3.30826 4 3.6V12.3999C4 12.6917 4.10535 12.9715 4.29289 13.1778C4.48043 13.3841 4.73478 13.5 5 13.5H11C11.2652 13.5 11.5195 13.3841 11.7071 13.1778C11.8946 12.9715 12 12.6917 12 12.3999V5.25L9.50002 2.5Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.3427 6.82379L6.65698 9.5095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.65698 6.82379L9.3427 9.5095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_diagnostics.svg
+++ b/assets/icons/tool_diagnostics.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.7244 11.5299L9.01711 3.2922C8.91447 3.11109 8.76562 2.96045 8.58576 2.85564C8.4059 2.75084 8.20145 2.69562 7.99328 2.69562C7.7851 2.69562 7.58066 2.75084 7.40079 2.85564C7.22093 2.96045 7.07209 3.11109 6.96945 3.2922L2.26218 11.5299C2.15844 11.7096 2.10404 11.9135 2.1045 12.121C2.10495 12.3285 2.16026 12.5321 2.2648 12.7113C2.36934 12.8905 2.5194 13.0389 2.69978 13.1415C2.88015 13.244 3.08443 13.297 3.2919 13.2951H12.7064C12.9129 13.2949 13.1157 13.2404 13.2944 13.137C13.4731 13.0336 13.6215 12.8851 13.7247 12.7062C13.8278 12.5273 13.8821 12.3245 13.882 12.118C13.882 11.9115 13.8276 11.7087 13.7244 11.5299Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 6.23425V8.58788" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 10.9415H8.00492" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_folder.svg
+++ b/assets/icons/tool_folder.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="M12.4 12.5C12.6917 12.5 12.9715 12.3884 13.1778 12.1899C13.3841 11.9913 13.5 11.722 13.5 11.4412V6.14706C13.5 5.86624 13.3841 5.59693 13.1778 5.39836C12.9715 5.19979 12.6917 5.08824 12.4 5.08824H8.055C7.87103 5.08997 7.68955 5.04726 7.52717 4.96402C7.36478 4.88078 7.22668 4.75967 7.1255 4.61176L6.68 3.97647C6.57984 3.83007 6.44349 3.7099 6.28317 3.62674C6.12286 3.54358 5.94361 3.50003 5.7615 3.5H3.6C3.30826 3.5 3.02847 3.61155 2.82218 3.81012C2.61589 4.00869 2.5 4.27801 2.5 4.55882V11.4412C2.5 11.722 2.61589 11.9913 2.82218 12.1899C3.02847 12.3884 3.30826 12.5 3.6 12.5H12.4Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_hammer.svg
+++ b/assets/icons/tool_hammer.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 8.5L4.94864 12.6222C4.71647 12.8544 4.40157 12.9848 4.07323 12.9848C3.74488 12.9848 3.42999 12.8544 3.19781 12.6222C2.96564 12.39 2.83521 12.0751 2.83521 11.7468C2.83521 11.4185 2.96564 11.1036 3.19781 10.8714L7.5 6.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.8352 9.98474L13.8352 6.98474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8352 7.42495L11.7634 6.4298C11.5533 6.23484 11.4353 5.97039 11.4352 5.69462V5.08526L10.1696 3.91022C9.54495 3.33059 8.69961 3.00261 7.81649 2.99722L5.83521 2.98474L6.35041 3.41108C6.71634 3.71233 7.00935 4.08216 7.21013 4.4962C7.4109 4.91024 7.51488 5.35909 7.51521 5.81316L7.5 6.5L9 8.5L9.5 8C9.5 8 9.87337 7.79457 10.0834 7.98959L11.1552 8.98474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_notification.svg
+++ b/assets/icons/tool_notification.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="M6.5 12C6.65203 12.304 6.87068 12.5565 7.13399 12.7321C7.39729 12.9076 7.69597 13 8 13C8.30403 13 8.60271 12.9076 8.86601 12.7321C9.12932 12.5565 9.34797 12.304 9.5 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.63088 9.21874C3.56556 9.28556 3.52246 9.36865 3.50681 9.45791C3.49116 9.54718 3.50364 9.63876 3.54273 9.72152C3.58183 9.80429 3.64585 9.87467 3.72701 9.92409C3.80817 9.97352 3.90298 9.99987 3.99989 9.99994H12.0001C12.097 9.99997 12.1918 9.97372 12.273 9.92439C12.3542 9.87505 12.4183 9.80476 12.4575 9.72205C12.4967 9.63934 12.5093 9.54778 12.4938 9.45851C12.4783 9.36924 12.4353 9.2861 12.3701 9.21921C11.705 8.57941 11 7.89947 11 5.79994C11 5.05733 10.684 4.34514 10.1213 3.82004C9.55872 3.29494 8.79564 2.99994 7.99997 2.99994C7.20431 2.99994 6.44123 3.29494 5.87861 3.82004C5.31599 4.34514 4.99991 5.05733 4.99991 5.79994C4.99991 7.89947 4.2944 8.57941 3.63088 9.21874Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_pencil.svg
+++ b/assets/icons/tool_pencil.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="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_read.svg
+++ b/assets/icons/tool_read.svg
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5.66667V4.33333C3 3.97971 3.14048 3.64057 3.39052 3.39052C3.64057 3.14048 3.97971 3 4.33333 3H5.66667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.3333 3H11.6666C12.0202 3 12.3593 3.14048 12.6094 3.39052C12.8594 3.64057 12.9999 3.97971 12.9999 4.33333V5.66667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9999 10.3333V11.6666C12.9999 12.0203 12.8594 12.3594 12.6094 12.6095C12.3593 12.8595 12.0202 13 11.6666 13H10.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66667 13H4.33333C3.97971 13 3.64057 12.8595 3.39052 12.6095C3.14048 12.3594 3 12.0203 3 11.6666V10.3333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.5 8H10.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_regex.svg
+++ b/assets/icons/tool_regex.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="M4.57132 13.7143C5.20251 13.7143 5.71418 13.2026 5.71418 12.5714C5.71418 11.9403 5.20251 11.4286 4.57132 11.4286C3.94014 11.4286 3.42847 11.9403 3.42847 12.5714C3.42847 13.2026 3.94014 13.7143 4.57132 13.7143Z" fill="black"/>
-<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
--- a/assets/icons/tool_search.svg
+++ b/assets/icons/tool_search.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 13L11 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 12C9.98528 12 12 9.98528 12 7.5C12 5.01472 9.98528 3 7.5 3C5.01472 3 3 5.01472 3 7.5C3 9.98528 5.01472 12 7.5 12Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_terminal.svg
+++ b/assets/icons/tool_terminal.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.99487 8.44023L7.32821 7.10689L5.99487 5.77356" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.33838 10.2264H10.005" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.8889 3H4.11111C3.49746 3 3 3.49746 3 4.11111V11.8889C3 12.5025 3.49746 13 4.11111 13H11.8889C12.5025 13 13 12.5025 13 11.8889V4.11111C13 3.49746 12.5025 3 11.8889 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/tool_web.svg
+++ b/assets/icons/tool_web.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99993 13.4804C11.0267 13.4804 13.4803 11.0267 13.4803 7.99999C13.4803 4.97325 11.0267 2.51959 7.99993 2.51959C4.97319 2.51959 2.51953 4.97325 2.51953 7.99999C2.51953 11.0267 4.97319 13.4804 7.99993 13.4804Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 3C6.71611 4.34807 6 6.13836 6 7.99999C6 9.86163 6.71611 11.6519 8 13C9.28387 11.6519 10 9.86163 10 7.99999C10 6.13836 9.28387 4.34807 8 3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.24121 7.04827C4.52425 8.27022 6.22817 8.95178 7.99999 8.95178C9.77182 8.95178 11.4757 8.27022 12.7588 7.04827" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/images/atom_logo.svg
+++ b/assets/images/atom_logo.svg
@@ -0,0 +1,19 @@
+<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_460_1758)" filter="url(#filter0_d_460_1758)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.53471 10.9653C6.40877 11.2268 6.29908 11.4479 6.19486 11.6718C5.6733 12.7932 5.24127 13.9457 5.0183 15.1667C4.89424 15.8457 4.82642 16.5298 5.00377 17.2115C5.15611 17.7973 5.47314 18.0981 6.01549 18.1229C6.25283 18.134 6.50111 18.0837 6.73221 18.0186C7.34408 17.8453 7.87643 17.5106 8.39127 17.1481C8.51627 17.06 8.64408 17.005 8.80002 17.0629C9.07627 17.1657 9.17627 17.532 8.9433 17.7059C8.10252 18.3323 7.21267 18.8725 6.12314 18.9059C5.2308 18.9334 4.58486 18.4548 4.30017 17.6042C4.08767 16.9695 4.07517 16.3167 4.15314 15.6617C4.38471 13.712 5.13721 11.9406 6.0408 10.2234C6.11846 10.0759 6.12314 9.95871 6.06814 9.80106C5.84252 9.15309 5.63267 8.49949 5.42658 7.84496C5.38752 7.7209 5.34752 7.68559 5.21283 7.71512C4.32752 7.90981 3.45533 8.14746 2.67002 8.61262C2.36674 8.79231 2.0758 9.01543 1.8333 9.27012C1.43002 9.69356 1.42236 10.1622 1.75189 10.6456C2.03939 11.0676 2.44455 11.3562 2.87205 11.617C3.0058 11.6989 3.14689 11.7686 3.28158 11.8489C3.47736 11.9659 3.54439 12.1928 3.44392 12.3815C3.34314 12.5704 3.11705 12.6453 2.91174 12.5396C2.31111 12.2309 1.75096 11.8645 1.30174 11.3504C1.02642 11.0354 0.824706 10.6814 0.757987 10.2617C0.674862 9.73825 0.824862 9.27699 1.13924 8.86262C1.46346 8.43559 1.88924 8.1309 2.35408 7.87778C3.17846 7.42887 4.06674 7.16075 4.97924 6.96309C5.04174 6.94949 5.10361 6.93262 5.1883 6.91153C5.14533 6.66809 5.09924 6.43184 5.06236 6.19387C4.91283 5.22606 4.84392 4.25746 5.08158 3.29278C5.17564 2.91121 5.3233 2.55059 5.58017 2.24668C6.10455 1.62684 6.77892 1.48887 7.53518 1.67356C8.28268 1.85621 8.91033 2.27012 9.49564 2.75184C9.66127 2.88809 9.6658 3.13418 9.53064 3.29278C9.39268 3.45449 9.17814 3.47559 8.99033 3.34762C8.69533 3.14684 8.40846 2.93231 8.10189 2.7509C7.75064 2.54324 7.37346 2.3959 6.95314 2.39387C6.60596 2.39215 6.33611 2.5334 6.1383 2.81465C5.88767 3.17137 5.79814 3.58293 5.7508 4.00496C5.65064 4.89762 5.76955 5.77512 5.94346 6.6484C5.96205 6.74121 5.99767 6.77403 6.09533 6.76418C6.80002 6.69387 7.50486 6.62371 8.21064 6.56481C8.36408 6.55215 8.46424 6.49668 8.55939 6.37637C9.47658 5.21778 10.482 4.14496 11.6649 3.24981C12.3238 2.75121 13.02 2.31653 13.8211 2.07918C14.323 1.93059 14.831 1.87559 15.3364 2.05324C15.9677 2.27512 16.3205 2.75481 16.5024 3.37387C16.6952 4.03106 16.665 4.70106 16.5867 5.3709C16.5653 5.5425 16.5378 5.71329 16.5042 5.88293C16.4603 6.11387 16.2891 6.23621 16.0585 6.20934C15.8488 6.18496 15.7119 6.01637 15.7339 5.78231C15.7644 5.45949 15.838 5.1384 15.8413 4.81621C15.8452 4.43496 15.837 4.04387 15.7577 3.67356C15.5922 2.90356 15.0595 2.60153 14.2716 2.77528C13.6805 2.90543 13.1563 3.18356 12.6572 3.51246C11.632 4.18809 10.7569 5.03293 9.94439 5.94637C9.7933 6.11621 9.64799 6.29137 9.50111 6.46481C9.49221 6.47512 9.49283 6.49356 9.48158 6.53746H9.69424C11.7866 6.55856 13.8481 6.80731 15.8628 7.38715C16.8222 7.6634 17.7483 8.0234 18.6005 8.55356C19.0539 8.83559 19.4702 9.16199 19.7994 9.58793C20.4708 10.4567 20.4144 11.432 19.642 12.21C19.1205 12.7354 18.4781 13.0673 17.7939 13.3251C17.6003 13.3978 17.3872 13.2911 17.3131 13.1056C17.2317 12.9018 17.32 12.6911 17.5272 12.5906C17.8431 12.4375 18.1717 12.3048 18.4705 12.1229C18.7201 11.9716 18.9485 11.7878 19.1497 11.5762C19.568 11.1311 19.5835 10.6445 19.2288 10.1464C18.9631 9.77324 18.6063 9.50043 18.2225 9.26199C17.2756 8.67356 16.2366 8.30903 15.1667 8.0245C14.0514 7.72778 12.9183 7.52074 11.7675 7.43887C10.8505 7.37371 9.93017 7.35496 9.01143 7.31137C8.87877 7.30496 8.78814 7.34418 8.71439 7.45793C8.1758 8.28856 7.63111 9.11528 7.09533 9.94778C7.05627 10.0084 7.03971 10.1175 7.06643 10.1817C7.97346 12.3401 9.12221 14.3548 10.6446 16.1434C11.2855 16.8961 11.9825 17.5922 12.8289 18.1189C13.2261 18.3659 13.6406 18.572 14.1214 18.604C14.557 18.6334 14.8749 18.4511 15.0911 18.0814C15.2949 17.7331 15.3766 17.3478 15.4131 16.9518C15.5313 15.6742 15.2786 14.4418 14.9436 13.2221C14.6005 11.9728 14.1149 10.7762 13.5585 9.60715C13.5136 9.51309 13.4769 9.40137 13.4817 9.30012C13.4906 9.1159 13.636 8.98481 13.8177 8.95637C13.9774 8.93137 14.1455 9.01918 14.2253 9.19043C14.4244 9.61668 14.6264 10.0422 14.8088 10.4757C15.3716 11.815 15.8247 13.189 16.0641 14.6262C16.2311 15.6293 16.311 16.6361 16.0791 17.6409C16.0263 17.8671 15.951 18.0875 15.8542 18.2987C15.4594 19.1618 14.6588 19.5518 13.7311 19.349C12.9769 19.1839 12.3403 18.7898 11.7464 18.319C10.6541 17.4532 9.76783 16.3976 8.96627 15.2667C8.05252 13.9784 7.2808 12.6084 6.63424 11.1676C6.61002 11.114 6.58221 11.062 6.53471 10.9653ZM6.13971 7.53559L6.63908 9.12371C7.03361 8.52153 7.40142 7.96028 7.79705 7.35606L6.13971 7.53559ZM10.5731 11.6353C9.94549 11.6345 9.43471 11.1257 9.43596 10.5026C9.43705 9.86949 9.94721 9.36496 10.5853 9.36512C11.2125 9.36543 11.7222 9.87371 11.7227 10.4987C11.723 11.1311 11.2122 11.6361 10.5731 11.6353Z" fill="#AAAFBB"/>
+</g>
+<defs>
+<filter id="filter0_d_460_1758" x="0.5" y="0.5" width="20" height="21.25" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.25"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.16 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_460_1758"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_460_1758" result="shape"/>
+</filter>
+<clipPath id="clip0_460_1758">
+<rect width="20" height="20" fill="white" transform="translate(0.5 0.5)"/>
+</clipPath>
+</defs>
+</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -268,14 +268,6 @@
      "ctrl-alt-t": "agent::NewThread"
    }
  },
-  {
-    "context": "AgentPanel && acp_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "agent::NewAcpThread",
-      "ctrl-alt-t": "agent::NewThread"
-    }
-  },
  {
    "context": "MessageEditor > Editor",
    "bindings": {
@@ -314,16 +306,6 @@
      "enter": "agent::AcceptSuggestedContext"
    }
  },
-  {
-    "context": "AcpThread > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "up": "agent::PreviousHistoryMessage",
-      "down": "agent::NextHistoryMessage",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
  {
    "context": "ThreadHistory",
    "bindings": {
@@ -1113,10 +1095,7 @@
    "context": "KeymapEditor",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-f": "search::FocusSearch",
-      "alt-find": "keymap_editor::ToggleKeystrokeSearch",
-      "alt-ctrl-f": "keymap_editor::ToggleKeystrokeSearch",
-      "alt-c": "keymap_editor::ToggleConflictFilter"
+      "ctrl-f": "search::FocusSearch"
    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -309,14 +309,6 @@
      "cmd-alt-t": "agent::NewThread"
    }
  },
-  {
-    "context": "AgentPanel && acp_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "agent::NewAcpThread",
-      "cmd-alt-t": "agent::NewThread"
-    }
-  },
  {
    "context": "MessageEditor > Editor",
    "use_key_equivalents": true,
@@ -365,16 +357,6 @@
      "ctrl--": "pane::GoBack"
    }
  },
-  {
-    "context": "AcpThread > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "up": "agent::PreviousHistoryMessage",
-      "down": "agent::NextHistoryMessage",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
  {
    "context": "ThreadHistory",
    "bindings": {
@@ -1212,8 +1194,7 @@
    "context": "KeymapEditor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-alt-f": "keymap_editor::ToggleKeystrokeSearch",
-      "cmd-alt-c": "keymap_editor::ToggleConflictFilter"
+      "cmd-f": "search::FocusSearch"
    }
  }
 ]
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -189,8 +189,6 @@
      "z shift-r": "editor::UnfoldAll",
      "z l": "vim::ColumnRight",
      "z h": "vim::ColumnLeft",
-      "z shift-l": "vim::HalfPageRight",
-      "z shift-h": "vim::HalfPageLeft",
      "shift-z shift-q": ["pane::CloseActiveItem", { "save_intent": "skip" }],
      "shift-z shift-z": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
      // Count support
@@ -220,18 +218,35 @@
    "context": "vim_mode == normal",
    "bindings": {
      "ctrl-[": "editor::Cancel",
+      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
      "d": "vim::PushDelete",
      "delete": "vim::DeleteRight",
+      "shift-d": "vim::DeleteToEndOfLine",
+      "shift-j": "vim::JoinLines",
      "g shift-j": "vim::JoinLinesNoWhitespace",
      "y": "vim::PushYank",
+      "shift-y": "vim::YankLine",
+      "i": "vim::InsertBefore",
+      "shift-i": "vim::InsertFirstNonWhitespace",
+      "a": "vim::InsertAfter",
+      "shift-a": "vim::InsertEndOfLine",
      "x": "vim::DeleteRight",
      "shift-x": "vim::DeleteLeft",
+      "o": "vim::InsertLineBelow",
+      "shift-o": "vim::InsertLineAbove",
+      "~": "vim::ChangeCase",
      "ctrl-a": "vim::Increment",
      "ctrl-x": "vim::Decrement",
+      "p": "vim::Paste",
+      "shift-p": ["vim::Paste", { "before": true }],
+      "u": "vim::Undo",
      "ctrl-r": "vim::Redo",
+      "r": "vim::PushReplace",
+      "s": "vim::Substitute",
+      "shift-s": "vim::SubstituteLine",
      ">": "vim::PushIndent",
      "<": "vim::PushOutdent",
      "=": "vim::PushAutoIndent",
@@ -241,8 +256,11 @@
      "g ~": "vim::PushOppositeCase",
      "g ?": "vim::PushRot13",
      // "g ?": "vim::PushRot47",
+      "\"": "vim::PushRegister",
      "g w": "vim::PushRewrap",
      "g q": "vim::PushRewrap",
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
      // tree-sitter related commands
      "[ x": "vim::SelectLargerSyntaxNode",
@@ -309,7 +327,6 @@
      "g shift-r": ["vim::Paste", { "preserve_clipboard": true }],
      "g c": "vim::ToggleComments",
      "g q": "vim::Rewrap",
-      "g w": "vim::Rewrap",
      "g ?": "vim::ConvertToRot13",
      // "g ?": "vim::ConvertToRot47",
      "\"": "vim::PushRegister",
@@ -346,11 +363,18 @@
    }
  },
  {
-    "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
+    "context": "vim_mode == helix_normal && !menu",
    "bindings": {
      "escape": "editor::Cancel",
+      "ctrl-[": "editor::Cancel",
+      ":": "command_palette::Toggle",
+      "left": "vim::WrappingLeft",
+      "right": "vim::WrappingRight",
+      "h": "vim::WrappingLeft",
+      "l": "vim::WrappingRight",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
+      "y": "editor::Copy",
      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
      "shift-i": "vim::InsertFirstNonWhitespace",
@@ -364,40 +388,27 @@
      "p": "vim::Paste",
      "shift-p": ["vim::Paste", { "before": true }],
      "u": "vim::Undo",
-      "shift-u": "vim::UndoLastLine",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      "\"": "vim::PushRegister",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem"
-    }
-  },
-  {
-    "context": "vim_mode == helix_normal && !menu",
-    "bindings": {
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      "left": "vim::WrappingLeft",
-      "right": "vim::WrappingRight",
-      "h": "vim::WrappingLeft",
-      "l": "vim::WrappingRight",
-      "y": "editor::Copy",
-      "alt-;": "vim::OtherEnd",
      "ctrl-r": "vim::Redo",
      "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
      "t": ["vim::PushFindForward", { "before": true, "multiline": true }],
      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": true }],
      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": true }],
+      "r": "vim::PushReplace",
+      "s": "vim::Substitute",
+      "shift-s": "vim::SubstituteLine",
      ">": "vim::Indent",
      "<": "vim::Outdent",
      "=": "vim::AutoIndent",
      "g u": "vim::PushLowercase",
      "g shift-u": "vim::PushUppercase",
      "g ~": "vim::PushOppositeCase",
+      "\"": "vim::PushRegister",
      "g q": "vim::PushRewrap",
      "g w": "vim::PushRewrap",
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
+      ".": "vim::Repeat",
      "alt-.": "vim::RepeatFind",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
@@ -417,6 +428,7 @@
      "g h": "vim::StartOfLine",
      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
      "g e": "vim::EndOfDocument",
+      "g y": "editor::GoToTypeDefinition",
      "g r": "editor::FindAllReferences", // zed specific
      "g t": "vim::WindowTop",
      "g c": "vim::WindowMiddle",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -25,7 +25,11 @@
  // Features that can be globally enabled or disabled
  "features": {
    // Which edit prediction provider to use.
-    "edit_prediction_provider": "zed"
+    "edit_prediction_provider": "zed",
+    // A globally enable or disable AI features.
+    //
+    // This setting supersedes all other settings related to AI features.
+    "ai_assistance": true
  },
  // The name of a font to use for rendering text in the editor
  "buffer_font_family": "Zed Plex Mono",
@@ -228,12 +232,7 @@
  // Whether to show code action button at start of buffer line.
  "inline_code_actions": true,
  // Whether to allow drag and drop text selection in buffer.
-  "drag_and_drop_selection": {
-    // When true, enables drag and drop text selection in buffer.
-    "enabled": true,
-    // The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-    "delay": 300
-  },
+  "drag_and_drop_selection": true,
  // What to do when go to definition yields no results.
  //
  // 1. Do nothing: `none`
@@ -362,9 +361,7 @@
    // Whether to show user picture in the titlebar.
    "show_user_picture": true,
    // Whether to show the sign in button in the titlebar.
-    "show_sign_in": true,
-    // Whether to show the menus in the titlebar.
-    "show_menus": false
+    "show_sign_in": true
  },
  // Scrollbar related settings
  "scrollbar": {
@@ -817,7 +814,6 @@
          "edit_file": true,
          "fetch": true,
          "list_directory": true,
-          "project_notifications": true,
          "move_path": true,
          "now": true,
          "find_path": true,
@@ -837,7 +833,6 @@
          "diagnostics": true,
          "fetch": true,
          "list_directory": true,
-          "project_notifications": true,
          "now": true,
          "find_path": true,
          "read_file": true,
@@ -864,15 +859,7 @@
    // its response, or needs user input.

    // Default: false
-    "play_sound_when_agent_done": false,
-    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
-    ///
-    /// Default: true
-    "expand_edit_card": true,
-    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
-    ///
-    /// Default: true
-    "expand_terminal_card": true
+    "play_sound_when_agent_done": false
  },
  // The settings for slash commands.
  "slash_commands": {
@@ -1157,14 +1144,16 @@
    // Control whether the git blame information is shown inline,
    // in the currently focused line.
    "inline_blame": {
-      "enabled": true,
+      "enabled": true
      // Sets a delay after which the inline blame information is shown.
      // Delay is restarted with every cursor movement.
-      "delay_ms": 0,
+      // "delay_ms": 600
+      //
      // Whether or not to display the git commit summary on the same line.
-      "show_commit_summary": false,
+      // "show_commit_summary": false
+      //
      // The minimum column number to show the inline blame information at
-      "min_column": 0
+      // "min_column": 0
    },
    // How git hunks are displayed visually in the editor.
    // This setting can take two values:
@@ -1365,7 +1354,7 @@
      // 5. Never show the scrollbar:
      //    "never"
      "show": null
-    },
+    }
    // Set the terminal's font size. If this option is not included,
    // the terminal will default to matching the buffer's font size.
    // "font_size": 15,
@@ -1377,26 +1366,11 @@
    // This will be merged with the platform's default font fallbacks
    // "font_fallbacks": ["FiraCode Nerd Fonts"],
    // The weight of the editor font in standard CSS units from 100 to 900.
-    "font_weight": 400,
+    // "font_weight": 400
    // Sets the maximum number of lines in the terminal's scrollback buffer.
    // Default: 10_000, maximum: 100_000 (all bigger values set will be treated as 100_000), 0 disables the scrolling.
    // Existing terminals will not pick up this change until they are recreated.
-    "max_scroll_history_lines": 10000,
-    // The minimum APCA perceptual contrast between foreground and background colors.
-    // APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
-    // especially for dark mode. Values range from 0 to 106.
-    //
-    // Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
-    // https://readtech.org/ARC/tests/bronze-simple-mode/
-    // - 0: No contrast adjustment
-    // - 45: Minimum for large fluent text (36px+)
-    // - 60: Minimum for other content text
-    // - 75: Minimum for body text
-    // - 90: Preferred for body text
-    //
-    // Most terminal themes have APCA values of 40-70.
-    // A value of 45 preserves colorful themes while ensuring legibility.
-    "minimum_contrast": 45
+    // "max_scroll_history_lines": 10000,
  },
  "code_actions_on_format": {},
  // Settings related to running tasks.
@@ -1608,9 +1582,6 @@
      "use_on_type_format": false,
      "allow_rewrap": "anywhere",
      "soft_wrap": "editor_width",
-      "completions": {
-        "words": "disabled"
-      },
      "prettier": {
        "allowed": true
      }
@@ -1624,9 +1595,6 @@
      }
    },
    "Plain Text": {
-      "completions": {
-        "words": "disabled"
-      },
      "allow_rewrap": "anywhere"
    },
    "Python": {
@@ -1855,8 +1823,6 @@
  "read_ssh_config": true,
  // Configures context servers for use by the agent.
  "context_servers": {},
-  // Configures agent servers available in the agent panel.
-  "agent_servers": {},
  "debugger": {
    "stepping_granularity": "line",
    "save_breakpoints": true,
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -3,6 +3,13 @@
 // For more documentation on how to configure debug tasks,
 // see: https://zed.dev/docs/debugger
 [
+  {
+    "label": "Debug active PHP file",
+    "adapter": "PHP",
+    "program": "$ZED_FILE",
+    "request": "launch",
+    "cwd": "$ZED_WORKTREE_ROOT"
+  },
  {
    "label": "Debug active Python file",
    "adapter": "Debugpy",
--- a/crates/acp/Cargo.toml
+++ b/crates/acp/Cargo.toml
@@ -1,47 +0,0 @@
-[package]
-name = "acp"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/acp.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "project/test-support"]
-gemini = []
-
-[dependencies]
-agent_servers.workspace = true
-agentic-coding-protocol.workspace = true
-anyhow.workspace = true
-assistant_tool.workspace = true
-buffer_diff.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-markdown.workspace = true
-project.workspace = true
-settings.workspace = true
-smol.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace-hack.workspace = true
-
-[dev-dependencies]
-async-pipe.workspace = true
-env_logger.workspace = true
-gpui = { workspace = true, "features" = ["test-support"] }
-indoc.workspace = true
-project = { workspace = true, "features" = ["test-support"] }
-serde_json.workspace = true
-tempfile.workspace = true
-util.workspace = true
-settings.workspace = true
--- a/crates/acp/LICENSE-GPL
+++ b/crates/acp/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/acp/src/acp.rs
+++ b/crates/acp/src/acp.rs
--- a/crates/agent/src/prompts/stale_files_prompt_header.txt
+++ b/crates/agent/src/prompts/stale_files_prompt_header.txt
@@ -1,3 +0,0 @@
-[The following is an auto-generated notification; do not reply]
-
-These files have changed since the last read:
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -23,11 +23,10 @@ use gpui::{
 };
 use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelExt as _, LanguageModelId, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
-    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, MessageContent,
-    ModelRequestLimitReachedError, PaymentRequiredError, Role, SelectedModel, StopReason,
-    TokenUsage,
+    LanguageModelId, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolResultContent,
+    LanguageModelToolUseId, MessageContent, ModelRequestLimitReachedError, PaymentRequiredError,
+    Role, SelectedModel, StopReason, TokenUsage,
 };
 use postage::stream::Stream as _;
 use project::{
@@ -46,7 +45,7 @@ use std::{
    time::{Duration, Instant},
 };
 use thiserror::Error;
-use util::{ResultExt as _, debug_panic, post_inc};
+use util::{ResultExt as _, post_inc};
 use uuid::Uuid;
 use zed_llm_client::{CompletionIntent, CompletionRequestStatus, UsageLimit};

@@ -1249,8 +1248,6 @@ impl Thread {

        self.remaining_turns -= 1;

-        self.flush_notifications(model.clone(), intent, cx);
-
        let request = self.to_completion_request(model.clone(), intent, cx);

        self.stream_completion(request, model, intent, window, cx);
@@ -1284,7 +1281,6 @@ impl Thread {
            tool_choice: None,
            stop: Vec::new(),
            temperature: AgentSettings::temperature_for_model(&model, cx),
-            thinking_allowed: true,
        };

        let available_tools = self.available_tools(cx, model.clone());
@@ -1450,7 +1446,6 @@ impl Thread {
            tool_choice: None,
            stop: Vec::new(),
            temperature: AgentSettings::temperature_for_model(model, cx),
-            thinking_allowed: false,
        };

        for message in &self.messages {
@@ -1486,111 +1481,6 @@ impl Thread {
        request
    }

-    /// Insert auto-generated notifications (if any) to the thread
-    fn flush_notifications(
-        &mut self,
-        model: Arc<dyn LanguageModel>,
-        intent: CompletionIntent,
-        cx: &mut Context<Self>,
-    ) {
-        match intent {
-            CompletionIntent::UserPrompt | CompletionIntent::ToolResults => {
-                if let Some(pending_tool_use) = self.attach_tracked_files_state(model, cx) {
-                    cx.emit(ThreadEvent::ToolFinished {
-                        tool_use_id: pending_tool_use.id.clone(),
-                        pending_tool_use: Some(pending_tool_use),
-                    });
-                }
-            }
-            CompletionIntent::ThreadSummarization
-            | CompletionIntent::ThreadContextSummarization
-            | CompletionIntent::CreateFile
-            | CompletionIntent::EditFile
-            | CompletionIntent::InlineAssist
-            | CompletionIntent::TerminalInlineAssist
-            | CompletionIntent::GenerateGitCommitMessage => {}
-        };
-    }
-
-    fn attach_tracked_files_state(
-        &mut self,
-        model: Arc<dyn LanguageModel>,
-        cx: &mut App,
-    ) -> Option<PendingToolUse> {
-        let action_log = self.action_log.read(cx);
-
-        action_log.unnotified_stale_buffers(cx).next()?;
-
-        // Represent notification as a simulated `project_notifications` tool call
-        let tool_name = Arc::from("project_notifications");
-        let Some(tool) = self.tools.read(cx).tool(&tool_name, cx) else {
-            debug_panic!("`project_notifications` tool not found");
-            return None;
-        };
-
-        if !self.profile.is_tool_enabled(tool.source(), tool.name(), cx) {
-            return None;
-        }
-
-        let input = serde_json::json!({});
-        let request = Arc::new(LanguageModelRequest::default()); // unused
-        let window = None;
-        let tool_result = tool.run(
-            input,
-            request,
-            self.project.clone(),
-            self.action_log.clone(),
-            model.clone(),
-            window,
-            cx,
-        );
-
-        let tool_use_id =
-            LanguageModelToolUseId::from(format!("project_notifications_{}", self.messages.len()));
-
-        let tool_use = LanguageModelToolUse {
-            id: tool_use_id.clone(),
-            name: tool_name.clone(),
-            raw_input: "{}".to_string(),
-            input: serde_json::json!({}),
-            is_input_complete: true,
-        };
-
-        let tool_output = cx.background_executor().block(tool_result.output);
-
-        // Attach a project_notification tool call to the latest existing
-        // Assistant message. We cannot create a new Assistant message
-        // because thinking models require a `thinking` block that we
-        // cannot mock. We cannot send a notification as a normal
-        // (non-tool-use) User message because this distracts Agent
-        // too much.
-        let tool_message_id = self
-            .messages
-            .iter()
-            .enumerate()
-            .rfind(|(_, message)| message.role == Role::Assistant)
-            .map(|(_, message)| message.id)?;
-
-        let tool_use_metadata = ToolUseMetadata {
-            model: model.clone(),
-            thread_id: self.id.clone(),
-            prompt_id: self.last_prompt_id.clone(),
-        };
-
-        self.tool_use
-            .request_tool_use(tool_message_id, tool_use, tool_use_metadata.clone(), cx);
-
-        let pending_tool_use = self.tool_use.insert_tool_output(
-            tool_use_id.clone(),
-            tool_name,
-            tool_output,
-            self.configured_model.as_ref(),
-            self.completion_mode,
-        );
-
-        pending_tool_use
-    }
-
    pub fn stream_completion(
        &mut self,
        request: LanguageModelRequest,
@@ -1614,10 +1504,6 @@ impl Thread {
            prompt_id: prompt_id.clone(),
        };

-        let completion_mode = request
-            .mode
-            .unwrap_or(zed_llm_client::CompletionMode::Normal);
-
        self.last_received_chunk_at = Some(Instant::now());

        let task = cx.spawn(async move |thread, cx| {
@@ -1967,11 +1853,7 @@ impl Thread {
                                                .unwrap_or(0)
                                                // We know the context window was exceeded in practice, so if our estimate was
                                                // lower than max tokens, the estimate was wrong; return that we exceeded by 1.
-                                                .max(
-                                                    model
-                                                        .max_token_count_for_mode(completion_mode)
-                                                        .saturating_add(1),
-                                                )
+                                                .max(model.max_token_count().saturating_add(1))
                                        });
                                        thread.exceeded_window_error = Some(ExceededWindowError {
                                            model_id: model.id(),
@@ -2519,7 +2401,6 @@ impl Thread {
            hallucinated_tool_name,
            Err(anyhow!("Missing tool call: {error_message}")),
            self.configured_model.as_ref(),
-            self.completion_mode,
        );

        cx.emit(ThreadEvent::MissingToolUse {
@@ -2546,7 +2427,6 @@ impl Thread {
            tool_name,
            Err(anyhow!("Error parsing input JSON: {error}")),
            self.configured_model.as_ref(),
-            self.completion_mode,
        );
        let ui_text = if let Some(pending_tool_use) = &pending_tool_use {
            pending_tool_use.ui_text.clone()
@@ -2622,7 +2502,6 @@ impl Thread {
                            tool_name,
                            output,
                            thread.configured_model.as_ref(),
-                            thread.completion_mode,
                        );
                        thread.tool_finished(tool_use_id, pending_tool_use, false, window, cx);
                    })
@@ -3099,9 +2978,7 @@ impl Thread {
            return TotalTokenUsage::default();
        };

-        let max = model
-            .model
-            .max_token_count_for_mode(self.completion_mode().into());
+        let max = model.model.max_token_count();

        let index = self
            .messages
@@ -3128,9 +3005,7 @@ impl Thread {
    pub fn total_token_usage(&self) -> Option<TotalTokenUsage> {
        let model = self.configured_model.as_ref()?;

-        let max = model
-            .model
-            .max_token_count_for_mode(self.completion_mode().into());
+        let max = model.model.max_token_count();

        if let Some(exceeded_error) = &self.exceeded_window_error {
            if model.model.id() == exceeded_error.model_id {
@@ -3196,7 +3071,6 @@ impl Thread {
            tool_name,
            err,
            self.configured_model.as_ref(),
-            self.completion_mode,
        );
        self.tool_finished(tool_use_id.clone(), None, true, window, cx);
    }
@@ -3282,13 +3156,10 @@ mod tests {
    const TEST_RATE_LIMIT_RETRY_SECS: u64 = 30;
    use agent_settings::{AgentProfileId, AgentSettings, LanguageModelParameters};
    use assistant_tool::ToolRegistry;
-    use assistant_tools;
    use futures::StreamExt;
    use futures::future::BoxFuture;
    use futures::stream::BoxStream;
    use gpui::TestAppContext;
-    use http_client;
-    use indoc::indoc;
    use language_model::fake_provider::{FakeLanguageModel, FakeLanguageModelProvider};
    use language_model::{
        LanguageModelCompletionError, LanguageModelName, LanguageModelProviderId,
@@ -3616,134 +3487,6 @@ fn main() {{
        );
    }

-    #[gpui::test]
-    async fn test_stale_buffer_notification(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(
-            cx,
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let (_workspace, _thread_store, thread, context_store, model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        // Add a buffer to the context. This will be a tracked buffer
-        let buffer = add_file_to_context(&project, &context_store, "test/code.rs", cx)
-            .await
-            .unwrap();
-
-        let context = context_store
-            .read_with(cx, |store, _| store.context().next().cloned())
-            .unwrap();
-        let loaded_context = cx
-            .update(|cx| load_context(vec![context], &project, &None, cx))
-            .await;
-
-        // Insert user message and assistant response
-        thread.update(cx, |thread, cx| {
-            thread.insert_user_message("Explain this code", loaded_context, None, Vec::new(), cx);
-            thread.insert_assistant_message(
-                vec![MessageSegment::Text("This code prints 42.".into())],
-                cx,
-            );
-        });
-
-        // We shouldn't have a stale buffer notification yet
-        let notifications = thread.read_with(cx, |thread, _| {
-            find_tool_uses(thread, "project_notifications")
-        });
-        assert!(
-            notifications.is_empty(),
-            "Should not have stale buffer notification before buffer is modified"
-        );
-
-        // Modify the buffer
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [(1..1, "\n    println!(\"Added a new line\");\n")],
-                None,
-                cx,
-            );
-        });
-
-        // Insert another user message
-        thread.update(cx, |thread, cx| {
-            thread.insert_user_message(
-                "What does the code do now?",
-                ContextLoadResult::default(),
-                None,
-                Vec::new(),
-                cx,
-            )
-        });
-
-        // Check for the stale buffer warning
-        thread.update(cx, |thread, cx| {
-            thread.flush_notifications(model.clone(), CompletionIntent::UserPrompt, cx)
-        });
-
-        let notifications = thread.read_with(cx, |thread, _cx| {
-            find_tool_uses(thread, "project_notifications")
-        });
-
-        let [notification] = notifications.as_slice() else {
-            panic!("Should have a `project_notifications` tool use");
-        };
-
-        let Some(notification_content) = notification.content.to_str() else {
-            panic!("`project_notifications` should return text");
-        };
-
-        let expected_content = indoc! {"[The following is an auto-generated notification; do not reply]
-
-        These files have changed since the last read:
-        - code.rs
-        "};
-        assert_eq!(notification_content, expected_content);
-
-        // Insert another user message and flush notifications again
-        thread.update(cx, |thread, cx| {
-            thread.insert_user_message(
-                "Can you tell me more?",
-                ContextLoadResult::default(),
-                None,
-                Vec::new(),
-                cx,
-            )
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.flush_notifications(model.clone(), CompletionIntent::UserPrompt, cx)
-        });
-
-        // There should be no new notifications (we already flushed one)
-        let notifications = thread.read_with(cx, |thread, _cx| {
-            find_tool_uses(thread, "project_notifications")
-        });
-
-        assert_eq!(
-            notifications.len(),
-            1,
-            "Should still have only one notification after second flush - no duplicates"
-        );
-    }
-
-    fn find_tool_uses(thread: &Thread, tool_name: &str) -> Vec<LanguageModelToolResult> {
-        thread
-            .messages()
-            .flat_map(|message| {
-                thread
-                    .tool_results_for_message(message.id)
-                    .into_iter()
-                    .filter(|result| result.tool_name == tool_name.into())
-                    .cloned()
-                    .collect::<Vec<_>>()
-            })
-            .collect()
-    }
-
    #[gpui::test]
    async fn test_storing_profile_setting_per_thread(cx: &mut TestAppContext) {
        init_test_settings(cx);
@@ -5309,14 +5052,6 @@ fn main() {{
            language_model::init_settings(cx);
            ThemeSettings::register(cx);
            ToolRegistry::default_global(cx);
-            assistant_tool::init(cx);
-
-            let http_client = Arc::new(http_client::HttpClientWithUrl::new(
-                http_client::FakeHttpClient::with_200_response(),
-                "http://localhost".to_string(),
-                None,
-            ));
-            assistant_tools::init(http_client, cx);
        });
    }

--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -2,7 +2,6 @@ use crate::{
    thread::{MessageId, PromptId, ThreadId},
    thread_store::SerializedMessage,
 };
-use agent_settings::CompletionMode;
 use anyhow::Result;
 use assistant_tool::{
    AnyToolCard, Tool, ToolResultContent, ToolResultOutput, ToolUseStatus, ToolWorkingSet,
@@ -12,9 +11,8 @@ use futures::{FutureExt as _, future::Shared};
 use gpui::{App, Entity, SharedString, Task, Window};
 use icons::IconName;
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelExt, LanguageModelRequest,
-    LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolUse,
-    LanguageModelToolUseId, Role,
+    ConfiguredModel, LanguageModel, LanguageModelRequest, LanguageModelToolResult,
+    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, Role,
 };
 use project::Project;
 use std::sync::Arc;
@@ -402,7 +400,6 @@ impl ToolUseState {
        tool_name: Arc<str>,
        output: Result<ToolResultOutput>,
        configured_model: Option<&ConfiguredModel>,
-        completion_mode: CompletionMode,
    ) -> Option<PendingToolUse> {
        let metadata = self.tool_use_metadata_by_id.remove(&tool_use_id);

@@ -429,10 +426,7 @@ impl ToolUseState {

                // Protect from overly large output
                let tool_output_limit = configured_model
-                    .map(|model| {
-                        model.model.max_token_count_for_mode(completion_mode.into()) as usize
-                            * BYTES_PER_TOKEN_ESTIMATE
-                    })
+                    .map(|model| model.model.max_token_count() as usize * BYTES_PER_TOKEN_ESTIMATE)
                    .unwrap_or(usize::MAX);

                let content = match tool_result {
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-name = "agent_servers"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_servers.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-paths.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-util.workspace = true
-which.workspace = true
-workspace-hack.workspace = true
--- a/crates/agent_servers/LICENSE-GPL
+++ b/crates/agent_servers/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -1,231 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use gpui::{App, AsyncApp, Entity, SharedString};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsStore};
-use util::{ResultExt, paths};
-
-pub fn init(cx: &mut App) {
-    AllAgentServersSettings::register(cx);
-}
-
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug)]
-pub struct AllAgentServersSettings {
-    gemini: Option<AgentServerSettings>,
-}
-
-#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
-pub struct AgentServerSettings {
-    #[serde(flatten)]
-    command: AgentServerCommand,
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
-pub struct AgentServerCommand {
-    #[serde(rename = "command")]
-    pub path: PathBuf,
-    #[serde(default)]
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-pub struct Gemini;
-
-pub struct AgentServerVersion {
-    pub current_version: SharedString,
-    pub supported: bool,
-}
-
-pub trait AgentServer: Send {
-    fn command(
-        &self,
-        project: &Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> impl Future<Output = Result<AgentServerCommand>>;
-
-    fn version(
-        &self,
-        command: &AgentServerCommand,
-    ) -> impl Future<Output = Result<AgentServerVersion>> + Send;
-}
-
-const GEMINI_ACP_ARG: &str = "--acp";
-
-impl AgentServer for Gemini {
-    async fn command(
-        &self,
-        project: &Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Result<AgentServerCommand> {
-        let custom_command = cx.read_global(|settings: &SettingsStore, _| {
-            let settings = settings.get::<AllAgentServersSettings>(None);
-            settings
-                .gemini
-                .as_ref()
-                .map(|gemini_settings| AgentServerCommand {
-                    path: gemini_settings.command.path.clone(),
-                    args: gemini_settings
-                        .command
-                        .args
-                        .iter()
-                        .cloned()
-                        .chain(std::iter::once(GEMINI_ACP_ARG.into()))
-                        .collect(),
-                    env: gemini_settings.command.env.clone(),
-                })
-        })?;
-
-        if let Some(custom_command) = custom_command {
-            return Ok(custom_command);
-        }
-
-        if let Some(path) = find_bin_in_path("gemini", project, cx).await {
-            return Ok(AgentServerCommand {
-                path,
-                args: vec![GEMINI_ACP_ARG.into()],
-                env: None,
-            });
-        }
-
-        let (fs, node_runtime) = project.update(cx, |project, _| {
-            (project.fs().clone(), project.node_runtime().cloned())
-        })?;
-        let node_runtime = node_runtime.context("gemini not found on path")?;
-
-        let directory = ::paths::agent_servers_dir().join("gemini");
-        fs.create_dir(&directory).await?;
-        node_runtime
-            .npm_install_packages(&directory, &[("@google/gemini-cli", "latest")])
-            .await?;
-        let path = directory.join("node_modules/.bin/gemini");
-
-        Ok(AgentServerCommand {
-            path,
-            args: vec![GEMINI_ACP_ARG.into()],
-            env: None,
-        })
-    }
-
-    async fn version(&self, command: &AgentServerCommand) -> Result<AgentServerVersion> {
-        let version_fut = util::command::new_smol_command(&command.path)
-            .args(command.args.iter())
-            .arg("--version")
-            .kill_on_drop(true)
-            .output();
-
-        let help_fut = util::command::new_smol_command(&command.path)
-            .args(command.args.iter())
-            .arg("--help")
-            .kill_on_drop(true)
-            .output();
-
-        let (version_output, help_output) = futures::future::join(version_fut, help_fut).await;
-
-        let current_version = String::from_utf8(version_output?.stdout)?.into();
-        let supported = String::from_utf8(help_output?.stdout)?.contains(GEMINI_ACP_ARG);
-
-        Ok(AgentServerVersion {
-            current_version,
-            supported,
-        })
-    }
-}
-
-async fn find_bin_in_path(
-    bin_name: &'static str,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Option<PathBuf> {
-    let (env_task, root_dir) = project
-        .update(cx, |project, cx| {
-            let worktree = project.visible_worktrees(cx).next();
-            match worktree {
-                Some(worktree) => {
-                    let env_task = project.environment().update(cx, |env, cx| {
-                        env.get_worktree_environment(worktree.clone(), cx)
-                    });
-
-                    let path = worktree.read(cx).abs_path();
-                    (env_task, path)
-                }
-                None => {
-                    let path: Arc<Path> = paths::home_dir().as_path().into();
-                    let env_task = project.environment().update(cx, |env, cx| {
-                        env.get_directory_environment(path.clone(), cx)
-                    });
-                    (env_task, path)
-                }
-            }
-        })
-        .log_err()?;
-
-    cx.background_executor()
-        .spawn(async move {
-            let which_result = if cfg!(windows) {
-                which::which(bin_name)
-            } else {
-                let env = env_task.await.unwrap_or_default();
-                let shell_path = env.get("PATH").cloned();
-                which::which_in(bin_name, shell_path.as_ref(), root_dir.as_ref())
-            };
-
-            if let Err(which::Error::CannotFindBinaryPath) = which_result {
-                return None;
-            }
-
-            which_result.log_err()
-        })
-        .await
-}
-
-impl std::fmt::Debug for AgentServerCommand {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let filtered_env = self.env.as_ref().map(|env| {
-            env.iter()
-                .map(|(k, v)| {
-                    (
-                        k,
-                        if util::redact::should_redact(k) {
-                            "[REDACTED]"
-                        } else {
-                            v
-                        },
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-
-        f.debug_struct("AgentServerCommand")
-            .field("path", &self.path)
-            .field("args", &self.args)
-            .field("env", &filtered_env)
-            .finish()
-    }
-}
-
-impl settings::Settings for AllAgentServersSettings {
-    const KEY: Option<&'static str> = Some("agent_servers");
-
-    type FileContent = Self;
-
-    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
-        let mut settings = AllAgentServersSettings::default();
-
-        for value in sources.defaults_and_customizations() {
-            if value.gemini.is_some() {
-                settings.gemini = value.gemini.clone();
-            }
-        }
-
-        Ok(settings)
-    }
-
-    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
-}
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -67,8 +67,6 @@ pub struct AgentSettings {
    pub model_parameters: Vec<LanguageModelParameters>,
    pub preferred_completion_mode: CompletionMode,
    pub enable_feedback: bool,
-    pub expand_edit_card: bool,
-    pub expand_terminal_card: bool,
 }

 impl AgentSettings {
@@ -293,14 +291,6 @@ pub struct AgentSettingsContent {
    ///
    /// Default: true
    enable_feedback: Option<bool>,
-    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
-    ///
-    /// Default: true
-    expand_edit_card: Option<bool>,
-    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
-    ///
-    /// Default: true
-    expand_terminal_card: Option<bool>,
 }

 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
@@ -451,11 +441,6 @@ impl Settings for AgentSettings {
                value.preferred_completion_mode,
            );
            merge(&mut settings.enable_feedback, value.enable_feedback);
-            merge(&mut settings.expand_edit_card, value.expand_edit_card);
-            merge(
-                &mut settings.expand_terminal_card,
-                value.expand_terminal_card,
-            );

            settings
                .model_parameters
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -13,14 +13,14 @@ path = "src/agent_ui.rs"
 doctest = false

 [features]
-test-support = ["gpui/test-support", "language/test-support"]
+test-support = [
+    "gpui/test-support",
+    "language/test-support",
+]

 [dependencies]
-acp.workspace = true
 agent.workspace = true
-agentic-coding-protocol.workspace = true
 agent_settings.workspace = true
-agent_servers.workspace = true
 anyhow.workspace = true
 assistant_context.workspace = true
 assistant_slash_command.workspace = true
@@ -76,7 +76,6 @@ serde_json_lenient.workspace = true
 settings.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
-task.workspace = true
 telemetry.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
--- a/crates/agent_ui/src/acp.rs
+++ b/crates/agent_ui/src/acp.rs
@@ -1,6 +0,0 @@
-mod completion_provider;
-mod message_history;
-mod thread_view;
-
-pub use message_history::MessageHistory;
-pub use thread_view::AcpThreadView;
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1,574 +0,0 @@
-use std::ops::Range;
-use std::path::Path;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use anyhow::Result;
-use collections::HashMap;
-use editor::display_map::CreaseId;
-use editor::{CompletionProvider, Editor, ExcerptId};
-use file_icons::FileIcons;
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{Buffer, CodeLabel, HighlightId};
-use lsp::CompletionContext;
-use parking_lot::Mutex;
-use project::{Completion, CompletionIntent, CompletionResponse, ProjectPath, WorktreeId};
-use rope::Point;
-use text::{Anchor, ToPoint};
-use ui::prelude::*;
-use workspace::Workspace;
-
-use crate::context_picker::MentionLink;
-use crate::context_picker::file_context_picker::{extract_file_name_and_directory, search_files};
-
-#[derive(Default)]
-pub struct MentionSet {
-    paths_by_crease_id: HashMap<CreaseId, ProjectPath>,
-}
-
-impl MentionSet {
-    pub fn insert(&mut self, crease_id: CreaseId, path: ProjectPath) {
-        self.paths_by_crease_id.insert(crease_id, path);
-    }
-
-    pub fn path_for_crease_id(&self, crease_id: CreaseId) -> Option<ProjectPath> {
-        self.paths_by_crease_id.get(&crease_id).cloned()
-    }
-
-    pub fn drain(&mut self) -> impl Iterator<Item = CreaseId> {
-        self.paths_by_crease_id.drain().map(|(id, _)| id)
-    }
-}
-
-pub struct ContextPickerCompletionProvider {
-    workspace: WeakEntity<Workspace>,
-    editor: WeakEntity<Editor>,
-    mention_set: Arc<Mutex<MentionSet>>,
-}
-
-impl ContextPickerCompletionProvider {
-    pub fn new(
-        mention_set: Arc<Mutex<MentionSet>>,
-        workspace: WeakEntity<Workspace>,
-        editor: WeakEntity<Editor>,
-    ) -> Self {
-        Self {
-            mention_set,
-            workspace,
-            editor,
-        }
-    }
-
-    fn completion_for_path(
-        project_path: ProjectPath,
-        path_prefix: &str,
-        is_recent: bool,
-        is_directory: bool,
-        excerpt_id: ExcerptId,
-        source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        mention_set: Arc<Mutex<MentionSet>>,
-        cx: &App,
-    ) -> Completion {
-        let (file_name, directory) =
-            extract_file_name_and_directory(&project_path.path, path_prefix);
-
-        let label =
-            build_code_label_for_full_path(&file_name, directory.as_ref().map(|s| s.as_ref()), cx);
-        let full_path = if let Some(directory) = directory {
-            format!("{}{}", directory, file_name)
-        } else {
-            file_name.to_string()
-        };
-
-        let crease_icon_path = if is_directory {
-            FileIcons::get_folder_icon(false, cx).unwrap_or_else(|| IconName::Folder.path().into())
-        } else {
-            FileIcons::get_icon(Path::new(&full_path), cx)
-                .unwrap_or_else(|| IconName::File.path().into())
-        };
-        let completion_icon_path = if is_recent {
-            IconName::HistoryRerun.path().into()
-        } else {
-            crease_icon_path.clone()
-        };
-
-        let new_text = format!("{} ", MentionLink::for_file(&file_name, &full_path));
-        let new_text_len = new_text.len();
-        Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label,
-            documentation: None,
-            source: project::CompletionSource::Custom,
-            icon_path: Some(completion_icon_path),
-            insert_text_mode: None,
-            confirm: Some(confirm_completion_callback(
-                crease_icon_path,
-                file_name,
-                project_path,
-                excerpt_id,
-                source_range.start,
-                new_text_len - 1,
-                editor,
-                mention_set,
-            )),
-        }
-    }
-}
-
-fn build_code_label_for_full_path(file_name: &str, directory: Option<&str>, cx: &App) -> CodeLabel {
-    let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
-    let mut label = CodeLabel::default();
-
-    label.push_str(&file_name, None);
-    label.push_str(" ", None);
-
-    if let Some(directory) = directory {
-        label.push_str(&directory, comment_id);
-    }
-
-    label.filter_range = 0..label.text().len();
-
-    label
-}
-
-impl CompletionProvider for ContextPickerCompletionProvider {
-    fn completions(
-        &self,
-        excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: Anchor,
-        _trigger: CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let state = buffer.update(cx, |buffer, _cx| {
-            let position = buffer_position.to_point(buffer);
-            let line_start = Point::new(position.row, 0);
-            let offset_to_line = buffer.point_to_offset(line_start);
-            let mut lines = buffer.text_for_range(line_start..position).lines();
-            let line = lines.next()?;
-            MentionCompletion::try_parse(line, offset_to_line)
-        });
-        let Some(state) = state else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        let snapshot = buffer.read(cx).snapshot();
-        let source_range = snapshot.anchor_before(state.source_range.start)
-            ..snapshot.anchor_after(state.source_range.end);
-
-        let editor = self.editor.clone();
-        let mention_set = self.mention_set.clone();
-        let MentionCompletion { argument, .. } = state;
-        let query = argument.unwrap_or_else(|| "".to_string());
-
-        let search_task = search_files(query.clone(), Arc::<AtomicBool>::default(), &workspace, cx);
-
-        cx.spawn(async move |_, cx| {
-            let matches = search_task.await;
-            let Some(editor) = editor.upgrade() else {
-                return Ok(Vec::new());
-            };
-
-            let completions = cx.update(|cx| {
-                matches
-                    .into_iter()
-                    .map(|mat| {
-                        let path_match = &mat.mat;
-                        let project_path = ProjectPath {
-                            worktree_id: WorktreeId::from_usize(path_match.worktree_id),
-                            path: path_match.path.clone(),
-                        };
-
-                        Self::completion_for_path(
-                            project_path,
-                            &path_match.path_prefix,
-                            mat.is_recent,
-                            path_match.is_dir,
-                            excerpt_id,
-                            source_range.clone(),
-                            editor.clone(),
-                            mention_set.clone(),
-                            cx,
-                        )
-                    })
-                    .collect()
-            })?;
-
-            Ok(vec![CompletionResponse {
-                completions,
-                // Since this does its own filtering (see `filter_completions()` returns false),
-                // there is no benefit to computing whether this set of completions is incomplete.
-                is_incomplete: true,
-            }])
-        })
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<language::Buffer>,
-        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        _menu_is_open: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let buffer = buffer.read(cx);
-        let position = position.to_point(buffer);
-        let line_start = Point::new(position.row, 0);
-        let offset_to_line = buffer.point_to_offset(line_start);
-        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            MentionCompletion::try_parse(line, offset_to_line)
-                .map(|completion| {
-                    completion.source_range.start <= offset_to_line + position.column as usize
-                        && completion.source_range.end >= offset_to_line + position.column as usize
-                })
-                .unwrap_or(false)
-        } else {
-            false
-        }
-    }
-
-    fn sort_completions(&self) -> bool {
-        false
-    }
-
-    fn filter_completions(&self) -> bool {
-        false
-    }
-}
-
-fn confirm_completion_callback(
-    crease_icon_path: SharedString,
-    crease_text: SharedString,
-    project_path: ProjectPath,
-    excerpt_id: ExcerptId,
-    start: Anchor,
-    content_len: usize,
-    editor: Entity<Editor>,
-    mention_set: Arc<Mutex<MentionSet>>,
-) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
-    Arc::new(move |_, window, cx| {
-        let crease_text = crease_text.clone();
-        let crease_icon_path = crease_icon_path.clone();
-        let editor = editor.clone();
-        let project_path = project_path.clone();
-        let mention_set = mention_set.clone();
-        window.defer(cx, move |window, cx| {
-            let crease_id = crate::context_picker::insert_crease_for_mention(
-                excerpt_id,
-                start,
-                content_len,
-                crease_text.clone(),
-                crease_icon_path,
-                editor.clone(),
-                window,
-                cx,
-            );
-            if let Some(crease_id) = crease_id {
-                mention_set.lock().insert(crease_id, project_path);
-            }
-        });
-        false
-    })
-}
-
-#[derive(Debug, Default, PartialEq)]
-struct MentionCompletion {
-    source_range: Range<usize>,
-    argument: Option<String>,
-}
-
-impl MentionCompletion {
-    fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
-        let last_mention_start = line.rfind('@')?;
-        if last_mention_start >= line.len() {
-            return Some(Self::default());
-        }
-        if last_mention_start > 0
-            && line
-                .chars()
-                .nth(last_mention_start - 1)
-                .map_or(false, |c| !c.is_whitespace())
-        {
-            return None;
-        }
-
-        let rest_of_line = &line[last_mention_start + 1..];
-        let mut argument = None;
-
-        let mut parts = rest_of_line.split_whitespace();
-        let mut end = last_mention_start + 1;
-        if let Some(argument_text) = parts.next() {
-            end += argument_text.len();
-            argument = Some(argument_text.to_string());
-        }
-
-        Some(Self {
-            source_range: last_mention_start + offset_to_line..end + offset_to_line,
-            argument,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext};
-    use project::{Project, ProjectPath};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::{ops::Deref, rc::Rc};
-    use util::path;
-    use workspace::{AppState, Item};
-
-    #[test]
-    fn test_mention_completion_parse() {
-        assert_eq!(MentionCompletion::try_parse("Lorem Ipsum", 0), None);
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @", 0),
-            Some(MentionCompletion {
-                source_range: 6..7,
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @main", 0),
-            Some(MentionCompletion {
-                source_range: 6..11,
-                argument: Some("main".to_string()),
-            })
-        );
-
-        assert_eq!(MentionCompletion::try_parse("test@", 0), None);
-    }
-
-    struct AtMentionEditor(Entity<Editor>);
-
-    impl Item for AtMentionEditor {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for AtMentionEditor {}
-
-    impl Focusable for AtMentionEditor {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx).clone()
-        }
-    }
-
-    impl Render for AtMentionEditor {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_context_completion_provider(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            language::init(cx);
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-            Project::init_settings(cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "editor": "",
-                    "a": {
-                        "one.txt": "",
-                        "two.txt": "",
-                        "three.txt": "",
-                        "four.txt": ""
-                    },
-                    "b": {
-                        "five.txt": "",
-                        "six.txt": "",
-                        "seven.txt": "",
-                        "eight.txt": "",
-                    }
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(*window.deref(), cx);
-
-        let paths = vec![
-            path!("a/one.txt"),
-            path!("a/two.txt"),
-            path!("a/three.txt"),
-            path!("a/four.txt"),
-            path!("b/five.txt"),
-            path!("b/six.txt"),
-            path!("b/seven.txt"),
-            path!("b/eight.txt"),
-        ];
-
-        let mut opened_editors = Vec::new();
-        for path in paths {
-            let buffer = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    workspace.open_path(
-                        ProjectPath {
-                            worktree_id,
-                            path: Path::new(path).into(),
-                        },
-                        None,
-                        false,
-                        window,
-                        cx,
-                    )
-                })
-                .await
-                .unwrap();
-            opened_editors.push(buffer);
-        }
-
-        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let editor = cx.new(|cx| {
-                Editor::new(
-                    editor::EditorMode::full(),
-                    multi_buffer::MultiBuffer::build_simple("", cx),
-                    None,
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| AtMentionEditor(editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            editor
-        });
-
-        let mention_set = Arc::new(Mutex::new(MentionSet::default()));
-
-        let editor_entity = editor.downgrade();
-        editor.update_in(&mut cx, |editor, window, cx| {
-            window.focus(&editor.focus_handle(cx));
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
-                mention_set.clone(),
-                workspace.downgrade(),
-                editor_entity,
-            ))));
-        });
-
-        cx.simulate_input("Lorem ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem ");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("@");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    "eight.txt dir/b/",
-                    "seven.txt dir/b/",
-                    "six.txt dir/b/",
-                    "five.txt dir/b/",
-                    "four.txt dir/a/",
-                    "three.txt dir/a/",
-                    "two.txt dir/a/",
-                    "one.txt dir/a/",
-                    "dir ",
-                    "a dir/",
-                    "four.txt dir/a/",
-                    "one.txt dir/a/",
-                    "three.txt dir/a/",
-                    "two.txt dir/a/",
-                    "b dir/",
-                    "eight.txt dir/b/",
-                    "five.txt dir/b/",
-                    "seven.txt dir/b/",
-                    "six.txt dir/b/",
-                    "editor dir/"
-                ]
-            );
-        });
-
-        // Select and confirm "File"
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@four.txt](@file:dir/a/four.txt) ");
-        });
-    }
-
-    fn current_completion_labels(editor: &Editor) -> Vec<String> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| completion.label.text.to_string())
-            .collect::<Vec<_>>()
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            client::init_settings(cx);
-            language::init(cx);
-            Project::init_settings(cx);
-            workspace::init_settings(cx);
-            editor::init_settings(cx);
-        });
-    }
-}
--- a/crates/agent_ui/src/acp/message_history.rs
+++ b/crates/agent_ui/src/acp/message_history.rs
@@ -1,87 +0,0 @@
-pub struct MessageHistory<T> {
-    items: Vec<T>,
-    current: Option<usize>,
-}
-
-impl<T> Default for MessageHistory<T> {
-    fn default() -> Self {
-        MessageHistory {
-            items: Vec::new(),
-            current: None,
-        }
-    }
-}
-
-impl<T> MessageHistory<T> {
-    pub fn push(&mut self, message: T) {
-        self.current.take();
-        self.items.push(message);
-    }
-
-    pub fn reset_position(&mut self) {
-        self.current.take();
-    }
-
-    pub fn prev(&mut self) -> Option<&T> {
-        if self.items.is_empty() {
-            return None;
-        }
-
-        let new_ix = self
-            .current
-            .get_or_insert(self.items.len())
-            .saturating_sub(1);
-
-        self.current = Some(new_ix);
-        self.items.get(new_ix)
-    }
-
-    pub fn next(&mut self) -> Option<&T> {
-        let current = self.current.as_mut()?;
-        *current += 1;
-
-        self.items.get(*current).or_else(|| {
-            self.current.take();
-            None
-        })
-    }
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_prev_next() {
-        let mut history = MessageHistory::default();
-
-        // Test empty history
-        assert_eq!(history.prev(), None);
-        assert_eq!(history.next(), None);
-
-        // Add some messages
-        history.push("first");
-        history.push("second");
-        history.push("third");
-
-        // Test prev navigation
-        assert_eq!(history.prev(), Some(&"third"));
-        assert_eq!(history.prev(), Some(&"second"));
-        assert_eq!(history.prev(), Some(&"first"));
-        assert_eq!(history.prev(), Some(&"first"));
-
-        assert_eq!(history.next(), Some(&"second"));
-
-        // Test mixed navigation
-        history.push("fourth");
-        assert_eq!(history.prev(), Some(&"fourth"));
-        assert_eq!(history.prev(), Some(&"third"));
-        assert_eq!(history.next(), Some(&"fourth"));
-        assert_eq!(history.next(), None);
-
-        // Test that push resets navigation
-        history.prev();
-        history.prev();
-        history.push("fifth");
-        assert_eq!(history.prev(), Some(&"fifth"));
-    }
-}
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -787,15 +787,6 @@ impl ActiveThread {
                    .unwrap()
            }
        });
-
-        let workspace_subscription = if let Some(workspace) = workspace.upgrade() {
-            Some(cx.observe_release(&workspace, |this, _, cx| {
-                this.dismiss_notifications(cx);
-            }))
-        } else {
-            None
-        };
-
        let mut this = Self {
            language_registry,
            thread_store,
@@ -843,10 +834,6 @@ impl ActiveThread {
            }
        }

-        if let Some(subscription) = workspace_subscription {
-            this._subscriptions.push(subscription);
-        }
-
        this
    }

@@ -1474,7 +1461,6 @@ impl ActiveThread {
                            &configured_model.model,
                            cx,
                        ),
-                        thinking_allowed: true,
                    };

                    Some(configured_model.model.count_tokens(request, cx))
@@ -2594,8 +2580,8 @@ impl ActiveThread {
                                h_flex()
                                    .gap_1p5()
                                    .child(
-                                        Icon::new(IconName::ToolBulb)
-                                            .size(IconSize::Small)
+                                        Icon::new(IconName::LightBulb)
+                                            .size(IconSize::XSmall)
                                            .color(Color::Muted),
                                    )
                                    .child(LoadingLabel::new("Thinking").size(LabelSize::Small)),
@@ -3008,7 +2994,7 @@ impl ActiveThread {
                                        .overflow_x_scroll()
                                        .child(
                                            Icon::new(tool_use.icon)
-                                                .size(IconSize::Small)
+                                                .size(IconSize::XSmall)
                                                .color(Color::Muted),
                                        )
                                        .child(
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -740,9 +740,7 @@ fn wait_for_context_server(
    });

    cx.spawn(async move |_cx| {
-        let result = rx
-            .await
-            .map_err(|_| Arc::from("Context server store was dropped"))?;
+        let result = rx.await.unwrap();
        drop(subscription);
        result
    })
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1,9 +1,7 @@
 use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll};
-use acp::{AcpThread, AcpThreadEvent};
-use agent::{Thread, ThreadEvent, ThreadSummary};
+use agent::{Thread, ThreadEvent};
 use agent_settings::AgentSettings;
 use anyhow::Result;
-use assistant_tool::ActionLog;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
@@ -43,108 +41,16 @@ use zed_actions::assistant::ToggleFocus;
 pub struct AgentDiffPane {
    multibuffer: Entity<MultiBuffer>,
    editor: Entity<Editor>,
-    thread: AgentDiffThread,
+    thread: Entity<Thread>,
    focus_handle: FocusHandle,
    workspace: WeakEntity<Workspace>,
    title: SharedString,
    _subscriptions: Vec<Subscription>,
 }

-#[derive(PartialEq, Eq, Clone)]
-pub enum AgentDiffThread {
-    Native(Entity<Thread>),
-    AcpThread(Entity<AcpThread>),
-}
-
-impl AgentDiffThread {
-    fn project(&self, cx: &App) -> Entity<Project> {
-        match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).project().clone(),
-            AgentDiffThread::AcpThread(thread) => thread.read(cx).project().clone(),
-        }
-    }
-    fn action_log(&self, cx: &App) -> Entity<ActionLog> {
-        match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).action_log().clone(),
-            AgentDiffThread::AcpThread(thread) => thread.read(cx).action_log().clone(),
-        }
-    }
-
-    fn summary(&self, cx: &App) -> ThreadSummary {
-        match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).summary().clone(),
-            AgentDiffThread::AcpThread(thread) => ThreadSummary::Ready(thread.read(cx).title()),
-        }
-    }
-
-    fn is_generating(&self, cx: &App) -> bool {
-        match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).is_generating(),
-            AgentDiffThread::AcpThread(thread) => {
-                thread.read(cx).status() == acp::ThreadStatus::Generating
-            }
-        }
-    }
-
-    fn has_pending_edit_tool_uses(&self, cx: &App) -> bool {
-        match self {
-            AgentDiffThread::Native(thread) => thread.read(cx).has_pending_edit_tool_uses(),
-            AgentDiffThread::AcpThread(thread) => thread.read(cx).has_pending_edit_tool_calls(),
-        }
-    }
-
-    fn downgrade(&self) -> WeakAgentDiffThread {
-        match self {
-            AgentDiffThread::Native(thread) => WeakAgentDiffThread::Native(thread.downgrade()),
-            AgentDiffThread::AcpThread(thread) => {
-                WeakAgentDiffThread::AcpThread(thread.downgrade())
-            }
-        }
-    }
-}
-
-impl From<Entity<Thread>> for AgentDiffThread {
-    fn from(entity: Entity<Thread>) -> Self {
-        AgentDiffThread::Native(entity)
-    }
-}
-
-impl From<Entity<AcpThread>> for AgentDiffThread {
-    fn from(entity: Entity<AcpThread>) -> Self {
-        AgentDiffThread::AcpThread(entity)
-    }
-}
-
-#[derive(PartialEq, Eq, Clone)]
-pub enum WeakAgentDiffThread {
-    Native(WeakEntity<Thread>),
-    AcpThread(WeakEntity<AcpThread>),
-}
-
-impl WeakAgentDiffThread {
-    pub fn upgrade(&self) -> Option<AgentDiffThread> {
-        match self {
-            WeakAgentDiffThread::Native(weak) => weak.upgrade().map(AgentDiffThread::Native),
-            WeakAgentDiffThread::AcpThread(weak) => weak.upgrade().map(AgentDiffThread::AcpThread),
-        }
-    }
-}
-
-impl From<WeakEntity<Thread>> for WeakAgentDiffThread {
-    fn from(entity: WeakEntity<Thread>) -> Self {
-        WeakAgentDiffThread::Native(entity)
-    }
-}
-
-impl From<WeakEntity<AcpThread>> for WeakAgentDiffThread {
-    fn from(entity: WeakEntity<AcpThread>) -> Self {
-        WeakAgentDiffThread::AcpThread(entity)
-    }
-}
-
 impl AgentDiffPane {
    pub fn deploy(
-        thread: impl Into<AgentDiffThread>,
+        thread: Entity<Thread>,
        workspace: WeakEntity<Workspace>,
        window: &mut Window,
        cx: &mut App,
@@ -155,16 +61,14 @@ impl AgentDiffPane {
    }

    pub fn deploy_in_workspace(
-        thread: impl Into<AgentDiffThread>,
+        thread: Entity<Thread>,
        workspace: &mut Workspace,
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> Entity<Self> {
-        let thread = thread.into();
        let existing_diff = workspace
            .items_of_type::<AgentDiffPane>(cx)
            .find(|diff| diff.read(cx).thread == thread);
-
        if let Some(existing_diff) = existing_diff {
            workspace.activate_item(&existing_diff, true, true, window, cx);
            existing_diff
@@ -177,7 +81,7 @@ impl AgentDiffPane {
    }

    pub fn new(
-        thread: AgentDiffThread,
+        thread: Entity<Thread>,
        workspace: WeakEntity<Workspace>,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -185,7 +89,7 @@ impl AgentDiffPane {
        let focus_handle = cx.focus_handle();
        let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));

-        let project = thread.project(cx).clone();
+        let project = thread.read(cx).project().clone();
        let editor = cx.new(|cx| {
            let mut editor =
                Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
@@ -196,27 +100,16 @@ impl AgentDiffPane {
            editor
        });

-        let action_log = thread.action_log(cx).clone();
-
+        let action_log = thread.read(cx).action_log().clone();
        let mut this = Self {
-            _subscriptions: [
-                Some(
-                    cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
-                        this.update_excerpts(window, cx)
-                    }),
-                ),
-                match &thread {
-                    AgentDiffThread::Native(thread) => {
-                        Some(cx.subscribe(&thread, |this, _thread, event, cx| {
-                            this.handle_thread_event(event, cx)
-                        }))
-                    }
-                    AgentDiffThread::AcpThread(_) => None,
-                },
-            ]
-            .into_iter()
-            .flatten()
-            .collect(),
+            _subscriptions: vec![
+                cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
+                    this.update_excerpts(window, cx)
+                }),
+                cx.subscribe(&thread, |this, _thread, event, cx| {
+                    this.handle_thread_event(event, cx)
+                }),
+            ],
            title: SharedString::default(),
            multibuffer,
            editor,
@@ -230,7 +123,8 @@ impl AgentDiffPane {
    }

    fn update_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let changed_buffers = self.thread.action_log(cx).read(cx).changed_buffers(cx);
+        let thread = self.thread.read(cx);
+        let changed_buffers = thread.action_log().read(cx).changed_buffers(cx);
        let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::<HashSet<_>>();

        for (buffer, diff_handle) in changed_buffers {
@@ -317,7 +211,7 @@ impl AgentDiffPane {
    }

    fn update_title(&mut self, cx: &mut Context<Self>) {
-        let new_title = self.thread.summary(cx).unwrap_or("Agent Changes");
+        let new_title = self.thread.read(cx).summary().unwrap_or("Agent Changes");
        if new_title != self.title {
            self.title = new_title;
            cx.emit(EditorEvent::TitleChanged);
@@ -381,15 +275,14 @@ impl AgentDiffPane {

    fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
        self.thread
-            .action_log(cx)
-            .update(cx, |action_log, cx| action_log.keep_all_edits(cx))
+            .update(cx, |thread, cx| thread.keep_all_edits(cx));
    }
 }

 fn keep_edits_in_selection(
    editor: &mut Editor,
    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &AgentDiffThread,
+    thread: &Entity<Thread>,
    window: &mut Window,
    cx: &mut Context<Editor>,
 ) {
@@ -404,7 +297,7 @@ fn keep_edits_in_selection(
 fn reject_edits_in_selection(
    editor: &mut Editor,
    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &AgentDiffThread,
+    thread: &Entity<Thread>,
    window: &mut Window,
    cx: &mut Context<Editor>,
 ) {
@@ -418,7 +311,7 @@ fn reject_edits_in_selection(
 fn keep_edits_in_ranges(
    editor: &mut Editor,
    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &AgentDiffThread,
+    thread: &Entity<Thread>,
    ranges: Vec<Range<editor::Anchor>>,
    window: &mut Window,
    cx: &mut Context<Editor>,
@@ -433,8 +326,8 @@ fn keep_edits_in_ranges(
    for hunk in &diff_hunks_in_ranges {
        let buffer = multibuffer.read(cx).buffer(hunk.buffer_id);
        if let Some(buffer) = buffer {
-            thread.action_log(cx).update(cx, |action_log, cx| {
-                action_log.keep_edits_in_range(buffer, hunk.buffer_range.clone(), cx)
+            thread.update(cx, |thread, cx| {
+                thread.keep_edits_in_range(buffer, hunk.buffer_range.clone(), cx)
            });
        }
    }
@@ -443,7 +336,7 @@ fn keep_edits_in_ranges(
 fn reject_edits_in_ranges(
    editor: &mut Editor,
    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &AgentDiffThread,
+    thread: &Entity<Thread>,
    ranges: Vec<Range<editor::Anchor>>,
    window: &mut Window,
    cx: &mut Context<Editor>,
@@ -469,9 +362,8 @@ fn reject_edits_in_ranges(

    for (buffer, ranges) in ranges_by_buffer {
        thread
-            .action_log(cx)
-            .update(cx, |action_log, cx| {
-                action_log.reject_edits_in_ranges(buffer, ranges, cx)
+            .update(cx, |thread, cx| {
+                thread.reject_edits_in_ranges(buffer, ranges, cx)
            })
            .detach_and_log_err(cx);
    }
@@ -569,7 +461,7 @@ impl Item for AgentDiffPane {
    }

    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let summary = self.thread.summary(cx).unwrap_or("Agent Changes");
+        let summary = self.thread.read(cx).summary().unwrap_or("Agent Changes");
        Label::new(format!("Review: {}", summary))
            .color(if params.selected {
                Color::Default
@@ -749,7 +641,7 @@ impl Render for AgentDiffPane {
    }
 }

-fn diff_hunk_controls(thread: &AgentDiffThread) -> editor::RenderDiffHunkControlsFn {
+fn diff_hunk_controls(thread: &Entity<Thread>) -> editor::RenderDiffHunkControlsFn {
    let thread = thread.clone();

    Arc::new(
@@ -784,7 +676,7 @@ fn render_diff_hunk_controls(
    hunk_range: Range<editor::Anchor>,
    is_created_file: bool,
    line_height: Pixels,
-    thread: &AgentDiffThread,
+    thread: &Entity<Thread>,
    editor: &Entity<Editor>,
    window: &mut Window,
    cx: &mut App,
@@ -1220,8 +1112,11 @@ impl Render for AgentDiffToolbar {
                    return Empty.into_any();
                };

-                let has_pending_edit_tool_use =
-                    agent_diff.read(cx).thread.has_pending_edit_tool_uses(cx);
+                let has_pending_edit_tool_use = agent_diff
+                    .read(cx)
+                    .thread
+                    .read(cx)
+                    .has_pending_edit_tool_uses();

                if has_pending_edit_tool_use {
                    return div().px_2().child(spinner_icon).into_any();
@@ -1292,8 +1187,8 @@ pub enum EditorState {
 }

 struct WorkspaceThread {
-    thread: WeakAgentDiffThread,
-    _thread_subscriptions: (Subscription, Subscription),
+    thread: WeakEntity<Thread>,
+    _thread_subscriptions: [Subscription; 2],
    singleton_editors: HashMap<WeakEntity<Buffer>, HashMap<WeakEntity<Editor>, Subscription>>,
    _settings_subscription: Subscription,
    _workspace_subscription: Option<Subscription>,
@@ -1317,23 +1212,23 @@ impl AgentDiff {

    pub fn set_active_thread(
        workspace: &WeakEntity<Workspace>,
-        thread: impl Into<AgentDiffThread>,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut App,
    ) {
        Self::global(cx).update(cx, |this, cx| {
-            this.register_active_thread_impl(workspace, thread.into(), window, cx);
+            this.register_active_thread_impl(workspace, thread, window, cx);
        });
    }

    fn register_active_thread_impl(
        &mut self,
        workspace: &WeakEntity<Workspace>,
-        thread: AgentDiffThread,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let action_log = thread.action_log(cx).clone();
+        let action_log = thread.read(cx).action_log().clone();

        let action_log_subscription = cx.observe_in(&action_log, window, {
            let workspace = workspace.clone();
@@ -1342,25 +1237,17 @@ impl AgentDiff {
            }
        });

-        let thread_subscription = match &thread {
-            AgentDiffThread::Native(thread) => cx.subscribe_in(&thread, window, {
-                let workspace = workspace.clone();
-                move |this, _thread, event, window, cx| {
-                    this.handle_native_thread_event(&workspace, event, window, cx)
-                }
-            }),
-            AgentDiffThread::AcpThread(thread) => cx.subscribe_in(&thread, window, {
-                let workspace = workspace.clone();
-                move |this, thread, event, window, cx| {
-                    this.handle_acp_thread_event(&workspace, thread, event, window, cx)
-                }
-            }),
-        };
+        let thread_subscription = cx.subscribe_in(&thread, window, {
+            let workspace = workspace.clone();
+            move |this, _thread, event, window, cx| {
+                this.handle_thread_event(&workspace, event, window, cx)
+            }
+        });

        if let Some(workspace_thread) = self.workspace_threads.get_mut(&workspace) {
            // replace thread and action log subscription, but keep editors
            workspace_thread.thread = thread.downgrade();
-            workspace_thread._thread_subscriptions = (action_log_subscription, thread_subscription);
+            workspace_thread._thread_subscriptions = [action_log_subscription, thread_subscription];
            self.update_reviewing_editors(&workspace, window, cx);
            return;
        }
@@ -1385,7 +1272,7 @@ impl AgentDiff {
            workspace.clone(),
            WorkspaceThread {
                thread: thread.downgrade(),
-                _thread_subscriptions: (action_log_subscription, thread_subscription),
+                _thread_subscriptions: [action_log_subscription, thread_subscription],
                singleton_editors: HashMap::default(),
                _settings_subscription: settings_subscription,
                _workspace_subscription: workspace_subscription,
@@ -1432,7 +1319,7 @@ impl AgentDiff {

    fn register_review_action<T: Action>(
        workspace: &mut Workspace,
-        review: impl Fn(&Entity<Editor>, &AgentDiffThread, &mut Window, &mut App) -> PostReviewState
+        review: impl Fn(&Entity<Editor>, &Entity<Thread>, &mut Window, &mut App) -> PostReviewState
        + 'static,
        this: &Entity<AgentDiff>,
    ) {
@@ -1451,7 +1338,7 @@ impl AgentDiff {
        });
    }

-    fn handle_native_thread_event(
+    fn handle_thread_event(
        &mut self,
        workspace: &WeakEntity<Workspace>,
        event: &ThreadEvent,
@@ -1493,40 +1380,6 @@ impl AgentDiff {
        }
    }

-    fn handle_acp_thread_event(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        thread: &Entity<AcpThread>,
-        event: &AcpThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AcpThreadEvent::NewEntry => {
-                if thread
-                    .read(cx)
-                    .entries()
-                    .last()
-                    .and_then(|entry| entry.diff())
-                    .is_some()
-                {
-                    self.update_reviewing_editors(workspace, window, cx);
-                }
-            }
-            AcpThreadEvent::EntryUpdated(ix) => {
-                if thread
-                    .read(cx)
-                    .entries()
-                    .get(*ix)
-                    .and_then(|entry| entry.diff())
-                    .is_some()
-                {
-                    self.update_reviewing_editors(workspace, window, cx);
-                }
-            }
-        }
-    }
-
    fn handle_workspace_event(
        &mut self,
        workspace: &Entity<Workspace>,
@@ -1632,7 +1485,7 @@ impl AgentDiff {
            return;
        };

-        let action_log = thread.action_log(cx);
+        let action_log = thread.read(cx).action_log();
        let changed_buffers = action_log.read(cx).changed_buffers(cx);

        let mut unaffected = self.reviewing_editors.clone();
@@ -1657,7 +1510,7 @@ impl AgentDiff {
                    multibuffer.add_diff(diff_handle.clone(), cx);
                });

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

    fn keep_all(
        editor: &Entity<Editor>,
-        thread: &AgentDiffThread,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut App,
    ) -> PostReviewState {
@@ -1773,7 +1626,7 @@ impl AgentDiff {

    fn reject_all(
        editor: &Entity<Editor>,
-        thread: &AgentDiffThread,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut App,
    ) -> PostReviewState {
@@ -1793,7 +1646,7 @@ impl AgentDiff {

    fn keep(
        editor: &Entity<Editor>,
-        thread: &AgentDiffThread,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut App,
    ) -> PostReviewState {
@@ -1806,7 +1659,7 @@ impl AgentDiff {

    fn reject(
        editor: &Entity<Editor>,
-        thread: &AgentDiffThread,
+        thread: &Entity<Thread>,
        window: &mut Window,
        cx: &mut App,
    ) -> PostReviewState {
@@ -1829,7 +1682,7 @@ impl AgentDiff {
    fn review_in_active_editor(
        &mut self,
        workspace: &mut Workspace,
-        review: impl Fn(&Entity<Editor>, &AgentDiffThread, &mut Window, &mut App) -> PostReviewState,
+        review: impl Fn(&Entity<Editor>, &Entity<Thread>, &mut Window, &mut App) -> PostReviewState,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<Task<Result<()>>> {
@@ -1850,7 +1703,7 @@ impl AgentDiff {

        if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx) {
            if let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
-                let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
+                let changed_buffers = thread.read(cx).action_log().read(cx).changed_buffers(cx);

                let mut keys = changed_buffers.keys().cycle();
                keys.find(|k| *k == &curr_buffer);
@@ -1948,9 +1801,8 @@ mod tests {
            })
            .await
            .unwrap();
-        let thread =
-            AgentDiffThread::Native(thread_store.update(cx, |store, cx| store.create_thread(cx)));
-        let action_log = cx.read(|cx| thread.action_log(cx));
+        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
+        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());

        let (workspace, cx) =
            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
@@ -2136,9 +1988,8 @@ mod tests {
        });

        // Set the active thread
-        let thread = AgentDiffThread::Native(thread);
        cx.update(|window, cx| {
-            AgentDiff::set_active_thread(&workspace.downgrade(), thread.clone(), window, cx)
+            AgentDiff::set_active_thread(&workspace.downgrade(), &thread, window, cx)
        });

        let buffer1 = project
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1,4 +1,3 @@
-use std::cell::RefCell;
 use std::ops::Range;
 use std::path::Path;
 use std::rc::Rc;
@@ -8,15 +7,12 @@ use std::time::Duration;
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};

-use crate::NewAcpThread;
-use crate::agent_diff::AgentDiffThread;
 use crate::language_model_selector::ToggleModelSelector;
 use crate::{
    AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
    DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
    NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ResetTrialEndUpsell,
    ResetTrialUpsell, ToggleBurnMode, ToggleContextPicker, ToggleNavigationMenu, ToggleOptionsMenu,
-    acp::AcpThreadView,
    active_thread::{self, ActiveThread, ActiveThreadEvent},
    agent_configuration::{AgentConfiguration, AssistantConfigurationEvent},
    agent_diff::AgentDiff,
@@ -42,7 +38,6 @@ use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 use client::{UserStore, zed_urls};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
-use feature_flags::{self, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{
    Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, ClipboardItem,
@@ -114,12 +109,6 @@ pub fn init(cx: &mut App) {
                        panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx));
                    }
                })
-                .register_action(|workspace, _: &NewAcpThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.new_gemini_thread(window, cx));
-                    }
-                })
                .register_action(|workspace, action: &OpenRulesLibrary, window, cx| {
                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                        workspace.focus_panel::<AgentPanel>(window, cx);
@@ -136,8 +125,7 @@ pub fn init(cx: &mut App) {
                                let thread = thread.read(cx).thread().clone();
                                AgentDiffPane::deploy_in_workspace(thread, workspace, window, cx);
                            }
-                            ActiveView::AcpThread { .. }
-                            | ActiveView::TextThread { .. }
+                            ActiveView::TextThread { .. }
                            | ActiveView::History
                            | ActiveView::Configuration => {}
                        }
@@ -200,9 +188,6 @@ enum ActiveView {
        message_editor: Entity<MessageEditor>,
        _subscriptions: Vec<gpui::Subscription>,
    },
-    AcpThread {
-        thread_view: Entity<AcpThreadView>,
-    },
    TextThread {
        context_editor: Entity<TextThreadEditor>,
        title_editor: Entity<Editor>,
@@ -222,9 +207,7 @@ enum WhichFontSize {
 impl ActiveView {
    pub fn which_font_size_used(&self) -> WhichFontSize {
        match self {
-            ActiveView::Thread { .. } | ActiveView::AcpThread { .. } | ActiveView::History => {
-                WhichFontSize::AgentFont
-            }
+            ActiveView::Thread { .. } | ActiveView::History => WhichFontSize::AgentFont,
            ActiveView::TextThread { .. } => WhichFontSize::BufferFont,
            ActiveView::Configuration => WhichFontSize::None,
        }
@@ -255,7 +238,6 @@ impl ActiveView {
                            thread.scroll_to_bottom(cx);
                        });
                    }
-                    ActiveView::AcpThread { .. } => {}
                    ActiveView::TextThread { .. }
                    | ActiveView::History
                    | ActiveView::Configuration => {}
@@ -434,14 +416,11 @@ pub struct AgentPanel {
    configuration_subscription: Option<Subscription>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
-    acp_message_history:
-        Rc<RefCell<crate::acp::MessageHistory<agentic_coding_protocol::SendUserMessageParams>>>,
    previous_view: Option<ActiveView>,
    history_store: Entity<HistoryStore>,
    history: Entity<ThreadHistory>,
    hovered_recent_history_item: Option<usize>,
-    new_thread_menu_handle: PopoverMenuHandle<ContextMenu>,
-    agent_panel_menu_handle: PopoverMenuHandle<ContextMenu>,
+    assistant_dropdown_menu_handle: PopoverMenuHandle<ContextMenu>,
    assistant_navigation_menu_handle: PopoverMenuHandle<ContextMenu>,
    assistant_navigation_menu: Option<Entity<ContextMenu>>,
    width: Option<Pixels>,
@@ -628,7 +607,7 @@ impl AgentPanel {
            }
        };

-        AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
+        AgentDiff::set_active_thread(&workspace, &thread, window, cx);

        let weak_panel = weak_self.clone();

@@ -674,8 +653,7 @@ impl AgentPanel {
                            .clone()
                            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx));
                    }
-                    ActiveView::AcpThread { .. }
-                    | ActiveView::TextThread { .. }
+                    ActiveView::TextThread { .. }
                    | ActiveView::History
                    | ActiveView::Configuration => {}
                },
@@ -702,12 +680,10 @@ impl AgentPanel {
            .unwrap(),
            inline_assist_context_store,
            previous_view: None,
-            acp_message_history: Default::default(),
            history_store: history_store.clone(),
            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
            hovered_recent_history_item: None,
-            new_thread_menu_handle: PopoverMenuHandle::default(),
-            agent_panel_menu_handle: PopoverMenuHandle::default(),
+            assistant_dropdown_menu_handle: PopoverMenuHandle::default(),
            assistant_navigation_menu_handle: PopoverMenuHandle::default(),
            assistant_navigation_menu: None,
            width: None,
@@ -757,9 +733,6 @@ impl AgentPanel {
            ActiveView::Thread { thread, .. } => {
                thread.update(cx, |thread, cx| thread.cancel_last_completion(window, cx));
            }
-            ActiveView::AcpThread { thread_view, .. } => {
-                thread_view.update(cx, |thread_element, cx| thread_element.cancel(cx));
-            }
            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
        }
    }
@@ -767,18 +740,18 @@ impl AgentPanel {
    fn active_message_editor(&self) -> Option<&Entity<MessageEditor>> {
        match &self.active_view {
            ActiveView::Thread { message_editor, .. } => Some(message_editor),
-            ActiveView::AcpThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
+            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
        }
    }

    fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
-        // Preserve chat box text when using creating new thread
-        let preserved_text = self
-            .active_message_editor()
-            .map(|editor| editor.read(cx).get_text(cx).trim().to_string());
+        // Preserve chat box text when using creating new thread from summary'
+        let preserved_text = if action.from_thread_id.is_some() {
+            self.active_message_editor()
+                .map(|editor| editor.read(cx).get_text(cx).trim().to_string())
+        } else {
+            None
+        };

        let thread = self
            .thread_store
@@ -850,7 +823,7 @@ impl AgentPanel {
        let thread_view = ActiveView::thread(active_thread.clone(), message_editor, window, cx);
        self.set_active_view(thread_view, window, cx);

-        AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
+        AgentDiff::set_active_thread(&self.workspace, &thread, window, cx);
    }

    fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -889,37 +862,6 @@ impl AgentPanel {
        context_editor.focus_handle(cx).focus(window);
    }

-    fn new_gemini_thread(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let workspace = self.workspace.clone();
-        let project = self.project.clone();
-        let message_history = self.acp_message_history.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let thread_view = cx.new_window_entity(|window, cx| {
-                crate::acp::AcpThreadView::new(
-                    workspace.clone(),
-                    project,
-                    message_history,
-                    window,
-                    cx,
-                )
-            })?;
-            this.update_in(cx, |this, window, cx| {
-                this.set_active_view(
-                    ActiveView::AcpThread {
-                        thread_view: thread_view.clone(),
-                    },
-                    window,
-                    cx,
-                );
-            })
-            .log_err();
-
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
    fn deploy_rules_library(
        &mut self,
        action: &OpenRulesLibrary,
@@ -1052,7 +994,6 @@ impl AgentPanel {
                cx,
            )
        });
-
        let message_editor = cx.new(|cx| {
            MessageEditor::new(
                self.fs.clone(),
@@ -1071,7 +1012,7 @@ impl AgentPanel {

        let thread_view = ActiveView::thread(active_thread.clone(), message_editor, window, cx);
        self.set_active_view(thread_view, window, cx);
-        AgentDiff::set_active_thread(&self.workspace, thread.clone(), window, cx);
+        AgentDiff::set_active_thread(&self.workspace, &thread, window, cx);
    }

    pub fn go_back(&mut self, _: &workspace::GoBack, window: &mut Window, cx: &mut Context<Self>) {
@@ -1084,9 +1025,6 @@ impl AgentPanel {
                        ActiveView::Thread { message_editor, .. } => {
                            message_editor.focus_handle(cx).focus(window);
                        }
-                        ActiveView::AcpThread { thread_view } => {
-                            thread_view.focus_handle(cx).focus(window);
-                        }
                        ActiveView::TextThread { context_editor, .. } => {
                            context_editor.focus_handle(cx).focus(window);
                        }
@@ -1114,7 +1052,7 @@ impl AgentPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.agent_panel_menu_handle.toggle(window, cx);
+        self.assistant_dropdown_menu_handle.toggle(window, cx);
    }

    pub fn increase_font_size(
@@ -1202,19 +1140,11 @@ impl AgentPanel {
                let thread = thread.read(cx).thread().clone();
                self.workspace
                    .update(cx, |workspace, cx| {
-                        AgentDiffPane::deploy_in_workspace(
-                            AgentDiffThread::Native(thread),
-                            workspace,
-                            window,
-                            cx,
-                        )
+                        AgentDiffPane::deploy_in_workspace(thread, workspace, window, cx)
                    })
                    .log_err();
            }
-            ActiveView::AcpThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => {}
+            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
        }
    }

@@ -1267,13 +1197,6 @@ impl AgentPanel {
                )
                .detach_and_log_err(cx);
            }
-            ActiveView::AcpThread { thread_view } => {
-                thread_view
-                    .update(cx, |thread_view, cx| {
-                        thread_view.open_thread_as_markdown(workspace, window, cx)
-                    })
-                    .detach_and_log_err(cx);
-            }
            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
        }
    }
@@ -1428,8 +1351,7 @@ impl AgentPanel {
                    }
                })
            }
-            ActiveView::AcpThread { .. } => {}
-            ActiveView::History | ActiveView::Configuration => {}
+            _ => {}
        }

        if current_is_special && !new_is_special {
@@ -1443,8 +1365,6 @@ impl AgentPanel {
            self.active_view = new_view;
        }

-        self.acp_message_history.borrow_mut().reset_position();
-
        self.focus_handle(cx).focus(window);
    }

@@ -1517,7 +1437,6 @@ impl Focusable for AgentPanel {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        match &self.active_view {
            ActiveView::Thread { message_editor, .. } => message_editor.focus_handle(cx),
-            ActiveView::AcpThread { thread_view, .. } => thread_view.focus_handle(cx),
            ActiveView::History => self.history.focus_handle(cx),
            ActiveView::TextThread { context_editor, .. } => context_editor.focus_handle(cx),
            ActiveView::Configuration => {
@@ -1674,9 +1593,6 @@ impl AgentPanel {
                        .into_any_element(),
                }
            }
-            ActiveView::AcpThread { thread_view } => Label::new(thread_view.read(cx).title(cx))
-                .truncate()
-                .into_any_element(),
            ActiveView::TextThread {
                title_editor,
                context_editor,
@@ -1811,51 +1727,10 @@ impl AgentPanel {

        let active_thread = match &self.active_view {
            ActiveView::Thread { thread, .. } => Some(thread.read(cx).thread().clone()),
-            ActiveView::AcpThread { .. }
-            | ActiveView::TextThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => None,
+            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
        };

-        let new_thread_menu = PopoverMenu::new("new_thread_menu")
-            .trigger_with_tooltip(
-                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
-                Tooltip::text("New Thread…"),
-            )
-            .anchor(Corner::TopRight)
-            .with_handle(self.new_thread_menu_handle.clone())
-            .menu(move |window, cx| {
-                let active_thread = active_thread.clone();
-                Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
-                    menu = menu
-                        .when(cx.has_flag::<feature_flags::AcpFeatureFlag>(), |this| {
-                            this.header("Zed Agent")
-                        })
-                        .action("New Thread", NewThread::default().boxed_clone())
-                        .action("New Text Thread", NewTextThread.boxed_clone())
-                        .when_some(active_thread, |this, active_thread| {
-                            let thread = active_thread.read(cx);
-                            if !thread.is_empty() {
-                                this.action(
-                                    "New From Summary",
-                                    Box::new(NewThread {
-                                        from_thread_id: Some(thread.id().clone()),
-                                    }),
-                                )
-                            } else {
-                                this
-                            }
-                        })
-                        .when(cx.has_flag::<feature_flags::AcpFeatureFlag>(), |this| {
-                            this.separator()
-                                .header("External Agents")
-                                .action("New Gemini Thread", NewAcpThread.boxed_clone())
-                        });
-                    menu
-                }))
-            });
-
-        let agent_panel_menu = PopoverMenu::new("agent-options-menu")
+        let agent_extra_menu = PopoverMenu::new("agent-options-menu")
            .trigger_with_tooltip(
                IconButton::new("agent-options-menu", IconName::Ellipsis)
                    .icon_size(IconSize::Small),
@@ -1873,9 +1748,41 @@ impl AgentPanel {
                },
            )
            .anchor(Corner::TopRight)
-            .with_handle(self.agent_panel_menu_handle.clone())
+            .with_handle(self.assistant_dropdown_menu_handle.clone())
            .menu(move |window, cx| {
-                Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
+                let active_thread = active_thread.clone();
+                Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
+                    menu = menu
+                        .action("New Thread", NewThread::default().boxed_clone())
+                        .action("New Text Thread", NewTextThread.boxed_clone())
+                        .when_some(active_thread, |this, active_thread| {
+                            let thread = active_thread.read(cx);
+                            if !thread.is_empty() {
+                                this.action(
+                                    "New From Summary",
+                                    Box::new(NewThread {
+                                        from_thread_id: Some(thread.id().clone()),
+                                    }),
+                                )
+                            } else {
+                                this
+                            }
+                        })
+                        .separator();
+
+                    menu = menu
+                        .header("MCP Servers")
+                        .action(
+                            "View Server Extensions",
+                            Box::new(zed_actions::Extensions {
+                                category_filter: Some(
+                                    zed_actions::ExtensionCategoryFilter::ContextServers,
+                                ),
+                            }),
+                        )
+                        .action("Add Custom Server…", Box::new(AddContextServer))
+                        .separator();
+
                    if let Some(usage) = usage {
                        menu = menu
                            .header_with_link("Prompt Usage", "Manage", account_url.clone())
@@ -1913,19 +1820,6 @@ impl AgentPanel {
                            .separator()
                    }

-                    menu = menu
-                        .header("MCP Servers")
-                        .action(
-                            "View Server Extensions",
-                            Box::new(zed_actions::Extensions {
-                                category_filter: Some(
-                                    zed_actions::ExtensionCategoryFilter::ContextServers,
-                                ),
-                            }),
-                        )
-                        .action("Add Custom Server…", Box::new(AddContextServer))
-                        .separator();
-
                    menu = menu
                        .action("Rules…", Box::new(OpenRulesLibrary::default()))
                        .action("Settings", Box::new(OpenConfiguration))
@@ -1967,8 +1861,27 @@ impl AgentPanel {
                            .px(DynamicSpacing::Base08.rems(cx))
                            .border_l_1()
                            .border_color(cx.theme().colors().border)
-                            .child(new_thread_menu)
-                            .child(agent_panel_menu),
+                            .child(
+                                IconButton::new("new", IconName::Plus)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle)
+                                    .tooltip(move |window, cx| {
+                                        Tooltip::for_action_in(
+                                            "New Thread",
+                                            &NewThread::default(),
+                                            &focus_handle,
+                                            window,
+                                            cx,
+                                        )
+                                    })
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(
+                                            NewThread::default().boxed_clone(),
+                                            cx,
+                                        );
+                                    }),
+                            )
+                            .child(agent_extra_menu),
                    ),
            )
    }
@@ -1980,9 +1893,6 @@ impl AgentPanel {
                message_editor,
                ..
            } => (thread.read(cx), message_editor.read(cx)),
-            ActiveView::AcpThread { .. } => {
-                return None;
-            }
            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {
                return None;
            }
@@ -2121,9 +2031,6 @@ impl AgentPanel {
                    return false;
                }
            }
-            ActiveView::AcpThread { .. } => {
-                return false;
-            }
            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {
                return false;
            }
@@ -2708,9 +2615,6 @@ impl AgentPanel {
    ) -> Option<AnyElement> {
        let active_thread = match &self.active_view {
            ActiveView::Thread { thread, .. } => thread,
-            ActiveView::AcpThread { .. } => {
-                return None;
-            }
            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {
                return None;
            }
@@ -3057,9 +2961,6 @@ impl AgentPanel {
                    .detach();
                });
            }
-            ActiveView::AcpThread { .. } => {
-                unimplemented!()
-            }
            ActiveView::TextThread { context_editor, .. } => {
                context_editor.update(cx, |context_editor, cx| {
                    TextThreadEditor::insert_dragged_files(
@@ -3078,10 +2979,8 @@ impl AgentPanel {
    fn key_context(&self) -> KeyContext {
        let mut key_context = KeyContext::new_with_defaults();
        key_context.add("AgentPanel");
-        match &self.active_view {
-            ActiveView::AcpThread { .. } => key_context.add("acp_thread"),
-            ActiveView::TextThread { .. } => key_context.add("prompt_editor"),
-            ActiveView::Thread { .. } | ActiveView::History | ActiveView::Configuration => {}
+        if matches!(self.active_view, ActiveView::TextThread { .. }) {
+            key_context.add("prompt_editor");
        }
        key_context
    }
@@ -3135,7 +3034,6 @@ impl Render for AgentPanel {
                        });
                        this.continue_conversation(window, cx);
                    }
-                    ActiveView::AcpThread { .. } => {}
                    ActiveView::TextThread { .. }
                    | ActiveView::History
                    | ActiveView::Configuration => {}
@@ -3177,10 +3075,6 @@ impl Render for AgentPanel {
                    })
                    .child(h_flex().child(message_editor.clone()))
                    .child(self.render_drag_target(cx)),
-                ActiveView::AcpThread { thread_view, .. } => parent
-                    .relative()
-                    .child(thread_view.clone())
-                    .child(self.render_drag_target(cx)),
                ActiveView::History => parent.child(self.history.clone()),
                ActiveView::TextThread {
                    context_editor,
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,4 +1,3 @@
-mod acp;
 mod active_thread;
 mod agent_configuration;
 mod agent_diff;
@@ -57,8 +56,6 @@ actions!(
    [
        /// Creates a new text-based conversation thread.
        NewTextThread,
-        /// Creates a new external agent conversation thread.
-        NewAcpThread,
        /// Toggles the context picker interface for adding files, symbols, or other context.
        ToggleContextPicker,
        /// Toggles the navigation menu for switching between threads and views.
@@ -79,6 +76,8 @@ actions!(
        AddContextServer,
        /// Removes the currently selected thread.
        RemoveSelectedThread,
+        /// Starts a chat conversation with the agent.
+        Chat,
        /// Starts a chat conversation with follow-up enabled.
        ChatWithFollow,
        /// Cycles to the next inline assist suggestion.
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -475,7 +475,6 @@ impl CodegenAlternative {
                stop: Vec::new(),
                temperature,
                messages: vec![request_message],
-                thinking_allowed: false,
            }
        }))
    }
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -1,6 +1,6 @@
 mod completion_provider;
 mod fetch_context_picker;
-pub(crate) mod file_context_picker;
+mod file_context_picker;
 mod rules_context_picker;
 mod symbol_context_picker;
 mod thread_context_picker;
@@ -426,7 +426,6 @@ impl ContextPicker {
                            this.add_recent_file(project_path.clone(), window, cx);
                        })
                    },
-                    None,
                )
            }
            RecentEntry::Thread(thread) => {
@@ -444,7 +443,6 @@ impl ContextPicker {
                                .detach_and_log_err(cx);
                        })
                    },
-                    None,
                )
            }
        }
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -33,6 +33,7 @@ use gpui::{
    App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task, UpdateGlobal,
    WeakEntity, Window, point,
 };
+use language::language_settings;
 use language::{Buffer, Point, Selection, TransactionId};
 use language_model::{
    ConfigurationError, ConfiguredModel, LanguageModelRegistry, report_assistant_event,
@@ -1768,7 +1769,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
        _: &mut Window,
        cx: &mut App,
    ) -> Task<Result<Vec<CodeAction>>> {
-        if !AgentSettings::get_global(cx).enabled {
+        if !AgentSettings::get_global(cx).enabled || !language_settings::ai_enabled(cx) {
            return Task::ready(Ok(Vec::new()));
        }

--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 use std::rc::Rc;
 use std::sync::Arc;

-use crate::agent_diff::AgentDiffThread;
 use crate::agent_model_selector::AgentModelSelector;
 use crate::language_model_selector::ToggleModelSelector;
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
@@ -48,14 +47,13 @@ use ui::{
 };
 use util::ResultExt as _;
 use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
 use zed_llm_client::CompletionIntent;

 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::profile_selector::ProfileSelector;
 use crate::{
-    ActiveThread, AgentDiffPane, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
+    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
 };
@@ -476,12 +474,9 @@ impl MessageEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        if let Ok(diff) = AgentDiffPane::deploy(
-            AgentDiffThread::Native(self.thread.clone()),
-            self.workspace.clone(),
-            window,
-            cx,
-        ) {
+        if let Ok(diff) =
+            AgentDiffPane::deploy(self.thread.clone(), self.workspace.clone(), window, cx)
+        {
            let path_key = multi_buffer::PathKey::for_buffer(&buffer, cx);
            diff.update(cx, |diff, cx| diff.move_to_path(path_key, window, cx));
        }
@@ -1165,7 +1160,7 @@ impl MessageEditor {
                                })
                                .child(
                                    h_flex()
-                                        .id(("file-name", index))
+                                        .id("file-name")
                                        .pr_8()
                                        .gap_1p5()
                                        .max_w_full()
@@ -1176,16 +1171,9 @@ impl MessageEditor {
                                                .gap_0p5()
                                                .children(file_name)
                                                .children(file_path),
-                                        )
-                                        .on_click({
-                                            let buffer = buffer.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.handle_file_click(buffer.clone(), window, cx);
-                                            })
-                                        }), // TODO: Implement line diff
-                                            // .child(Label::new("+").color(Color::Created))
-                                            // .child(Label::new("-").color(Color::Deleted)),
-                                            //
+                                        ), // TODO: Implement line diff
+                                           // .child(Label::new("+").color(Color::Created))
+                                           // .child(Label::new("-").color(Color::Deleted)),
                                )
                                .child(
                                    h_flex()
@@ -1458,7 +1446,6 @@ impl MessageEditor {
                        tool_choice: None,
                        stop: vec![],
                        temperature: AgentSettings::temperature_for_model(&model.model, cx),
-                        thinking_allowed: true,
                    };

                    Some(model.model.count_tokens(request, cx))
@@ -1626,7 +1613,6 @@ impl Render for MessageEditor {

        v_flex()
            .size_full()
-            .bg(cx.theme().colors().panel_background)
            .when(changed_buffers.len() > 0, |parent| {
                parent.child(self.render_edits_bar(&changed_buffers, window, cx))
            })
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -297,7 +297,6 @@ impl TerminalInlineAssistant {
                tool_choice: None,
                stop: Vec::new(),
                temperature,
-                thinking_allowed: false,
            }
        }))
    }
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -38,8 +38,8 @@ use language::{
    language_settings::{SoftWrap, all_language_settings},
 };
 use language_model::{
-    ConfigurationError, LanguageModelExt, LanguageModelImage, LanguageModelProviderTosView,
-    LanguageModelRegistry, Role,
+    ConfigurationError, LanguageModelImage, LanguageModelProviderTosView, LanguageModelRegistry,
+    Role,
 };
 use multi_buffer::MultiBufferRow;
 use picker::{Picker, popover_menu::PickerPopoverMenu};
@@ -3063,7 +3063,7 @@ fn token_state(context: &Entity<AssistantContext>, cx: &App) -> Option<TokenStat
        .default_model()?
        .model;
    let token_count = context.read(cx).token_count()?;
-    let max_token_count = model.max_token_count_for_mode(context.read(cx).completion_mode().into());
+    let max_token_count = model.max_token_count();
    let token_state = if max_token_count.saturating_sub(token_count) == 0 {
        TokenState::NoTokensLeft {
            max_token_count,
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -15,10 +15,7 @@ path = "src/askpass.rs"
 anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
-net.workspace = true
-parking_lot.workspace = true
 smol.workspace = true
 tempfile.workspace = true
-unindent.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -1,14 +1,21 @@
-use std::{ffi::OsStr, time::Duration};
+use std::path::{Path, PathBuf};
+use std::time::Duration;

-use anyhow::{Context as _, Result};
+#[cfg(unix)]
+use anyhow::Context as _;
 use futures::channel::{mpsc, oneshot};
-use futures::{
-    AsyncBufReadExt as _, AsyncWriteExt as _, FutureExt as _, SinkExt, StreamExt, io::BufReader,
-    select_biased,
-};
+#[cfg(unix)]
+use futures::{AsyncBufReadExt as _, io::BufReader};
+#[cfg(unix)]
+use futures::{AsyncWriteExt as _, FutureExt as _, select_biased};
+use futures::{SinkExt, StreamExt};
 use gpui::{AsyncApp, BackgroundExecutor, Task};
+#[cfg(unix)]
 use smol::fs;
-use util::ResultExt as _;
+#[cfg(unix)]
+use smol::net::unix::UnixListener;
+#[cfg(unix)]
+use util::{ResultExt as _, fs::make_file_executable, get_shell_safe_zed_path};

 #[derive(PartialEq, Eq)]
 pub enum AskPassResult {
@@ -35,71 +42,41 @@ impl AskPassDelegate {
        Self { tx, _task: task }
    }

-    pub async fn ask_password(&mut self, prompt: String) -> Result<String> {
+    pub async fn ask_password(&mut self, prompt: String) -> anyhow::Result<String> {
        let (tx, rx) = oneshot::channel();
        self.tx.send((prompt, tx)).await?;
        Ok(rx.await?)
    }
-
-    pub fn new_always_failing() -> Self {
-        let (tx, _rx) = mpsc::unbounded::<(String, oneshot::Sender<String>)>();
-        Self {
-            tx,
-            _task: Task::ready(()),
-        }
-    }
 }

+#[cfg(unix)]
 pub struct AskPassSession {
-    #[cfg(not(target_os = "windows"))]
-    script_path: std::path::PathBuf,
-    #[cfg(not(target_os = "windows"))]
-    gpg_script_path: std::path::PathBuf,
-    #[cfg(target_os = "windows")]
-    askpass_helper: String,
-    #[cfg(target_os = "windows")]
-    secret: std::sync::Arc<parking_lot::Mutex<String>>,
+    script_path: PathBuf,
    _askpass_task: Task<()>,
    askpass_opened_rx: Option<oneshot::Receiver<()>>,
    askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
 }

-#[cfg(not(target_os = "windows"))]
-const ASKPASS_SCRIPT_NAME: &str = "askpass.sh";
-#[cfg(target_os = "windows")]
-const ASKPASS_SCRIPT_NAME: &str = "askpass.ps1";
-
-#[cfg(not(target_os = "windows"))]
-const GPG_SCRIPT_NAME: &str = "gpg.sh";
-
+#[cfg(unix)]
 impl AskPassSession {
    /// This will create a new AskPassSession.
    /// You must retain this session until the master process exits.
    #[must_use]
-    pub async fn new(executor: &BackgroundExecutor, mut delegate: AskPassDelegate) -> Result<Self> {
-        use net::async_net::UnixListener;
-        use util::fs::make_file_executable;
-
-        #[cfg(target_os = "windows")]
-        let secret = std::sync::Arc::new(parking_lot::Mutex::new(String::new()));
+    pub async fn new(
+        executor: &BackgroundExecutor,
+        mut delegate: AskPassDelegate,
+    ) -> anyhow::Result<Self> {
        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
        let askpass_socket = temp_dir.path().join("askpass.sock");
-        let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
-        #[cfg(not(target_os = "windows"))]
-        let gpg_script_path = temp_dir.path().join(GPG_SCRIPT_NAME);
+        let askpass_script_path = temp_dir.path().join("askpass.sh");
        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
-        let listener = UnixListener::bind(&askpass_socket).context("creating askpass socket")?;
-        #[cfg(not(target_os = "windows"))]
-        let zed_path = util::get_shell_safe_zed_path()?;
-        #[cfg(target_os = "windows")]
-        let zed_path = std::env::current_exe()
-            .context("finding current executable path for use in askpass")?;
+        let listener =
+            UnixListener::bind(&askpass_socket).context("failed to create askpass socket")?;
+        let zed_path = get_shell_safe_zed_path()?;

        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
        let mut kill_tx = Some(askpass_kill_master_tx);

-        #[cfg(target_os = "windows")]
-        let askpass_secret = secret.clone();
        let askpass_task = executor.spawn(async move {
            let mut askpass_opened_tx = Some(askpass_opened_tx);

@@ -116,14 +93,10 @@ impl AskPassSession {
                if let Some(password) = delegate
                    .ask_password(prompt.to_string())
                    .await
-                    .context("getting askpass password")
+                    .context("failed to get askpass password")
                    .log_err()
                {
                    stream.write_all(password.as_bytes()).await.log_err();
-                    #[cfg(target_os = "windows")]
-                    {
-                        *askpass_secret.lock() = password;
-                    }
                } else {
                    if let Some(kill_tx) = kill_tx.take() {
                        kill_tx.send(()).log_err();
@@ -139,73 +112,34 @@ impl AskPassSession {
        });

        // Create an askpass script that communicates back to this process.
-        let askpass_script = generate_askpass_script(&zed_path, &askpass_socket);
-        fs::write(&askpass_script_path, askpass_script)
-            .await
-            .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
-        make_file_executable(&askpass_script_path).await?;
-        #[cfg(target_os = "windows")]
-        let askpass_helper = format!(
-            "powershell.exe -ExecutionPolicy Bypass -File {}",
-            askpass_script_path.display()
+        let askpass_script = format!(
+            "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
+            zed_exe = zed_path,
+            askpass_socket = askpass_socket.display(),
+            print_args = "printf '%s\\0' \"$@\"",
+            shebang = "#!/bin/sh",
        );
-
-        #[cfg(not(target_os = "windows"))]
-        {
-            let gpg_script = generate_gpg_script();
-            fs::write(&gpg_script_path, gpg_script)
-                .await
-                .with_context(|| format!("creating gpg wrapper script at {gpg_script_path:?}"))?;
-            make_file_executable(&gpg_script_path).await?;
-        }
+        fs::write(&askpass_script_path, askpass_script).await?;
+        make_file_executable(&askpass_script_path).await?;

        Ok(Self {
-            #[cfg(not(target_os = "windows"))]
            script_path: askpass_script_path,
-            #[cfg(not(target_os = "windows"))]
-            gpg_script_path,
-
-            #[cfg(target_os = "windows")]
-            secret,
-            #[cfg(target_os = "windows")]
-            askpass_helper,
-
            _askpass_task: askpass_task,
            askpass_kill_master_rx: Some(askpass_kill_master_rx),
            askpass_opened_rx: Some(askpass_opened_rx),
        })
    }

-    #[cfg(not(target_os = "windows"))]
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
+    pub fn script_path(&self) -> &Path {
        &self.script_path
    }

-    #[cfg(target_os = "windows")]
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
-        &self.askpass_helper
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    pub fn gpg_script_path(&self) -> Option<impl AsRef<OsStr>> {
-        Some(&self.gpg_script_path)
-    }
-
-    #[cfg(target_os = "windows")]
-    pub fn gpg_script_path(&self) -> Option<impl AsRef<OsStr>> {
-        // TODO implement wrapping GPG on Windows. This is more difficult than on Unix
-        // because we can't use --passphrase-fd with a nonstandard FD, and both --passphrase
-        // and --passphrase-file are insecure.
-        None::<std::path::PathBuf>
-    }
-
    // This will run the askpass task forever, resolving as many authentication requests as needed.
    // The caller is responsible for examining the result of their own commands and cancelling this
    // future when this is no longer needed. Note that this can only be called once, but due to the
    // drop order this takes an &mut, so you can `drop()` it after you're done with the master process.
    pub async fn run(&mut self) -> AskPassResult {
-        // This is the default timeout setting used by VSCode.
-        let connection_timeout = Duration::from_secs(17);
+        let connection_timeout = Duration::from_secs(10);
        let askpass_opened_rx = self.askpass_opened_rx.take().expect("Only call run once");
        let askpass_kill_master_rx = self
            .askpass_kill_master_rx
@@ -224,19 +158,14 @@ impl AskPassSession {
            }
        }
    }
-
-    /// This will return the password that was last set by the askpass script.
-    #[cfg(target_os = "windows")]
-    pub fn get_password(&self) -> String {
-        self.secret.lock().clone()
-    }
 }

 /// The main function for when Zed is running in netcat mode for use in askpass.
 /// Called from both the remote server binary and the zed binary in their respective main functions.
+#[cfg(unix)]
 pub fn main(socket: &str) {
-    use net::UnixStream;
    use std::io::{self, Read, Write};
+    use std::os::unix::net::UnixStream;
    use std::process::exit;

    let mut stream = match UnixStream::connect(socket) {
@@ -253,10 +182,6 @@ pub fn main(socket: &str) {
        exit(1);
    }

-    #[cfg(target_os = "windows")]
-    while buffer.last().map_or(false, |&b| b == b'\n' || b == b'\r') {
-        buffer.pop();
-    }
    if buffer.last() != Some(&b'\0') {
        buffer.push(b'\0');
    }
@@ -277,48 +202,28 @@ pub fn main(socket: &str) {
        exit(1);
    }
 }
+#[cfg(not(unix))]
+pub fn main(_socket: &str) {}

-#[inline]
-#[cfg(not(target_os = "windows"))]
-fn generate_askpass_script(zed_path: &str, askpass_socket: &std::path::Path) -> String {
-    format!(
-        "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
-        zed_exe = zed_path,
-        askpass_socket = askpass_socket.display(),
-        print_args = "printf '%s\\0' \"$@\"",
-        shebang = "#!/bin/sh",
-    )
+#[cfg(not(unix))]
+pub struct AskPassSession {
+    path: PathBuf,
 }

-#[inline]
-#[cfg(target_os = "windows")]
-fn generate_askpass_script(zed_path: &std::path::Path, askpass_socket: &std::path::Path) -> String {
-    format!(
-        r#"
-        $ErrorActionPreference = 'Stop';
-        ($args -join [char]0) | & "{zed_exe}" --askpass={askpass_socket} 2> $null
-        "#,
-        zed_exe = zed_path.display(),
-        askpass_socket = askpass_socket.display(),
-    )
-}
-
-#[inline]
-#[cfg(not(target_os = "windows"))]
-fn generate_gpg_script() -> String {
-    use unindent::Unindent as _;
-
-    r#"
-        #!/bin/sh
-        set -eu
-
-        unset GIT_CONFIG_PARAMETERS
-        GPG_PROGRAM=$(git config gpg.program || echo 'gpg')
-        PROMPT="Enter passphrase to unlock GPG key:"
-        PASSPHRASE=$(${GIT_ASKPASS} "${PROMPT}")
-
-        exec "${GPG_PROGRAM}" --batch --no-tty --yes --passphrase-fd 3 --pinentry-mode loopback "$@" 3<<EOF
-        ${PASSPHRASE}
-        EOF
-    "#.unindent()
+#[cfg(not(unix))]
+impl AskPassSession {
+    pub async fn new(_: &BackgroundExecutor, _: AskPassDelegate) -> anyhow::Result<Self> {
+        Ok(Self {
+            path: PathBuf::new(),
+        })
+    }
+
+    pub fn script_path(&self) -> &Path {
+        &self.path
+    }
+
+    pub async fn run(&mut self) -> AskPassResult {
+        futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(20))).await;
+        AskPassResult::Timedout
+    }
 }
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -2293,7 +2293,6 @@ impl AssistantContext {
            tool_choice: None,
            stop: Vec::new(),
            temperature: model.and_then(|model| AgentSettings::temperature_for_model(model, cx)),
-            thinking_allowed: true,
        };
        for message in self.messages(cx) {
            if message.status != MessageStatus::Done {
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -34,11 +34,6 @@ impl ExtensionSlashCommandProxy for SlashCommandRegistryProxy {
        self.slash_command_registry
            .register_command(ExtensionSlashCommand::new(extension, command), false)
    }
-
-    fn unregister_slash_command(&self, command_name: Arc<str>) {
-        self.slash_command_registry
-            .unregister_command_by_name(&command_name)
-    }
 }

 /// An adapter that allows an [`LspAdapterDelegate`] to be used as a [`WorktreeDelegate`].
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -1,6 +1,5 @@
 use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiff;
-use clock;
 use collections::BTreeMap;
 use futures::{FutureExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
@@ -8,7 +7,7 @@ use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
 use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
 use std::{cmp, ops::Range, sync::Arc};
 use text::{Edit, Patch, Rope};
-use util::{RangeExt, ResultExt as _};
+use util::RangeExt;

 /// Tracks actions performed by tools in a thread
 pub struct ActionLog {
@@ -18,8 +17,6 @@ pub struct ActionLog {
    edited_since_project_diagnostics_check: bool,
    /// The project this action log is associated with
    project: Entity<Project>,
-    /// Tracks which buffer versions have already been notified as changed externally
-    notified_versions: BTreeMap<Entity<Buffer>, clock::Global>,
 }

 impl ActionLog {
@@ -29,7 +26,6 @@ impl ActionLog {
            tracked_buffers: BTreeMap::default(),
            edited_since_project_diagnostics_check: false,
            project,
-            notified_versions: BTreeMap::default(),
        }
    }

@@ -47,10 +43,6 @@ impl ActionLog {
        self.edited_since_project_diagnostics_check
    }

-    pub fn latest_snapshot(&self, buffer: &Entity<Buffer>) -> Option<text::BufferSnapshot> {
-        Some(self.tracked_buffers.get(buffer)?.snapshot.clone())
-    }
-
    fn track_buffer_internal(
        &mut self,
        buffer: Entity<Buffer>,
@@ -59,7 +51,6 @@ impl ActionLog {
    ) -> &mut TrackedBuffer {
        let status = if is_created {
            if let Some(tracked) = self.tracked_buffers.remove(&buffer) {
-                self.notified_versions.remove(&buffer);
                match tracked.status {
                    TrackedBufferStatus::Created {
                        existing_file_content,
@@ -115,7 +106,7 @@ impl ActionLog {
                TrackedBuffer {
                    buffer: buffer.clone(),
                    diff_base,
-                    unreviewed_edits,
+                    unreviewed_edits: unreviewed_edits,
                    snapshot: text_snapshot.clone(),
                    status,
                    version: buffer.read(cx).version(),
@@ -174,7 +165,6 @@ impl ActionLog {
                    // If the buffer had been edited by a tool, but it got
                    // deleted externally, we want to stop tracking it.
                    self.tracked_buffers.remove(&buffer);
-                    self.notified_versions.remove(&buffer);
                }
                cx.notify();
            }
@@ -188,7 +178,6 @@ impl ActionLog {
                    // resurrected externally, we want to clear the edits we
                    // were tracking and reset the buffer's state.
                    self.tracked_buffers.remove(&buffer);
-                    self.notified_versions.remove(&buffer);
                    self.track_buffer_internal(buffer, false, cx);
                }
                cx.notify();
@@ -494,7 +483,6 @@ impl ActionLog {
        match tracked_buffer.status {
            TrackedBufferStatus::Created { .. } => {
                self.tracked_buffers.remove(&buffer);
-                self.notified_versions.remove(&buffer);
                cx.notify();
            }
            TrackedBufferStatus::Modified => {
@@ -520,7 +508,6 @@ impl ActionLog {
        match tracked_buffer.status {
            TrackedBufferStatus::Deleted => {
                self.tracked_buffers.remove(&buffer);
-                self.notified_versions.remove(&buffer);
                cx.notify();
            }
            _ => {
@@ -629,7 +616,6 @@ impl ActionLog {
                };

                self.tracked_buffers.remove(&buffer);
-                self.notified_versions.remove(&buffer);
                cx.notify();
                task
            }
@@ -643,7 +629,6 @@ impl ActionLog {

                // Clear all tracked edits for this buffer and start over as if we just read it.
                self.tracked_buffers.remove(&buffer);
-                self.notified_versions.remove(&buffer);
                self.buffer_read(buffer.clone(), cx);
                cx.notify();
                save
@@ -719,22 +704,6 @@ impl ActionLog {
        cx.notify();
    }

-    pub fn reject_all_edits(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        let futures = self.changed_buffers(cx).into_keys().map(|buffer| {
-            let reject = self.reject_edits_in_ranges(buffer, vec![Anchor::MIN..Anchor::MAX], cx);
-
-            async move {
-                reject.await.log_err();
-            }
-        });
-
-        let task = futures::future::join_all(futures);
-
-        cx.spawn(async move |_, _| {
-            task.await;
-        })
-    }
-
    /// Returns the set of buffers that contain edits that haven't been reviewed by the user.
    pub fn changed_buffers(&self, cx: &App) -> BTreeMap<Entity<Buffer>, Entity<BufferDiff>> {
        self.tracked_buffers
@@ -744,33 +713,6 @@ impl ActionLog {
            .collect()
    }

-    /// Returns stale buffers that haven't been notified yet
-    pub fn unnotified_stale_buffers<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl Iterator<Item = &'a Entity<Buffer>> {
-        self.stale_buffers(cx).filter(|buffer| {
-            let buffer_entity = buffer.read(cx);
-            self.notified_versions
-                .get(buffer)
-                .map_or(true, |notified_version| {
-                    *notified_version != buffer_entity.version
-                })
-        })
-    }
-
-    /// Marks the given buffers as notified at their current versions
-    pub fn mark_buffers_as_notified(
-        &mut self,
-        buffers: impl IntoIterator<Item = Entity<Buffer>>,
-        cx: &App,
-    ) {
-        for buffer in buffers {
-            let version = buffer.read(cx).version.clone();
-            self.notified_versions.insert(buffer, version);
-        }
-    }
-
    /// Iterate over buffers changed since last read or edited by the model
    pub fn stale_buffers<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = &'a Entity<Buffer>> {
        self.tracked_buffers
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -25,15 +25,10 @@ fn preprocess_json_schema(json: &mut Value) -> Result<()> {
    // `additionalProperties` defaults to `false` unless explicitly specified.
    // This prevents models from hallucinating tool parameters.
    if let Value::Object(obj) = json {
-        if matches!(obj.get("type"), Some(Value::String(s)) if s == "object") {
-            if !obj.contains_key("additionalProperties") {
+        if let Some(Value::String(type_str)) = obj.get("type") {
+            if type_str == "object" && !obj.contains_key("additionalProperties") {
                obj.insert("additionalProperties".to_string(), Value::Bool(false));
            }
-
-            // OpenAI API requires non-missing `properties`
-            if !obj.contains_key("properties") {
-                obj.insert("properties".to_string(), Value::Object(Default::default()));
-            }
        }
    }
    Ok(())
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -11,7 +11,6 @@ mod list_directory_tool;
 mod move_path_tool;
 mod now_tool;
 mod open_tool;
-mod project_notifications_tool;
 mod read_file_tool;
 mod schema;
 mod templates;
@@ -46,7 +45,6 @@ pub use edit_file_tool::{EditFileMode, EditFileToolInput};
 pub use find_path_tool::FindPathToolInput;
 pub use grep_tool::{GrepTool, GrepToolInput};
 pub use open_tool::OpenTool;
-pub use project_notifications_tool::ProjectNotificationsTool;
 pub use read_file_tool::{ReadFileTool, ReadFileToolInput};
 pub use terminal_tool::TerminalTool;

@@ -63,7 +61,6 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    registry.register_tool(ListDirectoryTool);
    registry.register_tool(NowTool);
    registry.register_tool(OpenTool);
-    registry.register_tool(ProjectNotificationsTool);
    registry.register_tool(FindPathTool);
    registry.register_tool(ReadFileTool);
    registry.register_tool(GrepTool);
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -57,7 +57,7 @@ impl Tool for CopyPathTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolCopy
+        IconName::Clipboard
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -46,7 +46,7 @@ impl Tool for CreateDirectoryTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolFolder
+        IconName::Folder
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -46,7 +46,7 @@ impl Tool for DeletePathTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolDeleteFile
+        IconName::FileDelete
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -59,7 +59,7 @@ impl Tool for DiagnosticsTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolDiagnostics
+        IconName::XCircle
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -719,7 +719,6 @@ impl EditAgent {
            tools,
            stop: Vec::new(),
            temperature: None,
-            thinking_allowed: true,
        };

        Ok(self.model.stream_completion_text(request, cx).await?.stream)
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1263,7 +1263,6 @@ impl EvalAssertion {
                    content: vec![prompt.into()],
                    cache: false,
                }],
-                thinking_allowed: true,
                ..Default::default()
            };
            let mut response = retry_on_rate_limit(async || {
@@ -1600,7 +1599,6 @@ impl EditAgentTest {
        let conversation = LanguageModelRequest {
            messages,
            tools,
-            thinking_allowed: true,
            ..Default::default()
        };

--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -4,7 +4,6 @@ use crate::{
    schema::json_schema_for,
    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
-use agent_settings;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{
    ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolResultContent, ToolResultOutput,
@@ -15,7 +14,7 @@ use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, Transformation, WeakEntity, percentage, pulsating_between, px,
+    TextStyleRefinement, WeakEntity, pulsating_between, px,
 };
 use indoc::formatdoc;
 use language::{
@@ -139,7 +138,7 @@ impl Tool for EditFileTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolPencil
+        IconName::Pencil
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
@@ -516,9 +515,7 @@ pub struct EditFileToolCard {

 impl EditFileToolCard {
    pub fn new(path: PathBuf, project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
-        let expand_edit_card = agent_settings::AgentSettings::get_global(cx).expand_edit_card;
        let multibuffer = cx.new(|_| MultiBuffer::without_headers(Capability::ReadOnly));
-
        let editor = cx.new(|cx| {
            let mut editor = Editor::new(
                EditorMode::Full {
@@ -559,7 +556,7 @@ impl EditFileToolCard {
            diff_task: None,
            preview_expanded: true,
            error_expanded: None,
-            full_height_expanded: expand_edit_card,
+            full_height_expanded: true,
            total_lines: None,
        }
    }
@@ -758,13 +755,6 @@ impl ToolCard for EditFileToolCard {
            _ => None,
        };

-        let running_or_pending = match status {
-            ToolUseStatus::Running | ToolUseStatus::Pending => Some(()),
-            _ => None,
-        };
-
-        let should_show_loading = running_or_pending.is_some() && !self.full_height_expanded;
-
        let path_label_button = h_flex()
            .id(("edit-tool-path-label-button", self.editor.entity_id()))
            .w_full()
@@ -783,8 +773,8 @@ impl ToolCard for EditFileToolCard {
            .child(
                h_flex()
                    .child(
-                        Icon::new(IconName::ToolPencil)
-                            .size(IconSize::Small)
+                        Icon::new(IconName::Pencil)
+                            .size(IconSize::XSmall)
                            .color(Color::Muted),
                    )
                    .child(
@@ -873,18 +863,6 @@ impl ToolCard for EditFileToolCard {
                header.bg(codeblock_header_bg)
            })
            .child(path_label_button)
-            .when(should_show_loading, |header| {
-                header.pr_1p5().child(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::XSmall)
-                        .color(Color::Info)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
-                )
-            })
            .when_some(error_message, |header, error_message| {
                header.child(
                    h_flex()
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -130,7 +130,7 @@ impl Tool for FetchTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolWeb
+        IconName::Globe
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -68,7 +68,7 @@ impl Tool for FindPathTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolSearch
+        IconName::SearchCode
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
@@ -313,7 +313,7 @@ impl ToolCard for FindPathToolCard {
            .mb_2()
            .gap_1()
            .child(
-                ToolCallCardHeader::new(IconName::ToolSearch, matches_label)
+                ToolCallCardHeader::new(IconName::SearchCode, matches_label)
                    .with_code_path(&self.glob)
                    .disclosure_slot(
                        Disclosure::new("path-search-disclosure", self.expanded)
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -70,7 +70,7 @@ impl Tool for GrepTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolRegex
+        IconName::Regex
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -58,7 +58,7 @@ impl Tool for ListDirectoryTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolFolder
+        IconName::Folder
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/project_notifications_tool.rs
+++ b/crates/assistant_tools/src/project_notifications_tool.rs
@@ -1,224 +0,0 @@
-use crate::schema::json_schema_for;
-use anyhow::Result;
-use assistant_tool::{ActionLog, Tool, ToolResult};
-use gpui::{AnyWindowHandle, App, Entity, Task};
-use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::fmt::Write as _;
-use std::sync::Arc;
-use ui::IconName;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ProjectUpdatesToolInput {}
-
-pub struct ProjectNotificationsTool;
-
-impl Tool for ProjectNotificationsTool {
-    fn name(&self) -> String {
-        "project_notifications".to_string()
-    }
-
-    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
-    }
-    fn may_perform_edits(&self) -> bool {
-        false
-    }
-    fn description(&self) -> String {
-        include_str!("./project_notifications_tool/description.md").to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::ToolNotification
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<ProjectUpdatesToolInput>(format)
-    }
-
-    fn ui_text(&self, _input: &serde_json::Value) -> String {
-        "Check project notifications".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        _model: Arc<dyn LanguageModel>,
-        _window: Option<AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let mut stale_files = String::new();
-        let mut notified_buffers = Vec::new();
-
-        for stale_file in action_log.read(cx).unnotified_stale_buffers(cx) {
-            if let Some(file) = stale_file.read(cx).file() {
-                writeln!(&mut stale_files, "- {}", file.path().display()).ok();
-                notified_buffers.push(stale_file.clone());
-            }
-        }
-
-        if !notified_buffers.is_empty() {
-            action_log.update(cx, |log, cx| {
-                log.mark_buffers_as_notified(notified_buffers, cx);
-            });
-        }
-
-        let response = if stale_files.is_empty() {
-            "No new notifications".to_string()
-        } else {
-            // NOTE: Changes to this prompt require a symmetric update in the LLM Worker
-            const HEADER: &str = include_str!("./project_notifications_tool/prompt_header.txt");
-            format!("{HEADER}{stale_files}").replace("\r\n", "\n")
-        };
-
-        Task::ready(Ok(response.into())).into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use assistant_tool::ToolResultContent;
-    use gpui::{AppContext, TestAppContext};
-    use language_model::{LanguageModelRequest, fake_provider::FakeLanguageModelProvider};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::sync::Arc;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_stale_buffer_notification(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let buffer_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("test/code.rs", cx)
-            })
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_buffer(buffer_path.clone(), cx)
-            })
-            .await
-            .unwrap();
-
-        // Start tracking the buffer
-        action_log.update(cx, |log, cx| {
-            log.buffer_read(buffer.clone(), cx);
-        });
-
-        // Run the tool before any changes
-        let tool = Arc::new(ProjectNotificationsTool);
-        let provider = Arc::new(FakeLanguageModelProvider);
-        let model: Arc<dyn LanguageModel> = Arc::new(provider.test_model());
-        let request = Arc::new(LanguageModelRequest::default());
-        let tool_input = json!({});
-
-        let result = cx.update(|cx| {
-            tool.clone().run(
-                tool_input.clone(),
-                request.clone(),
-                project.clone(),
-                action_log.clone(),
-                model.clone(),
-                None,
-                cx,
-            )
-        });
-
-        let response = result.output.await.unwrap();
-        let response_text = match &response.content {
-            ToolResultContent::Text(text) => text.clone(),
-            _ => panic!("Expected text response"),
-        };
-        assert_eq!(
-            response_text.as_str(),
-            "No new notifications",
-            "Tool should return 'No new notifications' when no stale buffers"
-        );
-
-        // Modify the buffer (makes it stale)
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(1..1, "\nChange!\n")], None, cx);
-        });
-
-        // Run the tool again
-        let result = cx.update(|cx| {
-            tool.clone().run(
-                tool_input.clone(),
-                request.clone(),
-                project.clone(),
-                action_log.clone(),
-                model.clone(),
-                None,
-                cx,
-            )
-        });
-
-        // This time the buffer is stale, so the tool should return a notification
-        let response = result.output.await.unwrap();
-        let response_text = match &response.content {
-            ToolResultContent::Text(text) => text.clone(),
-            _ => panic!("Expected text response"),
-        };
-
-        let expected_content = "[The following is an auto-generated notification; do not reply]\n\nThese files have changed since the last read:\n- code.rs\n";
-        assert_eq!(
-            response_text.as_str(),
-            expected_content,
-            "Tool should return the stale buffer notification"
-        );
-
-        // Run the tool once more without any changes - should get no new notifications
-        let result = cx.update(|cx| {
-            tool.run(
-                tool_input.clone(),
-                request.clone(),
-                project.clone(),
-                action_log,
-                model.clone(),
-                None,
-                cx,
-            )
-        });
-
-        let response = result.output.await.unwrap();
-        let response_text = match &response.content {
-            ToolResultContent::Text(text) => text.clone(),
-            _ => panic!("Expected text response"),
-        };
-
-        assert_eq!(
-            response_text.as_str(),
-            "No new notifications",
-            "Tool should return 'No new notifications' when running again without changes"
-        );
-    }
-
-    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);
-            assistant_tool::init(cx);
-        });
-    }
-}
--- a/crates/assistant_tools/src/project_notifications_tool/description.md
+++ b/crates/assistant_tools/src/project_notifications_tool/description.md
@@ -1,3 +0,0 @@
-This tool reports which files have been modified by the user since the agent last accessed them.
-
-It serves as a notification mechanism to inform the agent of recent changes. No immediate action is required in response to these updates.
--- a/crates/assistant_tools/src/project_notifications_tool/prompt_header.txt
+++ b/crates/assistant_tools/src/project_notifications_tool/prompt_header.txt
@@ -1,3 +0,0 @@
-[The following is an auto-generated notification; do not reply]
-
-These files have changed since the last read:
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -18,6 +18,7 @@ use serde::{Deserialize, Serialize};
 use settings::Settings;
 use std::sync::Arc;
 use ui::IconName;
+use util::markdown::MarkdownInlineCode;

 /// If the model requests to read a file whose size exceeds this, then
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -67,7 +68,7 @@ impl Tool for ReadFileTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolRead
+        IconName::FileSearch
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
@@ -77,21 +78,11 @@ impl Tool for ReadFileTool {
    fn ui_text(&self, input: &serde_json::Value) -> String {
        match serde_json::from_value::<ReadFileToolInput>(input.clone()) {
            Ok(input) => {
-                let path = &input.path;
+                let path = MarkdownInlineCode(&input.path);
                match (input.start_line, input.end_line) {
-                    (Some(start), Some(end)) => {
-                        format!(
-                            "[Read file `{}` (lines {}-{})](@selection:{}:({}-{}))",
-                            path, start, end, path, start, end
-                        )
-                    }
-                    (Some(start), None) => {
-                        format!(
-                            "[Read file `{}` (from line {})](@selection:{}:({}-{}))",
-                            path, start, path, start, start
-                        )
-                    }
-                    _ => format!("[Read file `{}`](@file:{})", path, path),
+                    (Some(start), None) => format!("Read file {path} (from line {start})"),
+                    (Some(start), Some(end)) => format!("Read file {path} (lines {start}-{end})"),
+                    _ => format!("Read file {path}"),
                }
            }
            Err(_) => "Read file".to_string(),
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -2,13 +2,12 @@ use crate::{
    schema::json_schema_for,
    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
-use agent_settings;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
 use gpui::{
-    Animation, AnimationExt, AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task,
-    TextStyleRefinement, Transformation, WeakEntity, Window, percentage,
+    AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, TextStyleRefinement,
+    WeakEntity, Window,
 };
 use language::LineEnding;
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
@@ -90,7 +89,7 @@ impl Tool for TerminalTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolTerminal
+        IconName::Terminal
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
@@ -248,7 +247,6 @@ impl Tool for TerminalTool {
                command_markdown.clone(),
                working_dir.clone(),
                cx.entity_id(),
-                cx,
            )
        });

@@ -443,10 +441,7 @@ impl TerminalToolCard {
        input_command: Entity<Markdown>,
        working_dir: Option<PathBuf>,
        entity_id: EntityId,
-        cx: &mut Context<Self>,
    ) -> Self {
-        let expand_terminal_card =
-            agent_settings::AgentSettings::get_global(cx).expand_terminal_card;
        Self {
            input_command,
            working_dir,
@@ -458,7 +453,7 @@ impl TerminalToolCard {
            finished_with_empty_output: false,
            original_content_len: 0,
            content_line_count: 0,
-            preview_expanded: expand_terminal_card,
+            preview_expanded: true,
            start_instant: Instant::now(),
            elapsed_time: None,
        }
@@ -523,46 +518,6 @@ impl ToolCard for TerminalToolCard {
                            .color(Color::Muted),
                    ),
            )
-            .when(!self.command_finished, |header| {
-                header.child(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::XSmall)
-                        .color(Color::Info)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
-                )
-            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", self.entity_id))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when(command_failed && self.exit_status.is_some(), |this| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                self.exit_status
-                                    .and_then(|status| status.code())
-                                    .unwrap_or(-1),
-                            )))
-                        })
-                        .when(
-                            !command_failed && tool_failed && status.error().is_some(),
-                            |this| {
-                                this.tooltip(Tooltip::text(format!(
-                                    "Error: {}",
-                                    status.error().unwrap(),
-                                )))
-                            },
-                        ),
-                )
-            })
            .when(self.was_content_truncated, |header| {
                let tooltip = if self.content_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
                    "Output exceeded terminal max lines and was \
@@ -600,6 +555,34 @@ impl ToolCard for TerminalToolCard {
                        .size(LabelSize::Small),
                )
            })
+            .when(tool_failed || command_failed, |header| {
+                header.child(
+                    div()
+                        .id(("terminal-tool-error-code-indicator", self.entity_id))
+                        .child(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::Small)
+                                .color(Color::Error),
+                        )
+                        .when(command_failed && self.exit_status.is_some(), |this| {
+                            this.tooltip(Tooltip::text(format!(
+                                "Exited with code {}",
+                                self.exit_status
+                                    .and_then(|status| status.code())
+                                    .unwrap_or(-1),
+                            )))
+                        })
+                        .when(
+                            !command_failed && tool_failed && status.error().is_some(),
+                            |this| {
+                                this.tooltip(Tooltip::text(format!(
+                                    "Error: {}",
+                                    status.error().unwrap(),
+                                )))
+                            },
+                        ),
+                )
+            })
            .when(!self.finished_with_empty_output, |header| {
                header.child(
                    Disclosure::new(
@@ -651,7 +634,6 @@ impl ToolCard for TerminalToolCard {
                        div()
                            .pt_2()
                            .border_t_1()
-                            .when(tool_failed || command_failed, |card| card.border_dashed())
                            .border_color(border_color)
                            .bg(cx.theme().colors().editor_background)
                            .rounded_b_md()
--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -37,7 +37,7 @@ impl Tool for ThinkingTool {
    }

    fn icon(&self) -> IconName {
-        IconName::ToolBulb
+        IconName::LightBulb
    }

    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/assistant_tools/src/ui/tool_call_card_header.rs
+++ b/crates/assistant_tools/src/ui/tool_call_card_header.rs
@@ -82,7 +82,7 @@ impl RenderOnce for ToolCallCardHeader {
                    .child(
                        h_flex().h(line_height).justify_center().child(
                            Icon::new(self.icon)
-                                .size(IconSize::Small)
+                                .size(IconSize::XSmall)
                                .color(Color::Muted),
                        ),
                    )
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -143,8 +143,6 @@ impl ToolCard for WebSearchToolCard {
        _workspace: WeakEntity<Workspace>,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let icon = IconName::ToolWeb;
-
        let header = match self.response.as_ref() {
            Some(Ok(response)) => {
                let text: SharedString = if response.results.len() == 1 {
@@ -152,12 +150,13 @@ impl ToolCard for WebSearchToolCard {
                } else {
                    format!("{} results", response.results.len()).into()
                };
-                ToolCallCardHeader::new(icon, "Searched the Web").with_secondary_text(text)
+                ToolCallCardHeader::new(IconName::Globe, "Searched the Web")
+                    .with_secondary_text(text)
            }
            Some(Err(error)) => {
-                ToolCallCardHeader::new(icon, "Web Search").with_error(error.to_string())
+                ToolCallCardHeader::new(IconName::Globe, "Web Search").with_error(error.to_string())
            }
-            None => ToolCallCardHeader::new(icon, "Searching the Web").loading(),
+            None => ToolCallCardHeader::new(IconName::Globe, "Searching the Web").loading(),
        };

        let content = self.response.as_ref().and_then(|response| match response {
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -638,7 +638,7 @@ impl AutoUpdater {
        let filename = match OS {
            "macos" => anyhow::Ok("Zed.dmg"),
            "linux" => Ok("zed.tar.gz"),
-            "windows" => Ok("zed_editor_installer.exe"),
+            "windows" => Ok("ZedUpdateInstaller.exe"),
            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
        }?;

--- a/crates/auto_update_helper/app-icon.ico
+++ b/crates/auto_update_helper/app-icon.ico
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -1389,17 +1389,10 @@ impl Room {
        let sources = cx.screen_capture_sources();

        cx.spawn(async move |this, cx| {
-            let sources = sources
-                .await
-                .map_err(|error| error.into())
-                .and_then(|sources| sources);
-            let source =
-                sources.and_then(|sources| sources.into_iter().next().context("no display found"));
+            let sources = sources.await??;
+            let source = sources.first().context("no display found")?;

-            let publication = match source {
-                Ok(source) => participant.publish_screenshare_track(&*source, cx).await,
-                Err(error) => Err(error),
-            };
+            let publication = participant.publish_screenshare_track(&**source, cx).await;

            this.update(cx, |this, cx| {
                let live_kit = this
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -130,13 +130,6 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
 }

 fn main() -> Result<()> {
-    #[cfg(all(not(debug_assertions), target_os = "windows"))]
-    unsafe {
-        use ::windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole};
-
-        let _ = AttachConsole(ATTACH_PARENT_PROCESS);
-    }
-
    #[cfg(unix)]
    util::prevent_root_execution();

--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -26,7 +26,7 @@ CREATE UNIQUE INDEX "index_users_on_github_user_id" ON "users" ("github_user_id"

 CREATE TABLE "access_tokens" (
    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "user_id" INTEGER REFERENCES users (id) ON DELETE CASCADE,
+    "user_id" INTEGER REFERENCES users (id),
    "impersonated_user_id" INTEGER REFERENCES users (id),
    "hash" VARCHAR(128)
 );
--- a/crates/collab/migrations/20250707182700_add_access_tokens_cascade_delete_on_user.sql
+++ b/crates/collab/migrations/20250707182700_add_access_tokens_cascade_delete_on_user.sql
@@ -1,3 +0,0 @@
-ALTER TABLE access_tokens DROP CONSTRAINT access_tokens_user_id_fkey;
-ALTER TABLE access_tokens ADD CONSTRAINT access_tokens_user_id_fkey
-    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
--- a/crates/collab/seed.default.json
+++ b/crates/collab/seed.default.json
@@ -1,33 +1,12 @@
 {
  "admins": [
    "nathansobo",
-    "maxbrunsfeld",
    "as-cii",
-    "JosephTLyons",
-    "maxdeviant",
-    "SomeoneToIgnore",
+    "maxbrunsfeld",
+    "iamnbutler",
    "mikayla-maki",
-    "agu-z",
-    "osiewicz",
-    "ConradIrwin",
-    "benbrandt",
-    "bennetbo",
-    "smitbarmase",
-    "notpeter",
-    "rgbkrk",
-    "JunkuiZhang",
-    "Anthony-Eid",
-    "rtfeldman",
-    "danilo-leal",
-    "MrSubidubi",
-    "cole-miller",
-    "osyvokon",
-    "probably-neb",
-    "mgsloan",
-    "P1n3appl3",
-    "mslzed",
-    "franciskafyi",
-    "katie-z-geer"
+    "JosephTLyons",
+    "rgbkrk"
  ],
  "channels": ["zed"]
 }
--- a/crates/collab/src/db/tests/user_tests.rs
+++ b/crates/collab/src/db/tests/user_tests.rs
@@ -44,53 +44,3 @@ async fn test_accepted_tos(db: &Arc<Database>) {
    let user = db.get_user_by_id(user_id).await.unwrap().unwrap();
    assert!(user.accepted_tos_at.is_none());
 }
-
-test_both_dbs!(
-    test_destroy_user_cascade_deletes_access_tokens,
-    test_destroy_user_cascade_deletes_access_tokens_postgres,
-    test_destroy_user_cascade_deletes_access_tokens_sqlite
-);
-
-async fn test_destroy_user_cascade_deletes_access_tokens(db: &Arc<Database>) {
-    let user_id = db
-        .create_user(
-            "user1@example.com",
-            Some("user1"),
-            false,
-            NewUserParams {
-                github_login: "user1".to_string(),
-                github_user_id: 12345,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let user = db.get_user_by_id(user_id).await.unwrap();
-    assert!(user.is_some());
-
-    let token_1_id = db
-        .create_access_token(user_id, None, "token-1", 10)
-        .await
-        .unwrap();
-
-    let token_2_id = db
-        .create_access_token(user_id, None, "token-2", 10)
-        .await
-        .unwrap();
-
-    let token_1 = db.get_access_token(token_1_id).await;
-    let token_2 = db.get_access_token(token_2_id).await;
-    assert!(token_1.is_ok());
-    assert!(token_2.is_ok());
-
-    db.destroy_user(user_id).await.unwrap();
-
-    let user = db.get_user_by_id(user_id).await.unwrap();
-    assert!(user.is_none());
-
-    let token_1 = db.get_access_token(token_1_id).await;
-    let token_2 = db.get_access_token(token_2_id).await;
-    assert!(token_1.is_err());
-    assert!(token_2.is_err());
-}
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -2836,115 +2836,60 @@ async fn make_update_user_plan_message(
        account_too_young: Some(account_too_young),
        has_overdue_invoices: billing_customer
            .map(|billing_customer| billing_customer.has_overdue_invoices),
-        usage: Some(
-            usage
-                .map(|usage| subscription_usage_to_proto(plan, usage, &feature_flags))
-                .unwrap_or_else(|| make_default_subscription_usage(plan, &feature_flags)),
-        ),
-    })
-}
-
-fn model_requests_limit(
-    plan: zed_llm_client::Plan,
-    feature_flags: &Vec<String>,
-) -> zed_llm_client::UsageLimit {
-    match plan.model_requests_limit() {
-        zed_llm_client::UsageLimit::Limited(limit) => {
-            let limit = if plan == zed_llm_client::Plan::ZedProTrial
-                && feature_flags
-                    .iter()
-                    .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG)
-            {
-                1_000
-            } else {
-                limit
+        usage: usage.map(|usage| {
+            let plan = match plan {
+                proto::Plan::Free => zed_llm_client::Plan::ZedFree,
+                proto::Plan::ZedPro => zed_llm_client::Plan::ZedPro,
+                proto::Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
            };

-            zed_llm_client::UsageLimit::Limited(limit)
-        }
-        zed_llm_client::UsageLimit::Unlimited => zed_llm_client::UsageLimit::Unlimited,
-    }
-}
-
-fn subscription_usage_to_proto(
-    plan: proto::Plan,
-    usage: crate::llm::db::subscription_usage::Model,
-    feature_flags: &Vec<String>,
-) -> proto::SubscriptionUsage {
-    let plan = match plan {
-        proto::Plan::Free => zed_llm_client::Plan::ZedFree,
-        proto::Plan::ZedPro => zed_llm_client::Plan::ZedPro,
-        proto::Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
-    };
-
-    proto::SubscriptionUsage {
-        model_requests_usage_amount: usage.model_requests as u32,
-        model_requests_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match model_requests_limit(plan, feature_flags) {
+            let model_requests_limit = match plan.model_requests_limit() {
                zed_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                zed_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-        edit_predictions_usage_amount: usage.edit_predictions as u32,
-        edit_predictions_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match plan.edit_predictions_limit() {
-                zed_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                zed_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-    }
-}
+                    let limit = if plan == zed_llm_client::Plan::ZedProTrial
+                        && feature_flags
+                            .iter()
+                            .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG)
+                    {
+                        1_000
+                    } else {
+                        limit
+                    };

-fn make_default_subscription_usage(
-    plan: proto::Plan,
-    feature_flags: &Vec<String>,
-) -> proto::SubscriptionUsage {
-    let plan = match plan {
-        proto::Plan::Free => zed_llm_client::Plan::ZedFree,
-        proto::Plan::ZedPro => zed_llm_client::Plan::ZedPro,
-        proto::Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
-    };
+                    zed_llm_client::UsageLimit::Limited(limit)
+                }
+                zed_llm_client::UsageLimit::Unlimited => zed_llm_client::UsageLimit::Unlimited,
+            };

-    proto::SubscriptionUsage {
-        model_requests_usage_amount: 0,
-        model_requests_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match model_requests_limit(plan, feature_flags) {
-                zed_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                zed_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
+            proto::SubscriptionUsage {
+                model_requests_usage_amount: usage.model_requests as u32,
+                model_requests_usage_limit: Some(proto::UsageLimit {
+                    variant: Some(match model_requests_limit {
+                        zed_llm_client::UsageLimit::Limited(limit) => {
+                            proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
+                                limit: limit as u32,
+                            })
+                        }
+                        zed_llm_client::UsageLimit::Unlimited => {
+                            proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
+                        }
+                    }),
+                }),
+                edit_predictions_usage_amount: usage.edit_predictions as u32,
+                edit_predictions_usage_limit: Some(proto::UsageLimit {
+                    variant: Some(match plan.edit_predictions_limit() {
+                        zed_llm_client::UsageLimit::Limited(limit) => {
+                            proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
+                                limit: limit as u32,
+                            })
+                        }
+                        zed_llm_client::UsageLimit::Unlimited => {
+                            proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
+                        }
+                    }),
+                }),
+            }
        }),
-        edit_predictions_usage_amount: 0,
-        edit_predictions_usage_limit: Some(proto::UsageLimit {
-            variant: Some(match plan.edit_predictions_limit() {
-                zed_llm_client::UsageLimit::Limited(limit) => {
-                    proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                        limit: limit as u32,
-                    })
-                }
-                zed_llm_client::UsageLimit::Unlimited => {
-                    proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                }
-            }),
-        }),
-    }
+    })
 }

 async fn update_user_plan(session: &Session) -> Result<()> {
--- a/crates/collab/src/stripe_billing.rs
+++ b/crates/collab/src/stripe_billing.rs
@@ -19,8 +19,8 @@ use crate::stripe_client::{
    StripeCustomerId, StripeCustomerUpdate, StripeCustomerUpdateAddress, StripeCustomerUpdateName,
    StripeMeter, StripePrice, StripePriceId, StripeSubscription, StripeSubscriptionId,
    StripeSubscriptionTrialSettings, StripeSubscriptionTrialSettingsEndBehavior,
-    StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod, StripeTaxIdCollection,
-    UpdateSubscriptionItems, UpdateSubscriptionParams,
+    StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod, UpdateSubscriptionItems,
+    UpdateSubscriptionParams,
 };

 pub struct StripeBilling {
@@ -252,7 +252,6 @@ impl StripeBilling {
            name: Some(StripeCustomerUpdateName::Auto),
            shipping: None,
        });
-        params.tax_id_collection = Some(StripeTaxIdCollection { enabled: true });

        let session = self.client.create_checkout_session(params).await?;
        Ok(session.url.context("no checkout session URL")?)
@@ -312,7 +311,6 @@ impl StripeBilling {
            name: Some(StripeCustomerUpdateName::Auto),
            shipping: None,
        });
-        params.tax_id_collection = Some(StripeTaxIdCollection { enabled: true });

        let session = self.client.create_checkout_session(params).await?;
        Ok(session.url.context("no checkout session URL")?)
--- a/crates/collab/src/stripe_client.rs
+++ b/crates/collab/src/stripe_client.rs
@@ -190,7 +190,6 @@ pub struct StripeCreateCheckoutSessionParams<'a> {
    pub success_url: Option<&'a str>,
    pub billing_address_collection: Option<StripeBillingAddressCollection>,
    pub customer_update: Option<StripeCustomerUpdate>,
-    pub tax_id_collection: Option<StripeTaxIdCollection>,
 }

 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -219,11 +218,6 @@ pub struct StripeCreateCheckoutSessionSubscriptionData {
    pub trial_settings: Option<StripeSubscriptionTrialSettings>,
 }

-#[derive(Debug, PartialEq, Clone)]
-pub struct StripeTaxIdCollection {
-    pub enabled: bool,
-}
-
 #[derive(Debug)]
 pub struct StripeCheckoutSession {
    pub url: Option<String>,
--- a/crates/collab/src/stripe_client/fake_stripe_client.rs
+++ b/crates/collab/src/stripe_client/fake_stripe_client.rs
@@ -14,8 +14,8 @@ use crate::stripe_client::{
    StripeCreateCheckoutSessionSubscriptionData, StripeCreateMeterEventParams,
    StripeCreateSubscriptionParams, StripeCustomer, StripeCustomerId, StripeCustomerUpdate,
    StripeMeter, StripeMeterId, StripePrice, StripePriceId, StripeSubscription,
-    StripeSubscriptionId, StripeSubscriptionItem, StripeSubscriptionItemId, StripeTaxIdCollection,
-    UpdateCustomerParams, UpdateSubscriptionParams,
+    StripeSubscriptionId, StripeSubscriptionItem, StripeSubscriptionItemId, UpdateCustomerParams,
+    UpdateSubscriptionParams,
 };

 #[derive(Debug, Clone)]
@@ -38,7 +38,6 @@ pub struct StripeCreateCheckoutSessionCall {
    pub success_url: Option<String>,
    pub billing_address_collection: Option<StripeBillingAddressCollection>,
    pub customer_update: Option<StripeCustomerUpdate>,
-    pub tax_id_collection: Option<StripeTaxIdCollection>,
 }

 pub struct FakeStripeClient {
@@ -237,7 +236,6 @@ impl StripeClient for FakeStripeClient {
                success_url: params.success_url.map(|url| url.to_string()),
                billing_address_collection: params.billing_address_collection,
                customer_update: params.customer_update,
-                tax_id_collection: params.tax_id_collection,
            });

        Ok(StripeCheckoutSession {
--- a/crates/collab/src/stripe_client/real_stripe_client.rs
+++ b/crates/collab/src/stripe_client/real_stripe_client.rs
@@ -27,8 +27,8 @@ use crate::stripe_client::{
    StripeMeter, StripePrice, StripePriceId, StripePriceRecurring, StripeSubscription,
    StripeSubscriptionId, StripeSubscriptionItem, StripeSubscriptionItemId,
    StripeSubscriptionTrialSettings, StripeSubscriptionTrialSettingsEndBehavior,
-    StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod, StripeTaxIdCollection,
-    UpdateCustomerParams, UpdateSubscriptionParams,
+    StripeSubscriptionTrialSettingsEndBehaviorMissingPaymentMethod, UpdateCustomerParams,
+    UpdateSubscriptionParams,
 };

 pub struct RealStripeClient {
@@ -448,7 +448,6 @@ impl<'a> TryFrom<StripeCreateCheckoutSessionParams<'a>> for CreateCheckoutSessio
            success_url: value.success_url,
            billing_address_collection: value.billing_address_collection.map(Into::into),
            customer_update: value.customer_update.map(Into::into),
-            tax_id_collection: value.tax_id_collection.map(Into::into),
            ..Default::default()
        })
    }
@@ -591,11 +590,3 @@ impl From<StripeCustomerUpdate> for stripe::CreateCheckoutSessionCustomerUpdate
        }
    }
 }
-
-impl From<StripeTaxIdCollection> for stripe::CreateCheckoutSessionTaxIdCollection {
-    fn from(value: StripeTaxIdCollection) -> Self {
-        stripe::CreateCheckoutSessionTaxIdCollection {
-            enabled: value.enabled,
-        }
-    }
-}
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -2,7 +2,7 @@ use crate::{
    adapters::DebugAdapterBinary,
    transport::{IoKind, LogKind, TransportDelegate},
 };
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use dap_types::{
    messages::{Message, Response},
    requests::Request,
@@ -108,11 +108,7 @@ impl DebugAdapterClient {
            arguments: Some(serialized_arguments),
        };
        self.transport_delegate
-            .pending_requests
-            .lock()
-            .as_mut()
-            .context("client is closed")?
-            .insert(sequence_id, callback_tx);
+            .add_pending_request(sequence_id, callback_tx);

        log::debug!(
            "Client {} send `{}` request with sequence_id: {}",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nate Butler	94102e962c	Update global ai setting	2025-07-07 12:15:52 -04:00
Nate Butler	adb2e95e2a	Update focus outline styles	2025-07-07 12:15:42 -04:00
Nate Butler	7e22e57e08	Introduce global ai setting	2025-07-07 11:41:55 -04:00
Nate Butler	d30664d4b1	Merge branch 'main' into onboarding-ui	2025-07-07 09:33:18 -04:00
Nate Butler	5b2874b01a	WIP use components	2025-07-04 21:56:04 -04:00
Nate Butler	ffb557c2d9	Add additional row components	2025-07-04 21:38:49 -04:00
Nate Butler	6e6e6d86c3	Update selectable_tile.rs	2025-07-04 20:00:55 -04:00
Nate Butler	e32e1baf5f	Add SelectableTile	2025-07-04 19:52:55 -04:00
Nate Butler	bdabdbbf91	Use existing welcome page	2025-07-03 15:19:18 -04:00
Nate Butler	fe9ef209a8	Start scaffolding out ai section	2025-07-03 14:04:18 -04:00
Nate Butler	b31af62d42	Refinement	2025-07-03 13:37:49 -04:00
Nate Butler	8fde323dd0	Stub out KeyboardNavigation	2025-07-03 10:07:30 -04:00
Nate Butler	bff1f1c78a	Remove unused welcome ui module	2025-07-03 09:47:01 -04:00
Nate Butler	66b36b772f	Clean up unused	2025-07-02 10:15:52 -04:00
Nate Butler	3c5d78800b	Update keymap logos	2025-07-02 00:22:04 -04:00
Nate Butler	094c2bc32a	Tidy up keymap section	2025-07-02 00:02:27 -04:00
Nate Butler	16cfdf7b94	more themes -> launch theme selector	2025-07-01 23:12:21 -04:00
Nate Butler	ff0345bb4f	Fix theme tiles	2025-07-01 23:04:35 -04:00
Nate Butler	124ebb872a	Start on onboarding button	2025-07-01 08:44:52 -04:00
Nate Butler	530b24258f	Add `shadow_hairline`	2025-07-01 08:03:50 -04:00
Nate Butler	8c446ecd59	wip basics section	2025-06-30 21:44:17 -04:00
Nate Butler	f6407fdff1	Start on keyboard navigation story	2025-06-30 21:08:51 -04:00
Nate Butler	db52799129	wip	2025-06-30 20:17:45 -04:00
Nate Butler	db575d8a04	Style nav items	2025-06-30 19:43:00 -04:00
Nate Butler	63dc4925f6	Onboarding serializaion	2025-06-30 18:00:50 -04:00
Nate Butler	3dfaac0b4d	More UI	2025-06-30 16:51:20 -04:00
Nate Butler	4f52cece69	Tidy & set up for pages	2025-06-30 15:37:43 -04:00
Nate Butler	02f54e5958	impl item	2025-06-30 15:32:32 -04:00
Nate Butler	435dad71fb	Start scaffolding ui	2025-06-30 15:14:40 -04:00
Nate Butler	ea74f4784a	init	2025-06-30 15:02:02 -04:00
				`@@ -1 +0,0 @@`
				`<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Google Gemini</title><path d="M11.04 19.32Q12 21.51 12 24q0-2.49.93-4.68.96-2.19 2.58-3.81t3.81-2.55Q21.51 12 24 12q-2.49 0-4.68-.93a12.3 12.3 0 0 1-3.81-2.58 12.3 12.3 0 0 1-2.58-3.81Q12 2.49 12 0q0 2.49-.96 4.68-.93 2.19-2.55 3.81a12.3 12.3 0 0 1-3.81 2.58Q2.49 12 0 12q2.49 0 4.68.96 2.19.93 3.81 2.55t2.55 3.81"/></svg>`
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-clipboard"><rect width="8" height="4" x="8" y="2" rx="1" ry="1"/><path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"/></svg>`