lazy scroll start

.cargo/ci-config.toml

@@ -16,9 +16,7 @@ rustflags = ["-D", "warnings"]
 debug = "limited"
 
 # Use Mold on Linux, because it's faster than GNU ld and LLD.
-#
-# We no longer set this in the default `config.toml` so that developers can opt in to Wild, which
-# is faster than Mold, in their own ~/.cargo/config.toml.
+# We dont use wild in CI as its not production ready.
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]

.cargo/config.toml

@@ -8,6 +8,14 @@ perf-test = ["test", "--profile", "release-fast", "--lib", "--bins", "--tests",
 # Keep similar flags here to share some ccache
 perf-compare = ["run", "--profile", "release-fast", "-p", "perf", "--config", "target.'cfg(true)'.rustflags=[\"--cfg\", \"perf_enabled\"]", "--", "compare"]
 
+# [target.x86_64-unknown-linux-gnu]
+# linker = "clang"
+# rustflags = ["-C", "link-arg=-fuse-ld=mold"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-C", "link-arg=-fuse-ld=mold"]
+
 [target.'cfg(target_os = "windows")']
 rustflags = [
     "--cfg",

.github/ISSUE_TEMPLATE/01_bug_ai.yml

@@ -0,0 +1,59 @@
+name: Bug Report (AI)
+description: Zed Agent Panel Bugs
+type: "Bug"
+labels: ["ai"]
+title: "AI: <a short description of the AI Related bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        **Expected Behavior**:
+        **Actual Behavior**:
+
+        ### Model Provider Details
+        - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc)
+        - Model Name:
+        - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
+        - Other Details (MCPs, other settings, etc):
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `Zed.log` file to this issue.
+      description: |
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
+      value: |
+        <details><summary>Zed.log</summary>
+
+        <!-- Paste your log inside the code block. -->
+        ```log
+
+        ```
+
+        </details>
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/04_bug_debugger.yml

@@ -0,0 +1,53 @@
+name: Bug Report (Debugger)
+description: Zed Debugger-Related Bugs
+type: "Bug"
+labels: ["debugger"]
+title: "Debugger: <a short description of the Debugger bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        **Expected Behavior**:
+        **Actual Behavior**:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `Zed.log` file to this issue.
+      description: |
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
+      value: |
+        <details><summary>Zed.log</summary>
+
+        <!-- Paste your log inside the code block. -->
+        ```log
+
+        ```
+
+        </details>
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/06_bug_git.yml

@@ -0,0 +1,53 @@
+name: Bug Report (Git)
+description: Zed Git Related Bugs
+type: "Bug"
+labels: ["git"]
+title: "Git: <a short description of the Git bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one-line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one-line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        **Expected Behavior**:
+        **Actual Behavior**:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `Zed.log` file to this issue.
+      description: |
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
+      value: |
+        <details><summary>Zed.log</summary>
+
+        <!-- Paste your log inside the code block. -->
+        ```log
+
+        ```
+
+        </details>
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/07_bug_windows.yml

@@ -0,0 +1,53 @@
+name: Bug Report (Windows)
+description: Zed Windows Related Bugs
+type: "Bug"
+labels: ["windows"]
+title: "Windows: <a short description of the Windows bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one-line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one-line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        **Expected Behavior**:
+        **Actual Behavior**:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      placeholder: |
+        Output of "zed: copy system specs into clipboard"
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `Zed.log` file to this issue.
+      description: |
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
+      value: |
+        <details><summary>Zed.log</summary>
+
+        <!-- Paste your log inside the code block. -->
+        ```log
+
+        ```
+
+        </details>
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/10_bug_report.yml

@@ -1,53 +1,67 @@
-name: Report a bug
-description: Report a problem with Zed.
-type: Bug
-labels: "state:needs triage"
+name: Bug Report (Other)
+description: |
+  Something else is broken in Zed (exclude crashing).
+type: "Bug"
 body:
-  - type: markdown
+  - type: textarea
     attributes:
+      label: Summary
+      description: Provide a one sentence summary and detailed reproduction steps
       value: |
-        Is this bug already reported? Upvote to get it noticed faster. [Here's the search](https://github.com/zed-industries/zed/issues). Upvote means giving it a :+1: reaction.
+        <!-- Begin your issue with a one sentence summary -->
+        SUMMARY_SENTENCE_HERE
 
-        Feature request? Please open in [discussions](https://github.com/zed-industries/zed/discussions/new/choose) instead.
+        ### Description
+        <!--  Describe with sufficient detail to reproduce from a clean Zed install.
+          - Any code must be sufficient to reproduce (include context!)
+          - Include code as text, not just as a screenshot.
+          - Issues with insufficient detail may be summarily closed.
+        -->
+
+        DESCRIPTION_HERE
+
+        Steps to reproduce:
+        1.
+        2.
+        3.
+        4.
+
+        **Expected Behavior**:
+        **Actual Behavior**:
+
+        <!-- Before Submitting, did you:
+          1. Include settings.json, keymap.json, .editorconfig if relevant?
+          2. Check your Zed.log for relevant errors? (please include!)
+          3. Click Preview to ensure everything looks right?
+          4. Hide videos, large images and logs in ``` inside collapsible blocks:
+
+        <details><summary>click to expand</summary>
+
+        ```json
+
+        ```
+        </details>
+        -->
 
-        Just have a question or need support? Welcome to [Discord Support Forums](https://discord.com/invite/zedindustries).
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: A step-by-step description of how to reproduce the bug from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
-      placeholder: |
-        1. Start Zed
-        2. Click X
     validations:
       required: true
-  - type: textarea
-    attributes:
-      label: Current vs. Expected behavior
-      description: |
-        Current behavior (screenshots, videos, etc. are appreciated), vs. what you expected the behavior to be.
 
-      placeholder: |
-        Current behavior: <screenshot with an arrow> The icon is blue. Expected behavior: The icon should be red because this is what the setting is documented to do.
-    validations:
-      required: true
   - type: textarea
     id: environment
     attributes:
-      label: Zed version and system specs
+      label: Zed Version and System Specs
       description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
+        Open Zed, from the command palette select "zed: copy system specs into clipboard"
       placeholder: |
-        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
-        OS: macOS 15.1
-        Memory: 36 GiB
-        Architecture: aarch64
+        Output of "zed: copy system specs into clipboard"
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Attach Zed log file
+      label: If applicable, attach your `Zed.log` file to this issue.
       description: |
-        Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
       value: |
         <details><summary>Zed.log</summary>
 
@@ -59,57 +73,3 @@ body:
         </details>
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: Relevant Zed settings
-      description: |
-        Open the command palette in Zed, then type “zed: open settings file” and copy/paste any relevant (e.g., LSP-specific) settings.
-      value: |
-        <details><summary>settings.json</summary>
-
-        <!-- Paste your settings inside the code block. -->
-        ```json
-
-        ```
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Relevant Keymap
-      description: |
-        Open the command palette in Zed, then type “zed: open keymap file” and copy/paste the file's contents.
-      value: |
-        <details><summary>keymap.json</summary>
-
-        <!-- Paste your keymap file inside the code block. -->
-        ```json
-
-        ```
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: (for AI issues) Model provider details
-      placeholder: |
-        - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc.)
-        - Model Name: (Claude Sonnet 4.5, Gemini 3 Pro, GPT-5)
-        - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
-        - Other details (ACPs, MCPs, other settings, etc.):
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: If you are using WSL on Windows, what flavor of Linux are you using?
-      multiple: false
-      options:
-        - Arch Linux
-        - Ubuntu
-        - Fedora
-        - Mint
-        - Pop!_OS
-        - NixOS
-        - Other

.github/ISSUE_TEMPLATE/11_crash_report.yml

@@ -1,35 +1,42 @@
-name: Report a crash
-description: Zed is crashing or freezing or hanging.
-type: Crash
-labels: "state:needs triage"
+name: Crash Report
+description: Zed is Crashing or Hanging
+type: "Crash"
 body:
   - type: textarea
     attributes:
-      label: Reproduction steps
-      description: A step-by-step description of how to reproduce the crash from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
+      label: Summary
+      description: Summarize the issue with detailed reproduction steps
+      value: |
+        <!-- Begin your issue with a one sentence summary -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        Actual Behavior:
+        Expected Behavior:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
       placeholder: |
-        1. Start Zed
-        2. Perform an action
-        3. Zed crashes
+        Output of "zed: copy system specs into clipboard"
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Zed version and system specs
+      label: If applicable, attach your `Zed.log` file to this issue.
       description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
-      placeholder: |
-        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
-        OS: macOS 15.1
-        Memory: 36 GiB
-        Architecture: aarch64
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attach Zed log file
-      description: |
-        Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
+        From the command palette, run `zed: open log` to see the last 1000 lines.
+        Or run `zed: reveal log in file manager` to reveal the log file itself.
       value: |
         <details><summary>Zed.log</summary>
 

.github/ISSUE_TEMPLATE/99_other.yml

@@ -0,0 +1,19 @@
+name: Other [Staff Only]
+description: Zed Staff Only
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+        SUMMARY_SENTENCE_HERE
+
+        ### Description
+
+        IF YOU DO NOT WORK FOR ZED INDUSTRIES DO NOT CREATE ISSUES WITH THIS TEMPLATE.
+        THEY WILL BE AUTO-CLOSED AND MAY RESULT IN YOU BEING BANNED FROM THE ZED ISSUE TRACKER.
+
+        FEATURE REQUESTS / SUPPORT REQUESTS SHOULD BE OPENED AS DISCUSSIONS:
+          https://github.com/zed-industries/zed/discussions/new/choose
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,9 @@
 # yaml-language-server: $schema=https://www.schemastore.org/github-issue-config.json
 blank_issues_enabled: false
 contact_links:
-  - name: Feature request
+  - name: Feature Request
     url: https://github.com/zed-industries/zed/discussions/new/choose
-    about: To request a feature, open a new discussion under one of the appropriate categories.
-  - name: Our Discord community
-    url: https://discord.com/invite/zedindustries
-    about: Join our Discord server for real-time discussion and user support.
+    about: To request a feature, open a new Discussion in one of the appropriate Discussion categories
+  - name: "Zed Discord"
+    url: https://zed.dev/community-links
+    about: Real-time discussion and user support

.github/workflows/after_release.yml

@@ -5,27 +5,13 @@ on:
   release:
     types:
     - published
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: tag_name
-        required: true
-        type: string
-      prerelease:
-        description: prerelease
-        required: true
-        type: boolean
-      body:
-        description: body
-        type: string
-        default: ''
 jobs:
   rebuild_releases_page:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: after_release::rebuild_releases_page::refresh_cloud_releases
-      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name || inputs.tag_name }}
+      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name }}
       shell: bash -euxo pipefail {0}
     - name: after_release::rebuild_releases_page::redeploy_zed_dev
       run: npm exec --yes -- vercel@37 --token="$VERCEL_TOKEN" --scope zed-industries redeploy https://zed.dev
@@ -35,13 +21,13 @@ jobs:
   post_to_discord:
     needs:
     - rebuild_releases_page
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - id: get-release-url
       name: after_release::post_to_discord::get_release_url
       run: |
-        if [ "${{ github.event.release.prerelease || inputs.prerelease }}" == "true" ]; then
+        if [ "${{ github.event.release.prerelease }}" == "true" ]; then
             URL="https://zed.dev/releases/preview"
         else
             URL="https://zed.dev/releases/stable"
@@ -54,9 +40,9 @@ jobs:
       uses: 2428392/gh-truncate-string-action@b3ff790d21cf42af3ca7579146eedb93c8fb0757
       with:
         stringToTruncate: |
-          📣 Zed [${{ github.event.release.tag_name || inputs.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>)  was just released!
+          📣 Zed [${{ github.event.release.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>) was just released!
 
-          ${{ github.event.release.body || inputs.body }}
+          ${{ github.event.release.body }}
         maxLength: 2000
         truncationSymbol: '...'
     - name: after_release::post_to_discord::discord_webhook_action
@@ -70,7 +56,7 @@ jobs:
     - id: set-package-name
       name: after_release::publish_winget::set_package_name
       run: |
-        if ("${{ github.event.release.prerelease || inputs.prerelease }}" -eq "true") {
+        if ("${{ github.event.release.prerelease }}" -eq "true") {
             $PACKAGE_NAME = "ZedIndustries.Zed.Preview"
         } else {
             $PACKAGE_NAME = "ZedIndustries.Zed"
@@ -82,11 +68,10 @@ jobs:
       uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
       with:
         identifier: ${{ steps.set-package-name.outputs.PACKAGE_NAME }}
-        release-tag: ${{ github.event.release.tag_name || inputs.tag_name }}
         max-versions-to-keep: 5
         token: ${{ secrets.WINGET_TOKEN }}
   create_sentry_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: steps::checkout_repo

.github/workflows/autofix_pr.yml

@@ -1,83 +0,0 @@
-# Generated from xtask::workflows::autofix_pr
-# Rebuild with `cargo xtask workflows`.
-name: autofix_pr
-run-name: 'autofix PR #${{ inputs.pr_number }}'
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: pr_number
-        required: true
-        type: string
-jobs:
-  run_autofix:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - id: get-app-token
-      name: autofix_pr::run_autofix::authenticate_as_zippy
-      uses: actions/create-github-app-token@bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1
-      with:
-        app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
-        private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
-    - name: steps::checkout_repo_with_token
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        token: ${{ steps.get-app-token.outputs.token }}
-    - name: autofix_pr::run_autofix::checkout_pr
-      run: gh pr checkout ${{ inputs.pr_number }}
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: ${{ steps.get-app-token.outputs.token }}
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
-      with:
-        version: '9'
-    - name: autofix_pr::run_autofix::run_prettier_fix
-      run: ./script/prettier --write
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::run_cargo_fmt
-      run: cargo fmt --all
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::run_clippy_fix
-      run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged
-      shell: bash -euxo pipefail {0}
-    - name: autofix_pr::run_autofix::commit_and_push
-      run: |
-        if git diff --quiet; then
-            echo "No changes to commit"
-        else
-            git add -A
-            git commit -m "Autofix"
-            git push
-        fi
-      shell: bash -euxo pipefail {0}
-      env:
-        GIT_COMMITTER_NAME: Zed Zippy
-        GIT_COMMITTER_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
-        GIT_AUTHOR_NAME: Zed Zippy
-        GIT_AUTHOR_EMAIL: 234243425+zed-zippy[bot]@users.noreply.github.com
-        GITHUB_TOKEN: ${{ steps.get-app-token.outputs.token }}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}

.github/workflows/community_champion_auto_labeler.yml

@@ -13,72 +13,13 @@ jobs:
     steps:
       - name: Check if author is a community champion and apply label
         uses: actions/github-script@v7
-        env:
-          COMMUNITY_CHAMPIONS: |
-            0x2CA
-            5brian
-            5herlocked
-            abdelq
-            afgomez
-            AidanV
-            akbxr
-            AlvaroParker
-            amtoaer
-            artemevsevev
-            bajrangCoder
-            bcomnes
-            Be-ing
-            blopker
-            bnjjj
-            bobbymannino
-            CharlesChen0823
-            chbk
-            cppcoffee
-            davewa
-            ddoemonn
-            djsauble
-            errmayank
-            fantacell
-            findrakecil
-            FloppyDisco
-            gko
-            huacnlee
-            imumesh18
-            jacobtread
-            jansol
-            jeffreyguenther
-            jenslys
-            jongretar
-            lemorage
-            lnay
-            marcocondrache
-            marius851000
-            mikebronner
-            ognevny
-            playdohface
-            RemcoSmitsDev
-            romaninsh
-            Simek
-            someone13574
-            sourcefrog
-            suxiaoshao
-            Takk8IS
-            thedadams
-            tidely
-            timvermeulen
-            valentinegb
-            versecafe
-            vitallium
-            warrenjokinen
-            WhySoBad
-            ya7010
-            Zertsov
         with:
           script: |
-            const communityChampions = process.env.COMMUNITY_CHAMPIONS
+            const communityChampionBody = `${{ secrets.COMMUNITY_CHAMPIONS }}`;
+
+            const communityChampions = communityChampionBody
               .split('\n')
-              .map(handle => handle.trim().toLowerCase())
-              .filter(handle => handle.length > 0);
+              .map(handle => handle.trim().toLowerCase());
 
             let author;
             if (context.eventName === 'issues') {

.github/workflows/community_close_stale_issues.yml

@@ -1,7 +1,7 @@
 name: "Close Stale Issues"
 on:
   schedule:
-    - cron: "0 8 31 DEC *"
+    - cron: "0 7,9,11 * * 3"
   workflow_dispatch:
 
 jobs:

.github/workflows/danger.yml

@@ -12,7 +12,7 @@ on:
     - main
 jobs:
   danger:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: steps::checkout_repo

.github/workflows/extension_bump.yml

@@ -1,148 +0,0 @@
-# Generated from xtask::workflows::extension_bump
-# Rebuild with `cargo xtask workflows`.
-name: extension_bump
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-  CARGO_INCREMENTAL: '0'
-  ZED_EXTENSION_CLI_SHA: 7cfce605704d41ca247e3f84804bf323f6c6caaf
-on:
-  workflow_call:
-    inputs:
-      bump-type:
-        description: bump-type
-        type: string
-        default: patch
-      force-bump:
-        description: force-bump
-        required: true
-        type: boolean
-    secrets:
-      app-id:
-        description: The app ID used to create the PR
-        required: true
-      app-secret:
-        description: The app secret for the corresponding app ID
-        required: true
-jobs:
-  check_bump_needed:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: 0
-    - id: compare-versions-check
-      name: extension_bump::compare_versions
-      run: |
-        CURRENT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-        PR_PARENT_SHA="${{ github.event.pull_request.head.sha }}"
-
-        if [[ -n "$PR_PARENT_SHA" ]]; then
-            git checkout "$PR_PARENT_SHA"
-        elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
-            git checkout "$BRANCH_PARENT_SHA"
-        else
-            git checkout "$(git log -1 --format=%H)"~1
-        fi
-
-        PARENT_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \
-          echo "needs_bump=true" >> "$GITHUB_OUTPUT" || \
-          echo "needs_bump=false" >> "$GITHUB_OUTPUT"
-
-        echo "current_version=${CURRENT_VERSION}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    outputs:
-      needs_bump: ${{ steps.compare-versions-check.outputs.needs_bump }}
-      current_version: ${{ steps.compare-versions-check.outputs.current_version }}
-    timeout-minutes: 1
-  bump_extension_version:
-    needs:
-    - check_bump_needed
-    if: |-
-      (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') &&
-      (inputs.force-bump == 'true' || needs.check_bump_needed.outputs.needs_bump == 'true')
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: extension_bump::install_bump_2_version
-      run: pip install bump2version
-      shell: bash -euxo pipefail {0}
-    - id: bump-version
-      name: extension_bump::bump_version
-      run: |
-        OLD_VERSION="${{ needs.check_bump_needed.outputs.current_version }}"
-
-        BUMP_FILES=("extension.toml")
-        if [[ -f "Cargo.toml" ]]; then
-            BUMP_FILES+=("Cargo.toml")
-        fi
-
-        bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"
-
-        if [[ -f "Cargo.toml" ]]; then
-            cargo update --workspace
-        fi
-
-        NEW_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        echo "new_version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    - name: extension_bump::create_pull_request
-      uses: peter-evans/create-pull-request@v7
-      with:
-        title: Bump version to ${{ steps.bump-version.outputs.new_version }}
-        body: This PR bumps the version of this extension to v${{ steps.bump-version.outputs.new_version }}
-        commit-message: Bump version to v${{ steps.bump-version.outputs.new_version }}
-        branch: zed-zippy-autobump
-        committer: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
-        base: main
-        delete-branch: true
-        token: ${{ steps.generate-token.outputs.token }}
-        sign-commits: true
-        assignees: ${{ github.actor }}
-    timeout-minutes: 1
-  create_version_label:
-    needs:
-    - check_bump_needed
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.check_bump_needed.outputs.needs_bump == 'false'
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: extension_bump::create_version_tag
-      uses: actions/github-script@v7
-      with:
-        script: |-
-          github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'refs/tags/v${{ needs.check_bump_needed.outputs.current_version }}',
-              sha: context.sha
-          })
-        github-token: ${{ steps.generate-token.outputs.token }}
-    timeout-minutes: 1
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true

.github/workflows/extension_release.yml

@@ -1,43 +0,0 @@
-# Generated from xtask::workflows::extension_release
-# Rebuild with `cargo xtask workflows`.
-name: extension_release
-on:
-  workflow_call:
-    secrets:
-      app-id:
-        description: The app ID used to create the PR
-        required: true
-      app-secret:
-        description: The app secret for the corresponding app ID
-        required: true
-jobs:
-  create_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-        owner: zed-industries
-        repositories: extensions
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: get-extension-id
-      name: extension_release::get_extension_id
-      run: |
-        EXTENSION_ID="$(sed -n 's/id = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        echo "extension_id=${EXTENSION_ID}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    - name: extension_release::release_action
-      uses: huacnlee/zed-extension-action@v2
-      with:
-        extension-name: ${{ steps.get-extension-id.outputs.extension_id }}
-        push-to: zed-industries/extensions
-      env:
-        COMMITTER_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/extension_tests.yml

@@ -1,133 +0,0 @@
-# Generated from xtask::workflows::extension_tests
-# Rebuild with `cargo xtask workflows`.
-name: extension_tests
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-  CARGO_INCREMENTAL: '0'
-  ZED_EXTENSION_CLI_SHA: 7cfce605704d41ca247e3f84804bf323f6c6caaf
-on:
-  workflow_call: {}
-jobs:
-  orchestrate:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: ${{ github.ref == 'refs/heads/main' && 2 || 350 }}
-    - id: filter
-      name: filter
-      run: |
-        if [ -z "$GITHUB_BASE_REF" ]; then
-          echo "Not in a PR context (i.e., push to main/stable/preview)"
-          COMPARE_REV="$(git rev-parse HEAD~1)"
-        else
-          echo "In a PR context comparing to pull_request.base.ref"
-          git fetch origin "$GITHUB_BASE_REF" --depth=350
-          COMPARE_REV="$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)"
-        fi
-        CHANGED_FILES="$(git diff --name-only "$COMPARE_REV" ${{ github.sha }})"
-
-        check_pattern() {
-          local output_name="$1"
-          local pattern="$2"
-          local grep_arg="$3"
-
-          echo "$CHANGED_FILES" | grep "$grep_arg" "$pattern" && \
-            echo "${output_name}=true" >> "$GITHUB_OUTPUT" || \
-            echo "${output_name}=false" >> "$GITHUB_OUTPUT"
-        }
-
-        check_pattern "check_rust" '^(Cargo.lock|Cargo.toml|.*\.rs)$' -qP
-        check_pattern "check_extension" '^.*\.scm$' -qP
-      shell: bash -euxo pipefail {0}
-    outputs:
-      check_rust: ${{ steps.filter.outputs.check_rust }}
-      check_extension: ${{ steps.filter.outputs.check_extension }}
-  check_rust:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.check_rust == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::cargo_fmt
-      run: cargo fmt --all -- --check
-      shell: bash -euxo pipefail {0}
-    - name: extension_tests::run_clippy
-      run: cargo clippy --release --all-targets --all-features -- --deny warnings
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-      env:
-        NEXTEST_NO_TESTS: warn
-    timeout-minutes: 3
-  check_extension:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.check_extension == 'true'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: cache-zed-extension-cli
-      name: extension_tests::cache_zed_extension_cli
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-      with:
-        path: zed-extension
-        key: zed-extension-${{ env.ZED_EXTENSION_CLI_SHA }}
-    - name: extension_tests::download_zed_extension_cli
-      if: steps.cache-zed-extension-cli.outputs.cache-hit != 'true'
-      run: |
-        wget --quiet "https://zed-extension-cli.nyc3.digitaloceanspaces.com/$ZED_EXTENSION_CLI_SHA/x86_64-unknown-linux-gnu/zed-extension"
-        chmod +x zed-extension
-      shell: bash -euxo pipefail {0}
-    - name: extension_tests::check
-      run: |
-        mkdir -p /tmp/ext-scratch
-        mkdir -p /tmp/ext-output
-        ./zed-extension --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 2
-  tests_pass:
-    needs:
-    - orchestrate
-    - check_rust
-    - check_extension
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && always()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: run_tests::tests_pass
-      run: |
-        set +x
-        EXIT_CODE=0
-
-        check_result() {
-          echo "* $1: $2"
-          if [[ "$2" != "skipped" && "$2" != "success" ]]; then EXIT_CODE=1; fi
-        }
-
-        check_result "orchestrate" "${{ needs.orchestrate.result }}"
-        check_result "check_rust" "${{ needs.check_rust.result }}"
-        check_result "check_extension" "${{ needs.check_extension.result }}"
-
-        exit $EXIT_CODE
-      shell: bash -euxo pipefail {0}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
     - v*
 jobs:
   run_tests_mac:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: self-mini-macos
     steps:
     - name: steps::checkout_repo
@@ -33,7 +33,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than 300
       shell: bash -euxo pipefail {0}
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: bash -euxo pipefail {0}
     - name: steps::cleanup_cargo_config
       if: always()
@@ -42,7 +42,7 @@ jobs:
       shell: bash -euxo pipefail {0}
     timeout-minutes: 60
   run_tests_linux:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-16x32-ubuntu-2204
     steps:
     - name: steps::checkout_repo
@@ -80,7 +80,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than 250
       shell: bash -euxo pipefail {0}
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: bash -euxo pipefail {0}
     - name: steps::cleanup_cargo_config
       if: always()
@@ -89,7 +89,7 @@ jobs:
       shell: bash -euxo pipefail {0}
     timeout-minutes: 60
   run_tests_windows:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: self-32vcpu-windows-2022
     steps:
     - name: steps::checkout_repo
@@ -112,7 +112,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than.ps1 250
       shell: pwsh
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: pwsh
     - name: steps::cleanup_cargo_config
       if: always()
@@ -121,7 +121,7 @@ jobs:
       shell: pwsh
     timeout-minutes: 60
   check_scripts:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: steps::checkout_repo
@@ -150,7 +150,7 @@ jobs:
       shell: bash -euxo pipefail {0}
     timeout-minutes: 60
   create_draft_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: steps::checkout_repo

.github/workflows/release_nightly.yml

@@ -12,7 +12,7 @@ on:
   - cron: 0 7 * * *
 jobs:
   check_style:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: self-mini-macos
     steps:
     - name: steps::checkout_repo
@@ -28,7 +28,7 @@ jobs:
       shell: bash -euxo pipefail {0}
     timeout-minutes: 60
   run_tests_windows:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: self-32vcpu-windows-2022
     steps:
     - name: steps::checkout_repo
@@ -51,7 +51,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than.ps1 250
       shell: pwsh
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: pwsh
     - name: steps::cleanup_cargo_config
       if: always()
@@ -361,7 +361,7 @@ jobs:
     needs:
     - check_style
     - run_tests_windows
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-32x64-ubuntu-2004
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
@@ -392,7 +392,7 @@ jobs:
     needs:
     - check_style
     - run_tests_windows
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: self-mini-macos
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
@@ -434,7 +434,7 @@ jobs:
     - bundle_mac_x86_64
     - bundle_windows_aarch64
     - bundle_windows_x86_64
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-4x8-ubuntu-2204
     steps:
     - name: steps::checkout_repo

.github/workflows/run_bundling.yml

@@ -13,7 +13,7 @@ jobs:
   bundle_linux_aarch64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
     env:
       CARGO_INCREMENTAL: 0
@@ -56,7 +56,7 @@ jobs:
   bundle_linux_x86_64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: namespace-profile-32x64-ubuntu-2004
     env:
       CARGO_INCREMENTAL: 0
@@ -99,7 +99,7 @@ jobs:
   bundle_mac_aarch64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: self-mini-macos
     env:
       CARGO_INCREMENTAL: 0
@@ -145,7 +145,7 @@ jobs:
   bundle_mac_x86_64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: self-mini-macos
     env:
       CARGO_INCREMENTAL: 0
@@ -191,7 +191,7 @@ jobs:
   bundle_windows_aarch64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: self-32vcpu-windows-2022
     env:
       CARGO_INCREMENTAL: 0
@@ -229,7 +229,7 @@ jobs:
   bundle_windows_x86_64:
     if: |-
       (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+                       (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
     runs-on: self-32vcpu-windows-2022
     env:
       CARGO_INCREMENTAL: 0

.github/workflows/run_cron_unit_evals.yml

@@ -13,14 +13,6 @@ on:
 jobs:
   cron_unit_evals:
     runs-on: namespace-profile-16x32-ubuntu-2204
-    strategy:
-      matrix:
-        model:
-        - anthropic/claude-sonnet-4-5-latest
-        - anthropic/claude-opus-4-5-latest
-        - google/gemini-3-pro
-        - openai/gpt-5
-      fail-fast: false
     steps:
     - name: steps::checkout_repo
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -57,7 +49,6 @@ jobs:
         OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
         GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_AI_API_KEY }}
         GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-        ZED_AGENT_MODEL: ${{ matrix.model }}
     - name: steps::cleanup_cargo_config
       if: always()
       run: |

.github/workflows/run_tests.yml

@@ -15,7 +15,7 @@ on:
     - v[0-9]+.[0-9]+.x
 jobs:
   orchestrate:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: steps::checkout_repo
@@ -47,7 +47,7 @@ jobs:
         }
 
         check_pattern "run_action_checks" '^\.github/(workflows/|actions/|actionlint.yml)|tooling/xtask|script/' -qP
-        check_pattern "run_docs" '^(docs/|crates/.*\.rs)' -qP
+        check_pattern "run_docs" '^docs/' -qP
         check_pattern "run_licenses" '^(Cargo.lock|script/.*licenses)' -qP
         check_pattern "run_nix" '^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)' -qP
         check_pattern "run_tests" '^(docs/|script/update_top_ranking_issues/|\.github/(ISSUE_TEMPLATE|workflows/(?!run_tests)))' -qvP
@@ -59,7 +59,7 @@ jobs:
       run_nix: ${{ steps.filter.outputs.run_nix }}
       run_tests: ${{ steps.filter.outputs.run_tests }}
   check_style:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    if: github.repository_owner == 'zed-industries'
     runs-on: namespace-profile-4x8-ubuntu-2204
     steps:
     - name: steps::checkout_repo
@@ -84,7 +84,7 @@ jobs:
       run: ./script/check-keymaps
       shell: bash -euxo pipefail {0}
     - name: run_tests::check_style::check_for_typos
-      uses: crate-ci/typos@2d0ce569feab1f8752f1dde43cc2f2aa53236e06
+      uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1
       with:
         config: ./typos.toml
     - name: steps::cargo_fmt
@@ -117,7 +117,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than.ps1 250
       shell: pwsh
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: pwsh
     - name: steps::cleanup_cargo_config
       if: always()
@@ -166,7 +166,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than 250
       shell: bash -euxo pipefail {0}
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: bash -euxo pipefail {0}
     - name: steps::cleanup_cargo_config
       if: always()
@@ -200,7 +200,7 @@ jobs:
       run: ./script/clear-target-dir-if-larger-than 300
       shell: bash -euxo pipefail {0}
     - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
+      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
       shell: bash -euxo pipefail {0}
     - name: steps::cleanup_cargo_config
       if: always()
@@ -493,12 +493,7 @@ jobs:
     needs:
     - orchestrate
     if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    env:
-      GIT_AUTHOR_NAME: Protobuf Action
-      GIT_AUTHOR_EMAIL: ci@zed.dev
-      GIT_COMMITTER_NAME: Protobuf Action
-      GIT_COMMITTER_EMAIL: ci@zed.dev
+    runs-on: self-mini-macos
     steps:
     - name: steps::checkout_repo
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -522,7 +517,6 @@ jobs:
       uses: bufbuild/buf-setup-action@v1
       with:
         version: v1.29.0
-        github_token: ${{ secrets.GITHUB_TOKEN }}
     - name: run_tests::check_postgres_and_protobuf_migrations::bufbuild_breaking_action
       uses: bufbuild/buf-breaking-action@v1
       with:
@@ -544,7 +538,7 @@ jobs:
     - check_scripts
     - build_nix_linux_x86_64
     - build_nix_mac_aarch64
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && always()
+    if: github.repository_owner == 'zed-industries' && always()
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: run_tests::tests_pass

.gitignore

@@ -8,7 +8,6 @@
 .DS_Store
 .blob_store
 .build
-.claude/settings.local.json
 .envrc
 .flatpak-builder
 .idea
@@ -40,6 +39,3 @@ xcuserdata/
 # Don't commit any secrets to the repo.
 .env
 .env.secret.toml
-
-# `nix build` output
-/result

.rules

@@ -26,12 +26,6 @@
   });
   ```
 
-# Timers in tests
-
-* In GPUI tests, prefer GPUI executor timers over `smol::Timer::after(...)` when you need timeouts, delays, or to drive `run_until_parked()`:
-  - Use `cx.background_executor().timer(duration).await` (or `cx.background_executor.timer(duration).await` in `TestAppContext`) so the work is scheduled on GPUI's dispatcher.
-  - Avoid `smol::Timer::after(...)` for test timeouts when you rely on `run_until_parked()`, because it may not be tracked by GPUI's scheduler and can lead to "nothing left to run" when pumping.
-
 # GPUI
 
 GPUI is a UI framework which also provides primitives for state and concurrency management.

Cargo.toml

@@ -9,7 +9,6 @@ members = [
     "crates/agent_servers",
     "crates/agent_settings",
     "crates/agent_ui",
-    "crates/agent_ui_v2",
     "crates/ai_onboarding",
     "crates/anthropic",
     "crates/askpass",
@@ -33,6 +32,7 @@ members = [
     "crates/cloud_api_client",
     "crates/cloud_api_types",
     "crates/cloud_llm_client",
+    "crates/cloud_zeta2_prompt",
     "crates/collab",
     "crates/collab_ui",
     "crates/collections",
@@ -54,12 +54,11 @@ members = [
     "crates/diagnostics",
     "crates/docs_preprocessor",
     "crates/edit_prediction",
-    "crates/edit_prediction_types",
-    "crates/edit_prediction_ui",
+    "crates/edit_prediction_button",
     "crates/edit_prediction_context",
+    "crates/zeta2_tools",
     "crates/editor",
     "crates/eval",
-    "crates/eval_utils",
     "crates/explorer_command_injector",
     "crates/extension",
     "crates/extension_api",
@@ -148,6 +147,7 @@ members = [
     "crates/rules_library",
     "crates/schema_generator",
     "crates/search",
+    "crates/semantic_version",
     "crates/session",
     "crates/settings",
     "crates/settings_json",
@@ -165,6 +165,7 @@ members = [
     "crates/sum_tree",
     "crates/supermaven",
     "crates/supermaven_api",
+    "crates/sweep_ai",
     "crates/codestral",
     "crates/svg_preview",
     "crates/system_specs",
@@ -201,12 +202,11 @@ members = [
     "crates/zed",
     "crates/zed_actions",
     "crates/zed_env_vars",
-    "crates/edit_prediction_cli",
-    "crates/zeta_prompt",
+    "crates/zeta",
+    "crates/zeta2",
+    "crates/zeta_cli",
     "crates/zlog",
     "crates/zlog_settings",
-    "crates/ztracing",
-    "crates/ztracing_macro",
 
     #
     # Extensions
@@ -243,9 +243,9 @@ action_log = { path = "crates/action_log" }
 agent = { path = "crates/agent" }
 activity_indicator = { path = "crates/activity_indicator" }
 agent_ui = { path = "crates/agent_ui" }
-agent_ui_v2 = { path = "crates/agent_ui_v2" }
 agent_settings = { path = "crates/agent_settings" }
 agent_servers = { path = "crates/agent_servers" }
+ai = { path = "crates/ai" }
 ai_onboarding = { path = "crates/ai_onboarding" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
@@ -255,6 +255,7 @@ assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
+auto_update_helper = { path = "crates/auto_update_helper" }
 auto_update_ui = { path = "crates/auto_update_ui" }
 aws_http_client = { path = "crates/aws_http_client" }
 bedrock = { path = "crates/bedrock" }
@@ -268,6 +269,8 @@ clock = { path = "crates/clock" }
 cloud_api_client = { path = "crates/cloud_api_client" }
 cloud_api_types = { path = "crates/cloud_api_types" }
 cloud_llm_client = { path = "crates/cloud_llm_client" }
+cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
+collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections", version = "0.1.0" }
 command_palette = { path = "crates/command_palette" }
@@ -288,7 +291,6 @@ deepseek = { path = "crates/deepseek" }
 derive_refineable = { path = "crates/refineable/derive_refineable" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
-eval_utils = { path = "crates/eval_utils" }
 extension = { path = "crates/extension" }
 extension_host = { path = "crates/extension_host" }
 extensions_ui = { path = "crates/extensions_ui" }
@@ -312,9 +314,10 @@ http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
 icons = { path = "crates/icons" }
 image_viewer = { path = "crates/image_viewer" }
-edit_prediction_types = { path = "crates/edit_prediction_types" }
-edit_prediction_ui = { path = "crates/edit_prediction_ui" }
+edit_prediction = { path = "crates/edit_prediction" }
+edit_prediction_button = { path = "crates/edit_prediction_button" }
 edit_prediction_context = { path = "crates/edit_prediction_context" }
+zeta2_tools = { path = "crates/zeta2_tools" }
 inspector_ui = { path = "crates/inspector_ui" }
 install_cli = { path = "crates/install_cli" }
 journal = { path = "crates/journal" }
@@ -356,6 +359,8 @@ panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
 perf = { path = "tooling/perf" }
 picker = { path = "crates/picker" }
+plugin = { path = "crates/plugin" }
+plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 settings_profile_selector = { path = "crates/settings_profile_selector" }
 project = { path = "crates/project" }
@@ -366,16 +371,18 @@ proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
+scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
-# rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
-rodio = { git = "https://github.com/zed-industries/rodio", features = ["wav", "playback", "wav_output", "recording"] }
+rich_text = { path = "crates/rich_text" }
+rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
+semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
 settings_json = { path = "crates/settings_json" }
@@ -387,10 +394,12 @@ snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
+storybook = { path = "crates/storybook" }
 streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
+sweep_ai = { path = "crates/sweep_ai" }
 codestral = { path = "crates/codestral" }
 system_specs = { path = "crates/system_specs" }
 tab_switcher = { path = "crates/tab_switcher" }
@@ -403,6 +412,7 @@ terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_extension = { path = "crates/theme_extension" }
+theme_importer = { path = "crates/theme_importer" }
 theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
 title_bar = { path = "crates/title_bar" }
@@ -426,18 +436,16 @@ x_ai = { path = "crates/x_ai" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
 zed_env_vars = { path = "crates/zed_env_vars" }
-edit_prediction = { path = "crates/edit_prediction" }
-zeta_prompt = { path = "crates/zeta_prompt" }
+zeta = { path = "crates/zeta" }
+zeta2 = { path = "crates/zeta2" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
-ztracing = { path = "crates/ztracing" }
-ztracing_macro = { path = "crates/ztracing_macro" }
 
 #
 # External crates
 #
 
-agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
+agent-client-protocol = { version = "0.7.0", features = ["unstable"] }
 aho-corasick = "1.1"
 alacritty_terminal = "0.25.1-rc1"
 any_vec = "0.14"
@@ -455,7 +463,7 @@ async-tar = "0.5.1"
 async-task = "4.7"
 async-trait = "0.1"
 async-tungstenite = "0.31.0"
-async_zip = { version = "0.0.18", features = ["deflate", "deflate64"] }
+async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
 aws-credential-types = { version = "1.2.2", features = [
     "hardcoded-credentials",
@@ -501,14 +509,16 @@ ec4rs = "1.1"
 emojis = "0.6.1"
 env_logger = "0.11"
 exec = "0.3.1"
-fancy-regex = "0.16.0"
+fancy-regex = "0.14.0"
 fork = "0.4.0"
 futures = "0.3"
+futures-batch = "0.6.1"
 futures-lite = "1.13"
-gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "09acfdf2bd5c1d6254abefd609c808ff73547b2c" }
+gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "3eaa84abca0778eb54272f45a312cb24f9a0b435" }
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
+hashbrown = "0.15.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
@@ -525,7 +535,7 @@ indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
 json_dotpath = "1.1"
-jsonschema = "0.37.0"
+jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = "0.10.0"
 jupyter-websocket-client = "0.15.0"
@@ -544,6 +554,7 @@ nanoid = "0.4"
 nbformat = "0.15.0"
 nix = "0.29"
 num-format = "0.4.4"
+num-traits = "0.2"
 objc = "0.2"
 objc2-foundation = { version = "=0.3.1", default-features = false, features = [
     "NSArray",
@@ -578,13 +589,14 @@ partial-json-fixer = "0.5.3"
 parse_int = "0.9"
 pciid-parser = "0.8.0"
 pathdiff = "0.2"
-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
+pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
+pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "e97b9508befa0062929da65a01054d25c4be861c" }
 portable-pty = "0.9.0"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
@@ -597,6 +609,7 @@ pulldown-cmark = { version = "0.12.0", default-features = false }
 quote = "1.0.9"
 rand = "0.9"
 rayon = "1.8"
+ref-cast = "1.0.24"
 regex = "1.5"
 # WARNING: If you change this, you must also publish a new version of zed-reqwest to crates.io
 reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662463bda39148ba154100dd44d3fba5873a4", default-features = false, features = [
@@ -619,8 +632,9 @@ rustls-platform-verifier = "0.5.0"
 # WARNING: If you change this, you must also publish a new version of zed-scap to crates.io
 scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
 schemars = { version = "1.0", features = ["indexmap2"] }
-semver = { version = "1.0", features = ["serde"] }
+semver = "1.0"
 serde = { version = "1.0.221", features = ["derive", "rc"] }
+serde_derive = "1.0.221"
 serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
 serde_json_lenient = { version = "0.2", features = [
     "preserve_order",
@@ -629,12 +643,13 @@ serde_json_lenient = { version = "0.2", features = [
 serde_path_to_error = "0.1.17"
 serde_repr = "0.1"
 serde_urlencoded = "0.7"
+serde_with = "3.4.0"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
 simplelog = "0.12.2"
 slotmap = "1.0.6"
-smallvec = { version = "1.6", features = ["union", "const_new"] }
+smallvec = { version = "1.6", features = ["union"] }
 smol = "2.0"
 sqlformat = "0.2"
 stacksafe = "0.1"
@@ -648,7 +663,7 @@ sysinfo = "0.37.0"
 take-until = "0.2.0"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
-tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "2570c4387a8505fb8f1d3f3557454b474f1e8271" }
+tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "30c32a4522751699adeda0d5840c71c3b75ae73d" }
 time = { version = "0.3", features = [
     "macros",
     "parsing",
@@ -660,12 +675,11 @@ time = { version = "0.3", features = [
 tiny_http = "0.8"
 tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
-tokio-socks = { version = "0.5.2", default-features = false, features = ["futures-io", "tokio"] }
 toml = "0.8"
 toml_edit = { version = "0.22", default-features = false, features = ["display", "parse", "serde"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.25.10", features = ["wasm"] }
-tree-sitter-bash = "0.25.1"
+tree-sitter-bash = "0.25.0"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609" }
 tree-sitter-css = "0.23"
@@ -687,7 +701,6 @@ tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
 tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-tracing = "0.1.40"
 unicase = "2.6"
 unicode-script = "0.5.7"
 unicode-segmentation = "1.10"
@@ -708,9 +721,9 @@ wasmtime = { version = "29", default-features = false, features = [
     "parallel-compilation",
 ] }
 wasmtime-wasi = "29"
-wax = "0.6"
 which = "6.0.0"
 windows-core = "0.61"
+wit-component = "0.221"
 yawc = "0.2.5"
 zeroize = "1.8"
 zstd = "0.11"
@@ -771,7 +784,7 @@ features = [
 notify = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
 notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
 windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
-calloop = { git = "https://github.com/zed-industries/calloop" }
+calloop = { path = "/home/davidsk/tmp/calloop" }
 
 [profile.dev]
 split-debuginfo = "unpacked"
@@ -792,13 +805,20 @@ settings_macros = { opt-level = 3 }
 sqlez_macros = { opt-level = 3, codegen-units = 1 }
 ui_macros = { opt-level = 3 }
 util_macros = { opt-level = 3 }
+serde_derive = { opt-level = 3 }
 quote = { opt-level = 3 }
 syn = { opt-level = 3 }
 proc-macro2 = { opt-level = 3 }
 # proc-macros end
 
 taffy = { opt-level = 3 }
+cranelift-codegen = { opt-level = 3 }
+cranelift-codegen-meta = { opt-level = 3 }
+cranelift-codegen-shared = { opt-level = 3 }
 resvg = { opt-level = 3 }
+rustybuzz = { opt-level = 3 }
+ttf-parser = { opt-level = 3 }
+wasmtime-cranelift = { opt-level = 3 }
 wasmtime = { opt-level = 3 }
 # Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
 activity_indicator = { codegen-units = 1 }
@@ -807,11 +827,12 @@ breadcrumbs = { codegen-units = 1 }
 collections = { codegen-units = 1 }
 command_palette = { codegen-units = 1 }
 command_palette_hooks = { codegen-units = 1 }
+extension_cli = { codegen-units = 1 }
 feature_flags = { codegen-units = 1 }
 file_icons = { codegen-units = 1 }
 fsevent = { codegen-units = 1 }
 image_viewer = { codegen-units = 1 }
-edit_prediction_ui = { codegen-units = 1 }
+edit_prediction_button = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
 json_schema_store = { codegen-units = 1 }
@@ -826,6 +847,8 @@ project_symbols = { codegen-units = 1 }
 refineable = { codegen-units = 1 }
 release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
+rich_text = { codegen-units = 1 }
+semantic_version = { codegen-units = 1 }
 session = { codegen-units = 1 }
 snippet = { codegen-units = 1 }
 snippets_ui = { codegen-units = 1 }
@@ -838,7 +861,7 @@ ui_input = { codegen-units = 1 }
 zed_actions = { codegen-units = 1 }
 
 [profile.release]
-debug = "limited"
+debug = "full"
 lto = "thin"
 codegen-units = 1
 
@@ -858,6 +881,8 @@ unexpected_cfgs = { level = "allow" }
 dbg_macro = "deny"
 todo = "deny"
 
+# This is not a style lint, see https://github.com/rust-lang/rust-clippy/pull/15454
+# Remove when the lint gets promoted to `suspicious`.
 declare_interior_mutable_const = "deny"
 
 redundant_clone = "deny"

Dockerfile-collab

@@ -34,4 +34,8 @@ RUN apt-get update; \
     linux-perf binutils
 WORKDIR app
 COPY --from=builder /app/collab /app/collab
+COPY --from=builder /app/crates/collab/migrations /app/migrations
+COPY --from=builder /app/crates/collab/migrations_llm /app/migrations_llm
+ENV MIGRATIONS_PATH=/app/migrations
+ENV LLM_DATABASE_MIGRATIONS_PATH=/app/migrations_llm
 ENTRYPOINT ["/app/collab"]

README.md

@@ -9,7 +9,7 @@ Welcome to Zed, a high-performance, multiplayer code editor from the creators of
 
 ### Installation
 
-On macOS, Linux, and Windows you can [download Zed directly](https://zed.dev/download) or install Zed via your local package manager ([macOS](https://zed.dev/docs/installation#macos)/[Linux](https://zed.dev/docs/linux#installing-via-a-package-manager)/[Windows](https://zed.dev/docs/windows#package-managers)).
+On macOS, Linux, and Windows you can [download Zed directly](https://zed.dev/download) or [install Zed via your local package manager](https://zed.dev/docs/linux#installing-via-a-package-manager).
 
 Other platforms are not yet available:
 

REVIEWERS.conl

@@ -43,9 +43,8 @@ design
   = @danilo-leal
 
 docs
-  = @miguelraz
   = @probably-neb
-  = @yeskunall
+  = @miguelraz
 
 extension
   = @kubkon
@@ -53,10 +52,6 @@ extension
 git
   = @cole-miller
   = @danilo-leal
-  = @dvdsk
-  = @kubkon
-  = @Anthony-Eid
-  = @cameron1024
 
 gpui
   = @Anthony-Eid
@@ -104,9 +99,6 @@ settings_ui
   = @danilo-leal
   = @probably-neb
 
-sum_tree
-  = @Veykril
-
 support
   = @miguelraz
 
@@ -118,9 +110,6 @@ terminal
   = @kubkon
   = @Veykril
 
-text
-  = @Veykril
-
 vim
   = @ConradIrwin
   = @dinocosta
@@ -130,4 +119,3 @@ vim
 windows
   = @localcc
   = @reflectronic
-  = @Veykril

assets/icons/box.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3996 5.59852C13.3994 5.3881 13.3439 5.18144 13.2386 4.99926C13.1333 4.81709 12.9819 4.66581 12.7997 4.56059L8.59996 2.16076C8.41755 2.05544 8.21063 2 8 2C7.78937 2 7.58246 2.05544 7.40004 2.16076L3.20033 4.56059C3.0181 4.66581 2.86674 4.81709 2.76144 4.99926C2.65613 5.18144 2.60059 5.3881 2.60037 5.59852V10.3982C2.60059 10.6086 2.65613 10.8153 2.76144 10.9975C2.86674 11.1796 3.0181 11.3309 3.20033 11.4361L7.40004 13.836C7.58246 13.9413 7.78937 13.9967 8 13.9967C8.21063 13.9967 8.41755 13.9413 8.59996 13.836L12.7997 11.4361C12.9819 11.3309 13.1333 11.1796 13.2386 10.9975C13.3439 10.8153 13.3994 10.6086 13.3996 10.3982V5.59852Z" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.78033 4.99857L7.99998 7.99836L13.2196 4.99857" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13.9979V7.99829" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/debug_step_back.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 11.333A6 6 0 0 0 4 6.867l-1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M2 4.667v4h4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 0 0-1.333A.667.667 0 0 0 8 12Z"/></svg>

assets/icons/debug_step_into.svg

@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 13H5" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 13H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 8.5L8 12M8 12L4.5 8.5M8 12L8 3" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 10 8 14.667 12.667 10M8 5.333v9.334"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 2.667a.667.667 0 1 0 0-1.334.667.667 0 0 0 0 1.334Z"/></svg>

assets/icons/debug_step_out.svg

@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 6.5L8 3M8 3L11.5 6.5M8 3V12" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2 13H5" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 13H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 6 8 1.333 12.667 6M8 10.667V1.333"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13.333a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334Z"/></svg>

assets/icons/debug_step_over.svg

@@ -1,5 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 11.333C2.00118 10.1752 2.33729 9.04258 2.96777 8.07159C3.59826 7.10059 4.49621 6.33274 5.55331 5.86064C6.61041 5.38853 7.78152 5.23235 8.9254 5.41091C10.0693 5.58947 11.1371 6.09516 12 6.86698L13 7.76698" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 4.66699V8.66699H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 13H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 11.333a6 6 0 0 1 10-4.466l1 .9"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M14 4.667v4h-4"/><path fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12a.667.667 0 1 1 0-1.333A.667.667 0 0 1 8 12Z"/></svg>

assets/icons/file_icons/odin.svg

@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_2)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.58747 12.9359C4.35741 12.778 4.17558 12.625 4.17558 12.625L10.092 2.37749C10.092 2.37749 10.3355 2.46782 10.5367 2.56426C10.7903 2.6858 11.0003 2.80429 11.0003 2.80429C13.8681 4.46005 14.8523 8.13267 13.1965 11.0005C11.5407 13.8684 7.8681 14.8525 5.00023 13.1967C5.00023 13.1967 4.79936 13.0812 4.58747 12.9359ZM10.5003 3.67032L5.50023 12.3307C7.89013 13.7105 10.9506 12.8904 12.3305 10.5006C13.7102 8.1106 12.8902 5.05015 10.5003 3.67032ZM3.07664 11.4314C2.87558 11.1403 2.804 11.0006 2.804 11.0006C1.77036 9.20524 1.69456 6.92215 2.80404 5.00046C3.91353 3.07877 5.92859 2.00291 8.0003 2.00036C8.0003 2.00036 8.28 1.99964 8.51289 2.02194C8.86375 2.05556 9.09702 2.10083 9.09702 2.10083L3.43905 11.9007C3.43905 11.9007 3.30482 11.7618 3.07664 11.4314ZM7.40178 3.03702C5.89399 3.22027 4.48727 4.08506 3.67008 5.50052C2.85288 6.9159 2.80733 8.56653 3.40252 9.96401L7.40178 3.03702Z" fill="black" stroke="black" stroke-width="0.1"/>
-</g>
-<defs>
-<clipPath id="clip0_1_2">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/git_branch_plus.svg

@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 2V10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 6C12.5304 6 13.0391 5.78929 13.4142 5.41421C13.7893 5.03914 14 4.53043 14 4C14 3.46957 13.7893 2.96086 13.4142 2.58579C13.0391 2.21071 12.5304 2 12 2C11.4696 2 10.9609 2.21071 10.5858 2.58579C10.2107 2.96086 10 3.46957 10 4C10 4.53043 10.2107 5.03914 10.5858 5.41421C10.9609 5.78929 11.4696 6 12 6Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 14C4.53043 14 5.03914 13.7893 5.41421 13.4142C5.78929 13.0391 6 12.5304 6 12C6 11.4696 5.78929 10.9609 5.41421 10.5858C5.03914 10.2107 4.53043 10 4 10C3.46957 10 2.96086 10.2107 2.58579 10.5858C2.21071 10.9609 2 11.4696 2 12C2 12.5304 2.21071 13.0391 2.58579 13.4142C2.96086 13.7893 3.46957 14 4 14Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4C8.4087 4 6.88258 4.63214 5.75736 5.75736C4.63214 6.88258 4 8.4087 4 10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 10V14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 12H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/inception.svg

@@ -1,11 +0,0 @@
-<svg width="28" height="28" viewBox="0 0 28 28" fill="none" id="svg1378540956_510">
-<g clip-path="url(#svg1378540956_510_clip0_1_1506)" transform="translate(4, 4) scale(0.857)">
-<path d="M17.0547 0.372066H8.52652L-0.00165176 8.90024V17.4284H8.52652V8.90024H17.0547V0.372066Z" fill="#1A1C20"></path>
-<path d="M10.1992 27.6279H18.7274L27.2556 19.0998V10.5716H18.7274V19.0998H10.1992V27.6279Z" fill="#1A1C20"></path>
-</g>
-<defs>
-<clipPath id="svg1378540956_510_clip0_1_1506">
-<rect width="27.2559" height="27.2559" fill="white" transform="translate(0 0.37207)"></rect>
-</clipPath>
-</defs>
-</svg>

assets/icons/zed_agent_two.svg

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.2224 1.32129L5.2036 4.41875C5.15145 4.57727 5.06282 4.72134 4.94481 4.83934C4.82681 4.95735 4.68274 5.04598 4.52422 5.09813L1.42676 6.11693L4.52422 7.13574C4.68274 7.18788 4.82681 7.27652 4.94481 7.39453C5.06282 7.51253 5.15145 7.6566 5.2036 7.81512L6.2224 10.9126L7.24121 7.81512C7.29335 7.6566 7.38199 7.51253 7.5 7.39453C7.618 7.27652 7.76207 7.18788 7.9206 7.13574L11.018 6.11693L7.9206 5.09813C7.76207 5.04598 7.618 4.95735 7.5 4.83934C7.38199 4.72134 7.29335 4.57727 7.24121 4.41875L6.2224 1.32129Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.76681 13.9373C9.76681 13.6048 9.95997 13.3083 10.5126 12.7917L11.8872 11.4978C12.3545 11.0575 12.5612 10.77 12.5612 10.4735C12.5612 10.1411 12.3185 9.91643 11.9681 9.91643C11.6986 9.91643 11.5054 10.0242 11.2673 10.3208C10.9933 10.6622 10.7956 10.779 10.4946 10.779C10.0633 10.779 9.75781 10.4915 9.75781 10.0916C9.75781 9.21559 10.8136 8.44287 12.067 8.44287C13.3743 8.44287 14.3492 9.22907 14.3492 10.2848C14.3492 10.9452 13.9988 11.5742 13.2845 12.2077L12.2242 13.1511V13.223H13.7292C14.2503 13.223 14.5738 13.5015 14.5738 13.9552C14.5738 14.4089 14.2593 14.6785 13.7292 14.6785H10.5979C10.1037 14.6785 9.76681 14.3775 9.76681 13.9373Z" fill="black"/>
-<path d="M12.8994 1.32129V4.00482M11.5576 2.66302H14.2412" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/keymaps/initial.json

@@ -10,12 +10,12 @@
     "context": "Workspace",
     "bindings": {
       // "shift shift": "file_finder::Toggle"
-    },
+    }
   },
   {
     "context": "Editor && vim_mode == insert",
     "bindings": {
       // "j k": "vim::NormalBefore"
-    },
-  },
+    }
+  }
 ]

assets/keymaps/linux/atom.json

@@ -4,15 +4,15 @@
     "bindings": {
       "ctrl-shift-f5": "workspace::Reload", // window:reload
       "ctrl-k ctrl-n": "workspace::ActivatePreviousPane", // window:focus-next-pane
-      "ctrl-k ctrl-p": "workspace::ActivateNextPane", // window:focus-previous-pane
-    },
+      "ctrl-k ctrl-p": "workspace::ActivateNextPane" // window:focus-previous-pane
+    }
   },
   {
     "context": "Editor",
     "bindings": {
       "ctrl-k ctrl-u": "editor::ConvertToUpperCase", // editor:upper-case
-      "ctrl-k ctrl-l": "editor::ConvertToLowerCase", // editor:lower-case
-    },
+      "ctrl-k ctrl-l": "editor::ConvertToLowerCase" // editor:lower-case
+    }
   },
   {
     "context": "Editor && mode == full",
@@ -32,8 +32,8 @@
       "ctrl-down": "editor::MoveLineDown", // editor:move-line-down
       "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
       "ctrl-shift-m": "markdown::OpenPreviewToTheSide", // markdown-preview:toggle
-      "ctrl-r": "outline::Toggle", // symbols-view:toggle-project-symbols
-    },
+      "ctrl-r": "outline::Toggle" // symbols-view:toggle-project-symbols
+    }
   },
   {
     "context": "BufferSearchBar",
@@ -41,8 +41,8 @@
       "f3": ["editor::SelectNext", { "replace_newest": true }], // find-and-replace:find-next
       "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
       "ctrl-f3": "search::SelectNextMatch", // find-and-replace:find-next-selected
-      "ctrl-shift-f3": "search::SelectPreviousMatch", // find-and-replace:find-previous-selected
-    },
+      "ctrl-shift-f3": "search::SelectPreviousMatch" // find-and-replace:find-previous-selected
+    }
   },
   {
     "context": "Workspace",
@@ -50,8 +50,8 @@
       "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
       "ctrl-k ctrl-b": "workspace::ToggleLeftDock", // tree-view:toggle
       "ctrl-t": "file_finder::Toggle", // fuzzy-finder:toggle-file-finder
-      "ctrl-r": "project_symbols::Toggle", // symbols-view:toggle-project-symbols
-    },
+      "ctrl-r": "project_symbols::Toggle" // symbols-view:toggle-project-symbols
+    }
   },
   {
     "context": "Pane",
@@ -65,8 +65,8 @@
       "ctrl-6": ["pane::ActivateItem", 5], // tree-view:open-selected-entry-in-pane-6
       "ctrl-7": ["pane::ActivateItem", 6], // tree-view:open-selected-entry-in-pane-7
       "ctrl-8": ["pane::ActivateItem", 7], // tree-view:open-selected-entry-in-pane-8
-      "ctrl-9": ["pane::ActivateItem", 8], // tree-view:open-selected-entry-in-pane-9
-    },
+      "ctrl-9": ["pane::ActivateItem", 8] // tree-view:open-selected-entry-in-pane-9
+    }
   },
   {
     "context": "ProjectPanel",
@@ -75,8 +75,8 @@
       "backspace": ["project_panel::Trash", { "skip_prompt": false }],
       "ctrl-x": "project_panel::Cut", // tree-view:cut
       "ctrl-c": "project_panel::Copy", // tree-view:copy
-      "ctrl-v": "project_panel::Paste", // tree-view:paste
-    },
+      "ctrl-v": "project_panel::Paste" // tree-view:paste
+    }
   },
   {
     "context": "ProjectPanel && not_editing",
@@ -90,7 +90,7 @@
       "d": "project_panel::Duplicate", // tree-view:duplicate
       "home": "menu::SelectFirst", // core:move-to-top
       "end": "menu::SelectLast", // core:move-to-bottom
-      "shift-a": "project_panel::NewDirectory", // tree-view:add-folder
-    },
-  },
+      "shift-a": "project_panel::NewDirectory" // tree-view:add-folder
+    }
+  }
 ]

assets/keymaps/linux/cursor.json

@@ -8,8 +8,8 @@
       "ctrl-shift-i": "agent::ToggleFocus",
       "ctrl-l": "agent::ToggleFocus",
       "ctrl-shift-l": "agent::ToggleFocus",
-      "ctrl-shift-j": "agent::OpenSettings",
-    },
+      "ctrl-shift-j": "agent::OpenSettings"
+    }
   },
   {
     "context": "Editor && mode == full",
@@ -20,18 +20,18 @@
       "ctrl-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
       "ctrl-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
       "ctrl-k": "assistant::InlineAssist",
-      "ctrl-shift-k": "assistant::InsertIntoEditor",
-    },
+      "ctrl-shift-k": "assistant::InsertIntoEditor"
+    }
   },
   {
     "context": "InlineAssistEditor",
     "use_key_equivalents": true,
     "bindings": {
-      "ctrl-shift-backspace": "editor::Cancel",
+      "ctrl-shift-backspace": "editor::Cancel"
       // "alt-enter": // Quick Question
       // "ctrl-shift-enter": // Full File Context
       // "ctrl-shift-k": // Toggle input focus (editor <> inline assist)
-    },
+    }
   },
   {
     "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
@@ -47,7 +47,7 @@
       "ctrl-shift-backspace": "editor::Cancel",
       "ctrl-r": "agent::NewThread",
       "ctrl-shift-v": "editor::Paste",
-      "ctrl-shift-k": "assistant::InsertIntoEditor",
+      "ctrl-shift-k": "assistant::InsertIntoEditor"
       // "escape": "agent::ToggleFocus"
       ///// Enable when Zed supports multiple thread tabs
       // "ctrl-t": // new thread tab
@@ -56,29 +56,28 @@
       ///// Enable if Zed adds support for keyboard navigation of thread elements
       // "tab": // cycle to next message
       // "shift-tab": // cycle to previous message
-    },
+    }
   },
   {
     "context": "Editor && editor_agent_diff",
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-enter": "agent::KeepAll",
-      "ctrl-backspace": "agent::RejectAll",
-    },
+      "ctrl-backspace": "agent::RejectAll"
+    }
   },
   {
     "context": "Editor && mode == full && edit_prediction",
     "use_key_equivalents": true,
     "bindings": {
-      "ctrl-right": "editor::AcceptNextWordEditPrediction",
-      "ctrl-down": "editor::AcceptNextLineEditPrediction",
-    },
+      "ctrl-right": "editor::AcceptPartialEditPrediction"
+    }
   },
   {
     "context": "Terminal",
     "use_key_equivalents": true,
     "bindings": {
-      "ctrl-k": "assistant::InlineAssist",
-    },
-  },
+      "ctrl-k": "assistant::InlineAssist"
+    }
+  }
 ]

assets/keymaps/linux/emacs.json

@@ -5,8 +5,8 @@
 [
   {
     "bindings": {
-      "ctrl-g": "menu::Cancel",
-    },
+      "ctrl-g": "menu::Cancel"
+    }
   },
   {
     // Workaround to avoid falling back to default bindings.
@@ -18,8 +18,8 @@
       "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
       "ctrl-x": null, // currently activates `editor::Cut` if no following key is pressed for 1 second
       "ctrl-p": null, // currently activates `file_finder::Toggle` when the cursor is on the first character of the buffer
-      "ctrl-n": null, // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
-    },
+      "ctrl-n": null // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
+    }
   },
   {
     "context": "Editor",
@@ -82,8 +82,8 @@
       "ctrl-s": "buffer_search::Deploy", // isearch-forward
       "ctrl-r": "buffer_search::Deploy", // isearch-backward
       "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap", // fill-paragraph
-    },
+      "alt-q": "editor::Rewrap" // fill-paragraph
+    }
   },
   {
     "context": "Editor && selection_mode", // region selection
@@ -119,22 +119,22 @@
       "alt->": "editor::SelectToEnd",
       "ctrl-home": "editor::SelectToBeginning",
       "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel",
-    },
+      "ctrl-g": "editor::Cancel"
+    }
   },
   {
     "context": "Editor && (showing_code_actions || showing_completions)",
     "bindings": {
       "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-    },
+      "ctrl-n": "editor::ContextMenuNext"
+    }
   },
   {
     "context": "Editor && showing_signature_help && !showing_completions",
     "bindings": {
       "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
   },
   // Example setting for using emacs-style tab
   // (i.e. indent the current line / selection or perform symbol completion depending on context)
@@ -164,8 +164,8 @@
       "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
       "ctrl-x ctrl-s": "workspace::Save", // save-buffer
       "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll", // save-some-buffers
-    },
+      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
+    }
   },
   {
     // Workaround to enable using native emacs from the Zed terminal.
@@ -185,22 +185,22 @@
       "ctrl-x ctrl-f": null, // find-file
       "ctrl-x ctrl-s": null, // save-buffer
       "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null, // save-some-buffers
-    },
+      "ctrl-x s": null // save-some-buffers
+    }
   },
   {
     "context": "BufferSearchBar > Editor",
     "bindings": {
       "ctrl-s": "search::SelectNextMatch",
       "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss",
-    },
+      "ctrl-g": "buffer_search::Dismiss"
+    }
   },
   {
     "context": "Pane",
     "bindings": {
       "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-    },
-  },
+      "ctrl-alt-right": "pane::GoForward"
+    }
+  }
 ]

assets/keymaps/linux/jetbrains.json

@@ -1,20 +1,18 @@
 [
   {
     "bindings": {
-      "ctrl-alt-s": "zed::OpenSettings",
+      "ctrl-alt-s": "zed::OpenSettingsFile",
       "ctrl-{": "pane::ActivatePreviousItem",
       "ctrl-}": "pane::ActivateNextItem",
       "shift-escape": null, // Unmap workspace::zoom
-      "ctrl-~": "git::Branch",
       "ctrl-f2": "debugger::Stop",
       "f6": "debugger::Pause",
       "f7": "debugger::StepInto",
       "f8": "debugger::StepOver",
       "shift-f8": "debugger::StepOut",
       "f9": "debugger::Continue",
-      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start",
-    },
+      "alt-shift-f9": "debugger::Start"
+    }
   },
   {
     "context": "Editor",
@@ -48,7 +46,7 @@
       "alt-f7": "editor::FindAllReferences",
       "ctrl-alt-f7": "editor::FindAllReferences",
       "ctrl-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
-      "ctrl-alt-b": "editor::GoToImplementation", // Conflicts with workspace::ToggleRightDock
+      "ctrl-alt-b": "editor::GoToDefinitionSplit", // Conflicts with workspace::ToggleRightDock
       "ctrl-shift-b": "editor::GoToTypeDefinition",
       "ctrl-alt-shift-b": "editor::GoToTypeDefinitionSplit",
       "f2": "editor::GoToDiagnostic",
@@ -62,30 +60,24 @@
       "ctrl-shift-end": "editor::SelectToEnd",
       "ctrl-f8": "editor::ToggleBreakpoint",
       "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "ctrl-shift-u": "editor::ToggleCase",
-    },
+      "ctrl-shift-u": "editor::ToggleCase"
+    }
   },
   {
     "context": "Editor && mode == full",
     "bindings": {
       "ctrl-f12": "outline::Toggle",
       "ctrl-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "ctrl-e": "file_finder::Toggle",
       "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-alt-n": "file_finder::Toggle",
       "ctrl-g": "go_to_line::Toggle",
-      "alt-enter": "editor::ToggleCodeActions",
-      "ctrl-space": "editor::ShowCompletions",
-      "ctrl-q": "editor::Hover",
-      "ctrl-p": "editor::ShowSignatureHelp",
-      "ctrl-\\": "assistant::InlineAssist",
-    },
+      "alt-enter": "editor::ToggleCodeActions"
+    }
   },
   {
     "context": "BufferSearchBar",
     "bindings": {
-      "shift-enter": "search::SelectPreviousMatch",
-    },
+      "shift-enter": "search::SelectPreviousMatch"
+    }
   },
   {
     "context": "BufferSearchBar || ProjectSearchBar",
@@ -93,8 +85,8 @@
       "alt-c": "search::ToggleCaseSensitive",
       "alt-e": "search::ToggleSelection",
       "alt-x": "search::ToggleRegex",
-      "alt-w": "search::ToggleWholeWord",
-    },
+      "alt-w": "search::ToggleWholeWord"
+    }
   },
   {
     "context": "Workspace",
@@ -102,13 +94,9 @@
       "ctrl-shift-f12": "workspace::ToggleAllDocks",
       "ctrl-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
       "alt-shift-f10": "task::Spawn",
-      "shift-f10": "task::Spawn",
-      "ctrl-f5": "task::Rerun",
       "ctrl-e": "file_finder::Toggle",
-      "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+      // "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
       "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-alt-n": "file_finder::Toggle",
-      "ctrl-n": "project_symbols::Toggle",
       "ctrl-shift-a": "command_palette::Toggle",
       "shift shift": "command_palette::Toggle",
       "ctrl-alt-shift-n": "project_symbols::Toggle",
@@ -116,8 +104,8 @@
       "alt-1": "project_panel::ToggleFocus",
       "alt-5": "debug_panel::ToggleFocus",
       "alt-6": "diagnostics::Deploy",
-      "alt-7": "outline_panel::ToggleFocus",
-    },
+      "alt-7": "outline_panel::ToggleFocus"
+    }
   },
   {
     "context": "Pane", // this is to override the default Pane mappings to switch tabs
@@ -131,24 +119,22 @@
       "alt-7": "outline_panel::ToggleFocus",
       "alt-8": null, // Services (bottom dock)
       "alt-9": null, // Git History (bottom dock)
-      "alt-0": "git_panel::ToggleFocus",
-    },
+      "alt-0": "git_panel::ToggleFocus"
+    }
   },
   {
     "context": "Workspace || Editor",
     "bindings": {
       "alt-f12": "terminal_panel::Toggle",
-      "ctrl-shift-k": "git::Push",
-    },
+      "ctrl-shift-k": "git::Push"
+    }
   },
   {
     "context": "Pane",
     "bindings": {
       "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem",
-    },
+      "ctrl-alt-right": "pane::GoForward"
+    }
   },
   {
     "context": "ProjectPanel",
@@ -158,19 +144,21 @@
       "backspace": ["project_panel::Trash", { "skip_prompt": false }],
       "delete": ["project_panel::Trash", { "skip_prompt": false }],
       "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename",
-    },
+      "shift-f6": "project_panel::Rename"
+    }
   },
   {
     "context": "Terminal",
     "bindings": {
       "ctrl-shift-t": "workspace::NewTerminal",
       "alt-f12": "workspace::CloseActiveDock",
+      "alt-left": "pane::ActivatePreviousItem",
+      "alt-right": "pane::ActivateNextItem",
       "ctrl-up": "terminal::ScrollLineUp",
       "ctrl-down": "terminal::ScrollLineDown",
       "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-    },
+      "shift-pagedown": "terminal::ScrollPageDown"
+    }
   },
   { "context": "GitPanel", "bindings": { "alt-0": "workspace::CloseActiveDock" } },
   { "context": "ProjectPanel", "bindings": { "alt-1": "workspace::CloseActiveDock" } },
@@ -181,7 +169,7 @@
     "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
     "bindings": {
       "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock",
-    },
-  },
+      "shift-escape": "workspace::CloseActiveDock"
+    }
+  }
 ]

assets/keymaps/linux/sublime_text.json

@@ -22,8 +22,8 @@
       "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
       "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
       "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }],
-    },
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
+    }
   },
   {
     "context": "Editor",
@@ -55,20 +55,20 @@
       "alt-right": "editor::MoveToNextSubwordEnd",
       "alt-left": "editor::MoveToPreviousSubwordStart",
       "alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart",
-    },
+      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
+    }
   },
   {
     "context": "Editor && mode == full",
     "bindings": {
-      "ctrl-r": "outline::Toggle",
-    },
+      "ctrl-r": "outline::Toggle"
+    }
   },
   {
     "context": "Editor && !agent_diff",
     "bindings": {
-      "ctrl-k ctrl-z": "git::Restore",
-    },
+      "ctrl-k ctrl-z": "git::Restore"
+    }
   },
   {
     "context": "Pane",
@@ -83,15 +83,15 @@
       "alt-6": ["pane::ActivateItem", 5],
       "alt-7": ["pane::ActivateItem", 6],
       "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": "pane::ActivateLastItem",
-    },
+      "alt-9": "pane::ActivateLastItem"
+    }
   },
   {
     "context": "Workspace",
     "bindings": {
       "ctrl-k ctrl-b": "workspace::ToggleLeftDock",
       // "ctrl-0": "project_panel::ToggleFocus", // normally resets zoom
-      "shift-ctrl-r": "project_symbols::Toggle",
-    },
-  },
+      "shift-ctrl-r": "project_symbols::Toggle"
+    }
+  }
 ]

assets/keymaps/macos/atom.json

@@ -4,16 +4,16 @@
     "bindings": {
       "ctrl-alt-cmd-l": "workspace::Reload",
       "cmd-k cmd-p": "workspace::ActivatePreviousPane",
-      "cmd-k cmd-n": "workspace::ActivateNextPane",
-    },
+      "cmd-k cmd-n": "workspace::ActivateNextPane"
+    }
   },
   {
     "context": "Editor",
     "bindings": {
       "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
       "cmd-k cmd-u": "editor::ConvertToUpperCase",
-      "cmd-k cmd-l": "editor::ConvertToLowerCase",
-    },
+      "cmd-k cmd-l": "editor::ConvertToLowerCase"
+    }
   },
   {
     "context": "Editor && mode == full",
@@ -33,8 +33,8 @@
       "ctrl-cmd-down": "editor::MoveLineDown",
       "cmd-\\": "workspace::ToggleLeftDock",
       "ctrl-shift-m": "markdown::OpenPreviewToTheSide",
-      "cmd-r": "outline::Toggle",
-    },
+      "cmd-r": "outline::Toggle"
+    }
   },
   {
     "context": "BufferSearchBar",
@@ -42,8 +42,8 @@
       "cmd-g": ["editor::SelectNext", { "replace_newest": true }],
       "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
       "cmd-f3": "search::SelectNextMatch",
-      "cmd-shift-f3": "search::SelectPreviousMatch",
-    },
+      "cmd-shift-f3": "search::SelectPreviousMatch"
+    }
   },
   {
     "context": "Workspace",
@@ -51,8 +51,8 @@
       "cmd-\\": "workspace::ToggleLeftDock",
       "cmd-k cmd-b": "workspace::ToggleLeftDock",
       "cmd-t": "file_finder::Toggle",
-      "cmd-shift-r": "project_symbols::Toggle",
-    },
+      "cmd-shift-r": "project_symbols::Toggle"
+    }
   },
   {
     "context": "Pane",
@@ -67,8 +67,8 @@
       "cmd-6": ["pane::ActivateItem", 5],
       "cmd-7": ["pane::ActivateItem", 6],
       "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem",
-    },
+      "cmd-9": "pane::ActivateLastItem"
+    }
   },
   {
     "context": "ProjectPanel",
@@ -77,8 +77,8 @@
       "backspace": ["project_panel::Trash", { "skip_prompt": false }],
       "cmd-x": "project_panel::Cut",
       "cmd-c": "project_panel::Copy",
-      "cmd-v": "project_panel::Paste",
-    },
+      "cmd-v": "project_panel::Paste"
+    }
   },
   {
     "context": "ProjectPanel && not_editing",
@@ -92,7 +92,7 @@
       "d": "project_panel::Duplicate",
       "home": "menu::SelectFirst",
       "end": "menu::SelectLast",
-      "shift-a": "project_panel::NewDirectory",
-    },
-  },
+      "shift-a": "project_panel::NewDirectory"
+    }
+  }
 ]

assets/keymaps/macos/cursor.json

@@ -8,8 +8,8 @@
       "cmd-shift-i": "agent::ToggleFocus",
       "cmd-l": "agent::ToggleFocus",
       "cmd-shift-l": "agent::ToggleFocus",
-      "cmd-shift-j": "agent::OpenSettings",
-    },
+      "cmd-shift-j": "agent::OpenSettings"
+    }
   },
   {
     "context": "Editor && mode == full",
@@ -20,19 +20,19 @@
       "cmd-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
       "cmd-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
       "cmd-k": "assistant::InlineAssist",
-      "cmd-shift-k": "assistant::InsertIntoEditor",
-    },
+      "cmd-shift-k": "assistant::InsertIntoEditor"
+    }
   },
   {
     "context": "InlineAssistEditor",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-backspace": "editor::Cancel",
-      "cmd-enter": "menu::Confirm",
+      "cmd-enter": "menu::Confirm"
       // "alt-enter": // Quick Question
       // "cmd-shift-enter": // Full File Context
       // "cmd-shift-k": // Toggle input focus (editor <> inline assist)
-    },
+    }
   },
   {
     "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
@@ -48,7 +48,7 @@
       "cmd-shift-backspace": "editor::Cancel",
       "cmd-r": "agent::NewThread",
       "cmd-shift-v": "editor::Paste",
-      "cmd-shift-k": "assistant::InsertIntoEditor",
+      "cmd-shift-k": "assistant::InsertIntoEditor"
       // "escape": "agent::ToggleFocus"
       ///// Enable when Zed supports multiple thread tabs
       // "cmd-t": // new thread tab
@@ -57,29 +57,28 @@
       ///// Enable if Zed adds support for keyboard navigation of thread elements
       // "tab": // cycle to next message
       // "shift-tab": // cycle to previous message
-    },
+    }
   },
   {
     "context": "Editor && editor_agent_diff",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-enter": "agent::KeepAll",
-      "cmd-backspace": "agent::RejectAll",
-    },
+      "cmd-backspace": "agent::RejectAll"
+    }
   },
   {
     "context": "Editor && mode == full && edit_prediction",
     "use_key_equivalents": true,
     "bindings": {
-      "cmd-right": "editor::AcceptNextWordEditPrediction",
-      "cmd-down": "editor::AcceptNextLineEditPrediction",
-    },
+      "cmd-right": "editor::AcceptPartialEditPrediction"
+    }
   },
   {
     "context": "Terminal",
     "use_key_equivalents": true,
     "bindings": {
-      "cmd-k": "assistant::InlineAssist",
-    },
-  },
+      "cmd-k": "assistant::InlineAssist"
+    }
+  }
 ]

assets/keymaps/macos/emacs.json

@@ -6,8 +6,8 @@
   {
     "context": "!GitPanel",
     "bindings": {
-      "ctrl-g": "menu::Cancel",
-    },
+      "ctrl-g": "menu::Cancel"
+    }
   },
   {
     // Workaround to avoid falling back to default bindings.
@@ -15,8 +15,8 @@
     // NOTE: must be declared before the `Editor` override.
     "context": "Editor",
     "bindings": {
-      "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
-    },
+      "ctrl-g": null // currently activates `go_to_line::Toggle` when there is nothing to cancel
+    }
   },
   {
     "context": "Editor",
@@ -79,8 +79,8 @@
       "ctrl-s": "buffer_search::Deploy", // isearch-forward
       "ctrl-r": "buffer_search::Deploy", // isearch-backward
       "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap", // fill-paragraph
-    },
+      "alt-q": "editor::Rewrap" // fill-paragraph
+    }
   },
   {
     "context": "Editor && selection_mode", // region selection
@@ -116,22 +116,22 @@
       "alt->": "editor::SelectToEnd",
       "ctrl-home": "editor::SelectToBeginning",
       "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel",
-    },
+      "ctrl-g": "editor::Cancel"
+    }
   },
   {
     "context": "Editor && (showing_code_actions || showing_completions)",
     "bindings": {
       "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-    },
+      "ctrl-n": "editor::ContextMenuNext"
+    }
   },
   {
     "context": "Editor && showing_signature_help && !showing_completions",
     "bindings": {
       "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
   },
   // Example setting for using emacs-style tab
   // (i.e. indent the current line / selection or perform symbol completion depending on context)
@@ -161,8 +161,8 @@
       "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
       "ctrl-x ctrl-s": "workspace::Save", // save-buffer
       "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll", // save-some-buffers
-    },
+      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
+    }
   },
   {
     // Workaround to enable using native emacs from the Zed terminal.
@@ -182,22 +182,22 @@
       "ctrl-x ctrl-f": null, // find-file
       "ctrl-x ctrl-s": null, // save-buffer
       "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null, // save-some-buffers
-    },
+      "ctrl-x s": null // save-some-buffers
+    }
   },
   {
     "context": "BufferSearchBar > Editor",
     "bindings": {
       "ctrl-s": "search::SelectNextMatch",
       "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss",
-    },
+      "ctrl-g": "buffer_search::Dismiss"
+    }
   },
   {
     "context": "Pane",
     "bindings": {
       "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-    },
-  },
+      "ctrl-alt-right": "pane::GoForward"
+    }
+  }
 ]

assets/keymaps/macos/jetbrains.json

@@ -5,16 +5,14 @@
       "cmd-}": "pane::ActivateNextItem",
       "cmd-0": "git_panel::ToggleFocus", // overrides `cmd-0` zoom reset
       "shift-escape": null, // Unmap workspace::zoom
-      "cmd-~": "git::Branch",
       "ctrl-f2": "debugger::Stop",
       "f6": "debugger::Pause",
       "f7": "debugger::StepInto",
       "f8": "debugger::StepOver",
       "shift-f8": "debugger::StepOut",
       "f9": "debugger::Continue",
-      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start",
-    },
+      "alt-shift-f9": "debugger::Start"
+    }
   },
   {
     "context": "Editor",
@@ -47,7 +45,7 @@
       "alt-f7": "editor::FindAllReferences",
       "cmd-alt-f7": "editor::FindAllReferences",
       "cmd-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
-      "cmd-alt-b": "editor::GoToImplementation",
+      "cmd-alt-b": "editor::GoToDefinitionSplit",
       "cmd-shift-b": "editor::GoToTypeDefinition",
       "cmd-alt-shift-b": "editor::GoToTypeDefinitionSplit",
       "f2": "editor::GoToDiagnostic",
@@ -60,30 +58,24 @@
       "cmd-shift-end": "editor::SelectToEnd",
       "ctrl-f8": "editor::ToggleBreakpoint",
       "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "cmd-shift-u": "editor::ToggleCase",
-    },
+      "cmd-shift-u": "editor::ToggleCase"
+    }
   },
   {
     "context": "Editor && mode == full",
     "bindings": {
       "cmd-f12": "outline::Toggle",
       "cmd-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "cmd-l": "go_to_line::Toggle",
-      "cmd-e": "file_finder::Toggle",
       "cmd-shift-o": "file_finder::Toggle",
-      "cmd-shift-n": "file_finder::Toggle",
-      "alt-enter": "editor::ToggleCodeActions",
-      "ctrl-space": "editor::ShowCompletions",
-      "cmd-j": "editor::Hover",
-      "cmd-p": "editor::ShowSignatureHelp",
-      "cmd-\\": "assistant::InlineAssist",
-    },
+      "cmd-l": "go_to_line::Toggle",
+      "alt-enter": "editor::ToggleCodeActions"
+    }
   },
   {
     "context": "BufferSearchBar",
     "bindings": {
-      "shift-enter": "search::SelectPreviousMatch",
-    },
+      "shift-enter": "search::SelectPreviousMatch"
+    }
   },
   {
     "context": "BufferSearchBar || ProjectSearchBar",
@@ -95,8 +87,8 @@
       "ctrl-alt-c": "search::ToggleCaseSensitive",
       "ctrl-alt-e": "search::ToggleSelection",
       "ctrl-alt-w": "search::ToggleWholeWord",
-      "ctrl-alt-x": "search::ToggleRegex",
-    },
+      "ctrl-alt-x": "search::ToggleRegex"
+    }
   },
   {
     "context": "Workspace",
@@ -104,13 +96,9 @@
       "cmd-shift-f12": "workspace::ToggleAllDocks",
       "cmd-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
       "ctrl-alt-r": "task::Spawn",
-      "shift-f10": "task::Spawn",
-      "cmd-f5": "task::Rerun",
       "cmd-e": "file_finder::Toggle",
-      "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
+      // "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
       "cmd-shift-o": "file_finder::Toggle",
-      "cmd-shift-n": "file_finder::Toggle",
-      "cmd-n": "project_symbols::Toggle",
       "cmd-shift-a": "command_palette::Toggle",
       "shift shift": "command_palette::Toggle",
       "cmd-alt-o": "project_symbols::Toggle", // JetBrains: Go to Symbol
@@ -118,8 +106,8 @@
       "cmd-1": "project_panel::ToggleFocus",
       "cmd-5": "debug_panel::ToggleFocus",
       "cmd-6": "diagnostics::Deploy",
-      "cmd-7": "outline_panel::ToggleFocus",
-    },
+      "cmd-7": "outline_panel::ToggleFocus"
+    }
   },
   {
     "context": "Pane", // this is to override the default Pane mappings to switch tabs
@@ -133,24 +121,22 @@
       "cmd-7": "outline_panel::ToggleFocus",
       "cmd-8": null, // Services (bottom dock)
       "cmd-9": null, // Git History (bottom dock)
-      "cmd-0": "git_panel::ToggleFocus",
-    },
+      "cmd-0": "git_panel::ToggleFocus"
+    }
   },
   {
     "context": "Workspace || Editor",
     "bindings": {
       "alt-f12": "terminal_panel::Toggle",
-      "cmd-shift-k": "git::Push",
-    },
+      "cmd-shift-k": "git::Push"
+    }
   },
   {
     "context": "Pane",
     "bindings": {
       "cmd-alt-left": "pane::GoBack",
-      "cmd-alt-right": "pane::GoForward",
-      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem",
-    },
+      "cmd-alt-right": "pane::GoForward"
+    }
   },
   {
     "context": "ProjectPanel",
@@ -161,8 +147,8 @@
       "backspace": ["project_panel::Trash", { "skip_prompt": false }],
       "delete": ["project_panel::Trash", { "skip_prompt": false }],
       "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename",
-    },
+      "shift-f6": "project_panel::Rename"
+    }
   },
   {
     "context": "Terminal",
@@ -172,8 +158,8 @@
       "cmd-up": "terminal::ScrollLineUp",
       "cmd-down": "terminal::ScrollLineDown",
       "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-    },
+      "shift-pagedown": "terminal::ScrollPageDown"
+    }
   },
   { "context": "GitPanel", "bindings": { "cmd-0": "workspace::CloseActiveDock" } },
   { "context": "ProjectPanel", "bindings": { "cmd-1": "workspace::CloseActiveDock" } },
@@ -184,7 +170,7 @@
     "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
     "bindings": {
       "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock",
-    },
-  },
+      "shift-escape": "workspace::CloseActiveDock"
+    }
+  }
 ]

assets/keymaps/macos/sublime_text.json

@@ -22,8 +22,8 @@
       "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
       "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
       "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }],
-    },
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
+    }
   },
   {
     "context": "Editor",
@@ -57,20 +57,20 @@
       "ctrl-right": "editor::MoveToNextSubwordEnd",
       "ctrl-left": "editor::MoveToPreviousSubwordStart",
       "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart",
-    },
+      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
+    }
   },
   {
     "context": "Editor && mode == full",
     "bindings": {
-      "cmd-r": "outline::Toggle",
-    },
+      "cmd-r": "outline::Toggle"
+    }
   },
   {
     "context": "Editor && !agent_diff",
     "bindings": {
-      "cmd-k cmd-z": "git::Restore",
-    },
+      "cmd-k cmd-z": "git::Restore"
+    }
   },
   {
     "context": "Pane",
@@ -85,8 +85,8 @@
       "cmd-6": ["pane::ActivateItem", 5],
       "cmd-7": ["pane::ActivateItem", 6],
       "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem",
-    },
+      "cmd-9": "pane::ActivateLastItem"
+    }
   },
   {
     "context": "Workspace",
@@ -95,7 +95,7 @@
       "cmd-t": "file_finder::Toggle",
       "shift-cmd-r": "project_symbols::Toggle",
       // Currently busted: https://github.com/zed-industries/feedback/issues/898
-      "ctrl-0": "project_panel::ToggleFocus",
-    },
-  },
+      "ctrl-0": "project_panel::ToggleFocus"
+    }
+  }
 ]

assets/keymaps/macos/textmate.json

@@ -2,8 +2,8 @@
   {
     "bindings": {
       "cmd-shift-o": "projects::OpenRecent",
-      "cmd-alt-tab": "project_panel::ToggleFocus",
-    },
+      "cmd-alt-tab": "project_panel::ToggleFocus"
+    }
   },
   {
     "context": "Editor && mode == full",
@@ -15,8 +15,8 @@
       "cmd-enter": "editor::NewlineBelow",
       "cmd-alt-enter": "editor::NewlineAbove",
       "cmd-shift-l": "editor::SelectLine",
-      "cmd-shift-t": "outline::Toggle",
-    },
+      "cmd-shift-t": "outline::Toggle"
+    }
   },
   {
     "context": "Editor",
@@ -41,30 +41,30 @@
       "ctrl-u": "editor::ConvertToUpperCase",
       "ctrl-shift-u": "editor::ConvertToLowerCase",
       "ctrl-alt-u": "editor::ConvertToUpperCamelCase",
-      "ctrl-_": "editor::ConvertToSnakeCase",
-    },
+      "ctrl-_": "editor::ConvertToSnakeCase"
+    }
   },
   {
     "context": "BufferSearchBar",
     "bindings": {
       "ctrl-s": "search::SelectNextMatch",
-      "ctrl-shift-s": "search::SelectPreviousMatch",
-    },
+      "ctrl-shift-s": "search::SelectPreviousMatch"
+    }
   },
   {
     "context": "Workspace",
     "bindings": {
       "cmd-alt-ctrl-d": "workspace::ToggleLeftDock",
       "cmd-t": "file_finder::Toggle",
-      "cmd-shift-t": "project_symbols::Toggle",
-    },
+      "cmd-shift-t": "project_symbols::Toggle"
+    }
   },
   {
     "context": "Pane",
     "bindings": {
       "alt-cmd-r": "search::ToggleRegex",
-      "ctrl-tab": "project_panel::ToggleFocus",
-    },
+      "ctrl-tab": "project_panel::ToggleFocus"
+    }
   },
   {
     "context": "ProjectPanel",
@@ -75,11 +75,11 @@
       "return": "project_panel::Rename",
       "cmd-c": "project_panel::Copy",
       "cmd-v": "project_panel::Paste",
-      "cmd-alt-c": "project_panel::CopyPath",
-    },
+      "cmd-alt-c": "project_panel::CopyPath"
+    }
   },
   {
     "context": "Dock",
-    "bindings": {},
-  },
+    "bindings": {}
+  }
 ]

assets/keymaps/storybook.json

@@ -27,7 +27,7 @@
       "backspace": "editor::Backspace",
       "delete": "editor::Delete",
       "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
-    },
-  },
+      "right": "editor::MoveRight"
+    }
+  }
 ]

assets/keymaps/vim.json

@@ -180,9 +180,10 @@
       "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
       "ctrl-w space": "editor::OpenExcerptsSplit",
       "ctrl-w g space": "editor::OpenExcerptsSplit",
+      "ctrl-6": "pane::AlternateFile",
       "ctrl-^": "pane::AlternateFile",
-      ".": "vim::Repeat",
-    },
+      ".": "vim::Repeat"
+    }
   },
   {
     "context": "vim_mode == normal || vim_mode == visual || vim_mode == operator",
@@ -223,8 +224,8 @@
       "] r": "vim::GoToNextReference",
       // tree-sitter related commands
       "[ x": "vim::SelectLargerSyntaxNode",
-      "] x": "vim::SelectSmallerSyntaxNode",
-    },
+      "] x": "vim::SelectSmallerSyntaxNode"
+    }
   },
   {
     "context": "vim_mode == normal",
@@ -261,16 +262,16 @@
       "[ d": "editor::GoToPreviousDiagnostic",
       "] c": "editor::GoToHunk",
       "[ c": "editor::GoToPreviousHunk",
-      "g c": "vim::PushToggleComments",
-    },
+      "g c": "vim::PushToggleComments"
+    }
   },
   {
     "context": "VimControl && VimCount",
     "bindings": {
       "0": ["vim::Number", 0],
       ":": "vim::CountCommand",
-      "%": "vim::GoToPercentage",
-    },
+      "%": "vim::GoToPercentage"
+    }
   },
   {
     "context": "vim_mode == visual",
@@ -322,8 +323,8 @@
       "g w": "vim::Rewrap",
       "g ?": "vim::ConvertToRot13",
       // "g ?": "vim::ConvertToRot47",
-      "\"": "vim::PushRegister",
-    },
+      "\"": "vim::PushRegister"
+    }
   },
   {
     "context": "vim_mode == helix_select",
@@ -343,8 +344,8 @@
       "ctrl-pageup": "pane::ActivatePreviousItem",
       "ctrl-pagedown": "pane::ActivateNextItem",
       ".": "vim::Repeat",
-      "alt-.": "vim::RepeatFind",
-    },
+      "alt-.": "vim::RepeatFind"
+    }
   },
   {
     "context": "vim_mode == insert",
@@ -374,8 +375,8 @@
       "ctrl-r": "vim::PushRegister",
       "insert": "vim::ToggleReplace",
       "ctrl-o": "vim::TemporaryNormal",
-      "ctrl-s": "editor::ShowSignatureHelp",
-    },
+      "ctrl-s": "editor::ShowSignatureHelp"
+    }
   },
   {
     "context": "showing_completions",
@@ -383,8 +384,8 @@
       "ctrl-d": "vim::ScrollDown",
       "ctrl-u": "vim::ScrollUp",
       "ctrl-e": "vim::LineDown",
-      "ctrl-y": "vim::LineUp",
-    },
+      "ctrl-y": "vim::LineUp"
+    }
   },
   {
     "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
@@ -409,31 +410,16 @@
       "shift-s": "vim::SubstituteLine",
       "\"": "vim::PushRegister",
       "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-    },
+      "ctrl-pageup": "pane::ActivatePreviousItem"
+    }
   },
   {
-    "context": "VimControl && vim_mode == helix_normal && !menu",
+    "context": "vim_mode == helix_normal && !menu",
     "bindings": {
-      "j": ["vim::Down", { "display_lines": true }],
-      "down": ["vim::Down", { "display_lines": true }],
-      "k": ["vim::Up", { "display_lines": true }],
-      "up": ["vim::Up", { "display_lines": true }],
-      "g j": "vim::Down",
-      "g down": "vim::Down",
-      "g k": "vim::Up",
-      "g up": "vim::Up",
-      "escape": "vim::SwitchToHelixNormalMode",
       "i": "vim::HelixInsert",
       "a": "vim::HelixAppend",
-      "ctrl-[": "editor::Cancel",
-    },
-  },
-  {
-    "context": "vim_mode == helix_select && !menu",
-    "bindings": {
-      "escape": "vim::SwitchToHelixNormalMode",
-    },
+      "ctrl-[": "editor::Cancel"
+    }
   },
   {
     "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu",
@@ -453,9 +439,9 @@
       "shift-r": "editor::Paste",
       "`": "vim::ConvertToLowerCase",
       "alt-`": "vim::ConvertToUpperCase",
-      "insert": "vim::InsertBefore", // not a helix default
+      "insert": "vim::InsertBefore",
       "shift-u": "editor::Redo",
-      "ctrl-r": "vim::Redo", // not a helix default
+      "ctrl-r": "vim::Redo",
       "y": "vim::HelixYank",
       "p": "vim::HelixPaste",
       "shift-p": ["vim::HelixPaste", { "before": true }],
@@ -484,35 +470,31 @@
       "alt-p": "editor::SelectPreviousSyntaxNode",
       "alt-n": "editor::SelectNextSyntaxNode",
 
-      // Search
-      "n": "vim::HelixSelectNext",
-      "shift-n": "vim::HelixSelectPrevious",
-
       // Goto mode
       "g e": "vim::EndOfDocument",
       "g h": "vim::StartOfLine",
       "g l": "vim::EndOfLine",
-      "g s": "vim::FirstNonWhitespace",
+      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
       "g t": "vim::WindowTop",
       "g c": "vim::WindowMiddle",
       "g b": "vim::WindowBottom",
-      "g r": "editor::FindAllReferences",
+      "g r": "editor::FindAllReferences", // zed specific
       "g n": "pane::ActivateNextItem",
-      "shift-l": "pane::ActivateNextItem", // not a helix default
+      "shift-l": "pane::ActivateNextItem",
       "g p": "pane::ActivatePreviousItem",
-      "shift-h": "pane::ActivatePreviousItem", // not a helix default
-      "g .": "vim::HelixGotoLastModification",
+      "shift-h": "pane::ActivatePreviousItem",
+      "g .": "vim::HelixGotoLastModification", // go to last modification
 
       // Window mode
-      "space w v": "pane::SplitDown",
-      "space w s": "pane::SplitRight",
       "space w h": "workspace::ActivatePaneLeft",
-      "space w j": "workspace::ActivatePaneDown",
-      "space w k": "workspace::ActivatePaneUp",
       "space w l": "workspace::ActivatePaneRight",
+      "space w k": "workspace::ActivatePaneUp",
+      "space w j": "workspace::ActivatePaneDown",
       "space w q": "pane::CloseActiveItem",
-      "space w r": "pane::SplitRight", // not a helix default
-      "space w d": "pane::SplitDown", // not a helix default
+      "space w s": "pane::SplitRight",
+      "space w r": "pane::SplitRight",
+      "space w v": "pane::SplitDown",
+      "space w d": "pane::SplitDown",
 
       // Space mode
       "space f": "file_finder::Toggle",
@@ -526,7 +508,6 @@
       "space c": "editor::ToggleComments",
       "space p": "editor::Paste",
       "space y": "editor::Copy",
-      "space /": "pane::DeploySearch",
 
       // Other
       ":": "command_palette::Toggle",
@@ -534,22 +515,24 @@
       "]": ["vim::PushHelixNext", { "around": true }],
       "[": ["vim::PushHelixPrevious", { "around": true }],
       "g q": "vim::PushRewrap",
-      "g w": "vim::PushRewrap", // not a helix default & clashes with helix `goto_word`
-    },
+      "g w": "vim::PushRewrap"
+      // "tab": "pane::ActivateNextItem",
+      // "shift-tab": "pane::ActivatePrevItem",
+    }
   },
   {
     "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
     "bindings": {
       "ctrl-p": "editor::ShowWordCompletions",
-      "ctrl-n": "editor::ShowWordCompletions",
-    },
+      "ctrl-n": "editor::ShowWordCompletions"
+    }
   },
   {
     "context": "(vim_mode == insert || vim_mode == normal) && showing_signature_help && !showing_completions",
     "bindings": {
       "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext",
-    },
+      "ctrl-n": "editor::SignatureHelpNext"
+    }
   },
   {
     "context": "vim_mode == replace",
@@ -565,8 +548,8 @@
       "backspace": "vim::UndoReplace",
       "tab": "vim::Tab",
       "enter": "vim::Enter",
-      "insert": "vim::InsertBefore",
-    },
+      "insert": "vim::InsertBefore"
+    }
   },
   {
     "context": "vim_mode == waiting",
@@ -578,14 +561,14 @@
       "escape": "vim::ClearOperators",
       "ctrl-k": ["vim::PushDigraph", {}],
       "ctrl-v": ["vim::PushLiteral", {}],
-      "ctrl-q": ["vim::PushLiteral", {}],
-    },
+      "ctrl-q": ["vim::PushLiteral", {}]
+    }
   },
   {
     "context": "Editor && vim_mode == waiting && (vim_operator == ys || vim_operator == cs)",
     "bindings": {
-      "escape": "vim::SwitchToNormalMode",
-    },
+      "escape": "vim::SwitchToNormalMode"
+    }
   },
   {
     "context": "vim_mode == operator",
@@ -593,8 +576,8 @@
       "ctrl-c": "vim::ClearOperators",
       "ctrl-[": "vim::ClearOperators",
       "escape": "vim::ClearOperators",
-      "g c": "vim::Comment",
-    },
+      "g c": "vim::Comment"
+    }
   },
   {
     "context": "vim_operator == a || vim_operator == i || vim_operator == cs || vim_operator == helix_next || vim_operator == helix_previous",
@@ -631,14 +614,14 @@
       "shift-i": ["vim::IndentObj", { "include_below": true }],
       "f": "vim::Method",
       "c": "vim::Class",
-      "e": "vim::EntireFile",
-    },
+      "e": "vim::EntireFile"
+    }
   },
   {
     "context": "vim_operator == helix_m",
     "bindings": {
-      "m": "vim::Matching",
-    },
+      "m": "vim::Matching"
+    }
   },
   {
     "context": "vim_operator == helix_next",
@@ -655,8 +638,8 @@
       "x": "editor::SelectSmallerSyntaxNode",
       "d": "editor::GoToDiagnostic",
       "c": "editor::GoToHunk",
-      "space": "vim::InsertEmptyLineBelow",
-    },
+      "space": "vim::InsertEmptyLineBelow"
+    }
   },
   {
     "context": "vim_operator == helix_previous",
@@ -673,8 +656,8 @@
       "x": "editor::SelectLargerSyntaxNode",
       "d": "editor::GoToPreviousDiagnostic",
       "c": "editor::GoToPreviousHunk",
-      "space": "vim::InsertEmptyLineAbove",
-    },
+      "space": "vim::InsertEmptyLineAbove"
+    }
   },
   {
     "context": "vim_operator == c",
@@ -682,8 +665,8 @@
       "c": "vim::CurrentLine",
       "x": "vim::Exchange",
       "d": "editor::Rename", // zed specific
-      "s": ["vim::PushChangeSurrounds", {}],
-    },
+      "s": ["vim::PushChangeSurrounds", {}]
+    }
   },
   {
     "context": "vim_operator == d",
@@ -695,36 +678,36 @@
       "shift-o": "git::ToggleStaged",
       "p": "git::Restore", // "d p"
       "u": "git::StageAndNext", // "d u"
-      "shift-u": "git::UnstageAndNext", // "d shift-u"
-    },
+      "shift-u": "git::UnstageAndNext" // "d shift-u"
+    }
   },
   {
     "context": "vim_operator == gu",
     "bindings": {
       "g u": "vim::CurrentLine",
-      "u": "vim::CurrentLine",
-    },
+      "u": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == gU",
     "bindings": {
       "g shift-u": "vim::CurrentLine",
-      "shift-u": "vim::CurrentLine",
-    },
+      "shift-u": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == g~",
     "bindings": {
       "g ~": "vim::CurrentLine",
-      "~": "vim::CurrentLine",
-    },
+      "~": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == g?",
     "bindings": {
       "g ?": "vim::CurrentLine",
-      "?": "vim::CurrentLine",
-    },
+      "?": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == gq",
@@ -732,66 +715,66 @@
       "g q": "vim::CurrentLine",
       "q": "vim::CurrentLine",
       "g w": "vim::CurrentLine",
-      "w": "vim::CurrentLine",
-    },
+      "w": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == y",
     "bindings": {
       "y": "vim::CurrentLine",
       "v": "vim::PushForcedMotion",
-      "s": ["vim::PushAddSurrounds", {}],
-    },
+      "s": ["vim::PushAddSurrounds", {}]
+    }
   },
   {
     "context": "vim_operator == ys",
     "bindings": {
-      "s": "vim::CurrentLine",
-    },
+      "s": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == >",
     "bindings": {
-      ">": "vim::CurrentLine",
-    },
+      ">": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == <",
     "bindings": {
-      "<": "vim::CurrentLine",
-    },
+      "<": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == eq",
     "bindings": {
-      "=": "vim::CurrentLine",
-    },
+      "=": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == sh",
     "bindings": {
-      "!": "vim::CurrentLine",
-    },
+      "!": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == gc",
     "bindings": {
-      "c": "vim::CurrentLine",
-    },
+      "c": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == gR",
     "bindings": {
       "r": "vim::CurrentLine",
-      "shift-r": "vim::CurrentLine",
-    },
+      "shift-r": "vim::CurrentLine"
+    }
   },
   {
     "context": "vim_operator == cx",
     "bindings": {
       "x": "vim::CurrentLine",
-      "c": "vim::ClearExchange",
-    },
+      "c": "vim::ClearExchange"
+    }
   },
   {
     "context": "vim_mode == literal",
@@ -833,15 +816,15 @@
       "tab": ["vim::Literal", ["tab", "\u0009"]],
       // zed extensions:
       "backspace": ["vim::Literal", ["backspace", "\u0008"]],
-      "delete": ["vim::Literal", ["delete", "\u007F"]],
-    },
+      "delete": ["vim::Literal", ["delete", "\u007F"]]
+    }
   },
   {
     "context": "BufferSearchBar && !in_replace",
     "bindings": {
       "enter": "vim::SearchSubmit",
-      "escape": "buffer_search::Dismiss",
-    },
+      "escape": "buffer_search::Dismiss"
+    }
   },
   {
     "context": "VimControl && !menu || !Editor && !Terminal",
@@ -864,8 +847,6 @@
       "ctrl-w shift-right": "workspace::SwapPaneRight",
       "ctrl-w shift-up": "workspace::SwapPaneUp",
       "ctrl-w shift-down": "workspace::SwapPaneDown",
-      "ctrl-w x": "workspace::SwapPaneAdjacent",
-      "ctrl-w ctrl-x": "workspace::SwapPaneAdjacent",
       "ctrl-w shift-h": "workspace::MovePaneLeft",
       "ctrl-w shift-l": "workspace::MovePaneRight",
       "ctrl-w shift-k": "workspace::MovePaneUp",
@@ -902,19 +883,15 @@
       "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal",
       "ctrl-w n": "workspace::NewFileSplitHorizontal",
       "g t": "vim::GoToTab",
-      "g shift-t": "vim::GoToPreviousTab",
-    },
+      "g shift-t": "vim::GoToPreviousTab"
+    }
   },
   {
     "context": "!Editor && !Terminal",
     "bindings": {
       ":": "command_palette::Toggle",
-      "g /": "pane::DeploySearch",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0],
-    },
+      "g /": "pane::DeploySearch"
+    }
   },
   {
     // netrw compatibility
@@ -964,45 +941,17 @@
       "6": ["vim::Number", 6],
       "7": ["vim::Number", 7],
       "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9],
-    },
+      "9": ["vim::Number", 9]
+    }
   },
   {
     "context": "OutlinePanel && not_editing",
     "bindings": {
-      "h": "outline_panel::CollapseSelectedEntry",
-      "j": "vim::MenuSelectNext",
-      "k": "vim::MenuSelectPrevious",
-      "down": "vim::MenuSelectNext",
-      "up": "vim::MenuSelectPrevious",
-      "l": "outline_panel::ExpandSelectedEntry",
+      "j": "menu::SelectNext",
+      "k": "menu::SelectPrevious",
       "shift-g": "menu::SelectLast",
-      "g g": "menu::SelectFirst",
-      "-": "outline_panel::SelectParent",
-      "enter": "editor::ToggleFocus",
-      "/": "menu::Cancel",
-      "ctrl-u": "outline_panel::ScrollUp",
-      "ctrl-d": "outline_panel::ScrollDown",
-      "z t": "outline_panel::ScrollCursorTop",
-      "z z": "outline_panel::ScrollCursorCenter",
-      "z b": "outline_panel::ScrollCursorBottom",
-      "0": ["vim::Number", 0],
-      "1": ["vim::Number", 1],
-      "2": ["vim::Number", 2],
-      "3": ["vim::Number", 3],
-      "4": ["vim::Number", 4],
-      "5": ["vim::Number", 5],
-      "6": ["vim::Number", 6],
-      "7": ["vim::Number", 7],
-      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9],
-    },
-  },
-  {
-    "context": "OutlinePanel && editing",
-    "bindings": {
-      "enter": "menu::Cancel",
-    },
+      "g g": "menu::SelectFirst"
+    }
   },
   {
     "context": "GitPanel && ChangesList",
@@ -1017,8 +966,8 @@
       "x": "git::ToggleStaged",
       "shift-x": "git::StageAll",
       "g x": "git::StageRange",
-      "shift-u": "git::UnstageAll",
-    },
+      "shift-u": "git::UnstageAll"
+    }
   },
   {
     "context": "Editor && mode == auto_height && VimControl",
@@ -1029,8 +978,8 @@
       "#": null,
       "*": null,
       "n": null,
-      "shift-n": null,
-    },
+      "shift-n": null
+    }
   },
   {
     "context": "Picker > Editor",
@@ -1039,29 +988,29 @@
       "ctrl-u": "editor::DeleteToBeginningOfLine",
       "ctrl-w": "editor::DeleteToPreviousWordStart",
       "ctrl-p": "menu::SelectPrevious",
-      "ctrl-n": "menu::SelectNext",
-    },
+      "ctrl-n": "menu::SelectNext"
+    }
   },
   {
     "context": "GitCommit > Editor && VimControl && vim_mode == normal",
     "bindings": {
       "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-    },
+      "escape": "menu::Cancel"
+    }
   },
   {
     "context": "Editor && edit_prediction",
     "bindings": {
       // This is identical to the binding in the base keymap, but the vim bindings above to
       // "vim::Tab" shadow it, so it needs to be bound again.
-      "tab": "editor::AcceptEditPrediction",
-    },
+      "tab": "editor::AcceptEditPrediction"
+    }
   },
   {
     "context": "MessageEditor > Editor && VimControl",
     "bindings": {
-      "enter": "agent::Chat",
-    },
+      "enter": "agent::Chat"
+    }
   },
   {
     "context": "os != macos && Editor && edit_prediction_conflict",
@@ -1069,8 +1018,8 @@
       // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This
       // is because alt-tab may not be available, as it is often used for window switching on Linux
       // and Windows.
-      "alt-l": "editor::AcceptEditPrediction",
-    },
+      "alt-l": "editor::AcceptEditPrediction"
+    }
   },
   {
     "context": "SettingsWindow > NavigationMenu && !search",
@@ -1080,16 +1029,7 @@
       "k": "settings_editor::FocusPreviousNavEntry",
       "j": "settings_editor::FocusNextNavEntry",
       "g g": "settings_editor::FocusFirstNavEntry",
-      "shift-g": "settings_editor::FocusLastNavEntry",
-    },
-  },
-  {
-    "context": "MarkdownPreview",
-    "bindings": {
-      "ctrl-u": "markdown::ScrollPageUp",
-      "ctrl-d": "markdown::ScrollPageDown",
-      "ctrl-y": "markdown::ScrollUp",
-      "ctrl-e": "markdown::ScrollDown",
-    },
-  },
+      "shift-g": "settings_editor::FocusLastNavEntry"
+    }
+  }
 ]

assets/prompts/content_prompt_v2.hbs

@@ -1,43 +0,0 @@
-{{#if language_name}}
-Here's a file of {{language_name}} that the user is going to ask you to make an edit to.
-{{else}}
-Here's a file of text that the user is going to ask you to make an edit to.
-{{/if}}
-
-The section you'll need to rewrite is marked with <rewrite_this></rewrite_this> tags.
-
-<document>
-{{{document_content}}}
-</document>
-
-{{#if is_truncated}}
-The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
-{{/if}}
-
-{{#if rewrite_section}}
-And here's the section to rewrite based on that prompt again for reference:
-
-<rewrite_this>
-{{{rewrite_section}}}
-</rewrite_this>
-
-{{#if diagnostic_errors}}
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
-{{#each diagnostic_errors}}
-<diagnostic_error>
-    <line_number>{{line_number}}</line_number>
-    <error_message>{{error_message}}</error_message>
-    <code_content>{{code_content}}</code_content>
-</diagnostic_error>
-{{/each}}
-{{/if}}
-
-{{/if}}
-
-Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved.
-
-Start at the indentation level in the original file in the rewritten {{content_type}}.
-
-IMPORTANT: You MUST use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled. You MUST NOT send back unstructured text. If you need to make a statement or ask a question you MUST use one of the tools to do so.
-It is an error if you try to make a change that cannot be made simply by editing the rewrite_section.

assets/settings/initial_debug_tasks.json

@@ -8,7 +8,7 @@
     "adapter": "Debugpy",
     "program": "$ZED_FILE",
     "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
+    "cwd": "$ZED_WORKTREE_ROOT"
   },
   {
     "label": "Debug active JavaScript file",
@@ -16,7 +16,7 @@
     "program": "$ZED_FILE",
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT",
-    "type": "pwa-node",
+    "type": "pwa-node"
   },
   {
     "label": "JavaScript debug terminal",
@@ -24,6 +24,6 @@
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT",
     "console": "integratedTerminal",
-    "type": "pwa-node",
-  },
+    "type": "pwa-node"
+  }
 ]

assets/settings/initial_server_settings.json

@@ -3,5 +3,5 @@
 // For a full list of overridable settings, and general information on settings,
 // see the documentation: https://zed.dev/docs/configuring-zed#settings-files
 {
-  "lsp": {},
+  "lsp": {}
 }

assets/settings/initial_tasks.json

@@ -47,8 +47,8 @@
     // Whether to show the task line in the output of the spawned task, defaults to `true`.
     "show_summary": true,
     // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_command": true,
+    "show_command": true
     // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
     // "tags": []
-  },
+  }
 ]

assets/settings/initial_user_settings.json

@@ -12,6 +12,6 @@
   "theme": {
     "mode": "system",
     "light": "One Light",
-    "dark": "One Dark",
-  },
+    "dark": "One Dark"
+  }
 }

assets/themes/ayu/ayu.json

@@ -45,7 +45,6 @@
         "tab.inactive_background": "#1f2127ff",
         "tab.active_background": "#0d1016ff",
         "search.match_background": "#5ac2fe66",
-        "search.active_match_background": "#ea570166",
         "panel.background": "#1f2127ff",
         "panel.focused_border": "#5ac1feff",
         "pane.focused_border": null,
@@ -437,7 +436,6 @@
         "tab.inactive_background": "#ececedff",
         "tab.active_background": "#fcfcfcff",
         "search.match_background": "#3b9ee566",
-        "search.active_match_background": "#f88b3666",
         "panel.background": "#ececedff",
         "panel.focused_border": "#3b9ee5ff",
         "pane.focused_border": null,
@@ -829,7 +827,6 @@
         "tab.inactive_background": "#353944ff",
         "tab.active_background": "#242835ff",
         "search.match_background": "#73cffe66",
-        "search.active_match_background": "#fd722b66",
         "panel.background": "#353944ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

assets/themes/gruvbox/gruvbox.json

@@ -46,7 +46,6 @@
         "tab.inactive_background": "#3a3735ff",
         "tab.active_background": "#282828ff",
         "search.match_background": "#83a59866",
-        "search.active_match_background": "#c09f3f66",
         "panel.background": "#3a3735ff",
         "panel.focused_border": "#83a598ff",
         "pane.focused_border": null,
@@ -71,33 +70,33 @@
         "editor.document_highlight.read_background": "#83a5981a",
         "editor.document_highlight.write_background": "#92847466",
         "terminal.background": "#282828ff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
         "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
+        "terminal.dim_foreground": "#282828ff",
         "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.ansi.bright_black": "#73675eff",
         "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
         "version_control.modified": "#f9bd2fff",
@@ -453,7 +452,6 @@
         "tab.inactive_background": "#393634ff",
         "tab.active_background": "#1d2021ff",
         "search.match_background": "#83a59866",
-        "search.active_match_background": "#c9653666",
         "panel.background": "#393634ff",
         "panel.focused_border": "#83a598ff",
         "pane.focused_border": null,
@@ -478,33 +476,33 @@
         "editor.document_highlight.read_background": "#83a5981a",
         "editor.document_highlight.write_background": "#92847466",
         "terminal.background": "#1d2021ff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
         "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.dim_foreground": "#1d2021ff",
+        "terminal.ansi.black": "#1d2021ff",
+        "terminal.ansi.bright_black": "#73675eff",
         "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
         "version_control.modified": "#f9bd2fff",
@@ -860,7 +858,6 @@
         "tab.inactive_background": "#3b3735ff",
         "tab.active_background": "#32302fff",
         "search.match_background": "#83a59866",
-        "search.active_match_background": "#aea85166",
         "panel.background": "#3b3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -885,33 +882,33 @@
         "editor.document_highlight.read_background": "#83a5981a",
         "editor.document_highlight.write_background": "#92847466",
         "terminal.background": "#32302fff",
-        "terminal.foreground": "#ebdbb2ff",
+        "terminal.foreground": "#fbf1c7ff",
         "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#766b5dff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#928374ff",
+        "terminal.dim_foreground": "#32302fff",
+        "terminal.ansi.black": "#32302fff",
+        "terminal.ansi.bright_black": "#73675eff",
         "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#fb4934ff",
-        "terminal.ansi.dim_red": "#8e1814ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#b8bb26ff",
-        "terminal.ansi.dim_green": "#6a6912ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#fabd2fff",
-        "terminal.ansi.dim_yellow": "#966a17ff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#83a598ff",
-        "terminal.ansi.dim_blue": "#305d5fff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#d3869bff",
-        "terminal.ansi.dim_magenta": "#7c455eff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#8ec07cff",
-        "terminal.ansi.dim_cyan": "#496e4aff",
-        "terminal.ansi.white": "#a89984ff",
-        "terminal.ansi.bright_white": "#fbf1c7ff",
-        "terminal.ansi.dim_white": "#766b5dff",
+        "terminal.ansi.red": "#fb4a35ff",
+        "terminal.ansi.bright_red": "#93201dff",
+        "terminal.ansi.dim_red": "#ffaa95ff",
+        "terminal.ansi.green": "#b7bb26ff",
+        "terminal.ansi.bright_green": "#605c1bff",
+        "terminal.ansi.dim_green": "#e0dc98ff",
+        "terminal.ansi.yellow": "#f9bd2fff",
+        "terminal.ansi.bright_yellow": "#91611bff",
+        "terminal.ansi.dim_yellow": "#fedc9bff",
+        "terminal.ansi.blue": "#83a598ff",
+        "terminal.ansi.bright_blue": "#414f4aff",
+        "terminal.ansi.dim_blue": "#c0d2cbff",
+        "terminal.ansi.magenta": "#d3869bff",
+        "terminal.ansi.bright_magenta": "#8e5868ff",
+        "terminal.ansi.dim_magenta": "#ff9ebbff",
+        "terminal.ansi.cyan": "#8ec07cff",
+        "terminal.ansi.bright_cyan": "#45603eff",
+        "terminal.ansi.dim_cyan": "#c7dfbdff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
         "version_control.added": "#b7bb26ff",
         "version_control.modified": "#f9bd2fff",
@@ -1267,7 +1264,6 @@
         "tab.inactive_background": "#ecddb4ff",
         "tab.active_background": "#fbf1c7ff",
         "search.match_background": "#0b667866",
-        "search.active_match_background": "#ba2d1166",
         "panel.background": "#ecddb4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1295,30 +1291,30 @@
         "terminal.foreground": "#282828ff",
         "terminal.bright_foreground": "#282828ff",
         "terminal.dim_foreground": "#fbf1c7ff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#0b6678ff",
+        "terminal.ansi.dim_black": "#5f5650ff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#fbf1c7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
         "version_control.modified": "#b57615ff",
@@ -1674,7 +1670,6 @@
         "tab.inactive_background": "#ecddb5ff",
         "tab.active_background": "#f9f5d7ff",
         "search.match_background": "#0b667866",
-        "search.active_match_background": "#dc351466",
         "panel.background": "#ecddb5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1702,30 +1697,30 @@
         "terminal.foreground": "#282828ff",
         "terminal.bright_foreground": "#282828ff",
         "terminal.dim_foreground": "#f9f5d7ff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#73675eff",
+        "terminal.ansi.dim_black": "#f9f5d7ff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#f9f5d7ff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
         "version_control.modified": "#b57615ff",
@@ -2081,7 +2076,6 @@
         "tab.inactive_background": "#ecdcb3ff",
         "tab.active_background": "#f2e5bcff",
         "search.match_background": "#0b667866",
-        "search.active_match_background": "#d7331466",
         "panel.background": "#ecdcb3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -2109,30 +2103,30 @@
         "terminal.foreground": "#282828ff",
         "terminal.bright_foreground": "#282828ff",
         "terminal.dim_foreground": "#f2e5bcff",
-        "terminal.ansi.black": "#fbf1c7ff",
-        "terminal.ansi.bright_black": "#928374ff",
-        "terminal.ansi.dim_black": "#7c6f64ff",
-        "terminal.ansi.red": "#cc241dff",
-        "terminal.ansi.bright_red": "#9d0006ff",
-        "terminal.ansi.dim_red": "#c31c16ff",
-        "terminal.ansi.green": "#98971aff",
-        "terminal.ansi.bright_green": "#79740eff",
-        "terminal.ansi.dim_green": "#929015ff",
-        "terminal.ansi.yellow": "#d79921ff",
-        "terminal.ansi.bright_yellow": "#b57614ff",
-        "terminal.ansi.dim_yellow": "#cf8e1aff",
-        "terminal.ansi.blue": "#458588ff",
-        "terminal.ansi.bright_blue": "#076678ff",
-        "terminal.ansi.dim_blue": "#356f77ff",
-        "terminal.ansi.magenta": "#b16286ff",
-        "terminal.ansi.bright_magenta": "#8f3f71ff",
-        "terminal.ansi.dim_magenta": "#a85580ff",
-        "terminal.ansi.cyan": "#689d6aff",
-        "terminal.ansi.bright_cyan": "#427b58ff",
-        "terminal.ansi.dim_cyan": "#5f9166ff",
-        "terminal.ansi.white": "#7c6f64ff",
-        "terminal.ansi.bright_white": "#282828ff",
-        "terminal.ansi.dim_white": "#282828ff",
+        "terminal.ansi.black": "#282828ff",
+        "terminal.ansi.bright_black": "#73675eff",
+        "terminal.ansi.dim_black": "#f2e5bcff",
+        "terminal.ansi.red": "#9d0308ff",
+        "terminal.ansi.bright_red": "#db8b7aff",
+        "terminal.ansi.dim_red": "#4e1207ff",
+        "terminal.ansi.green": "#797410ff",
+        "terminal.ansi.bright_green": "#bfb787ff",
+        "terminal.ansi.dim_green": "#3e3a11ff",
+        "terminal.ansi.yellow": "#b57615ff",
+        "terminal.ansi.bright_yellow": "#e2b88bff",
+        "terminal.ansi.dim_yellow": "#5c3a12ff",
+        "terminal.ansi.blue": "#0b6678ff",
+        "terminal.ansi.bright_blue": "#8fb0baff",
+        "terminal.ansi.dim_blue": "#14333bff",
+        "terminal.ansi.magenta": "#8f3e71ff",
+        "terminal.ansi.bright_magenta": "#c76da0ff",
+        "terminal.ansi.dim_magenta": "#5c2848ff",
+        "terminal.ansi.cyan": "#437b59ff",
+        "terminal.ansi.bright_cyan": "#9fbca8ff",
+        "terminal.ansi.dim_cyan": "#253e2eff",
+        "terminal.ansi.white": "#f2e5bcff",
+        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#0b6678ff",
         "version_control.added": "#797410ff",
         "version_control.modified": "#b57615ff",

assets/themes/one/one.json

@@ -45,7 +45,6 @@
         "tab.inactive_background": "#2f343eff",
         "tab.active_background": "#282c33ff",
         "search.match_background": "#74ade866",
-        "search.active_match_background": "#e8af7466",
         "panel.background": "#2f343eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -68,39 +67,37 @@
         "editor.active_wrap_guide": "#c8ccd41a",
         "editor.document_highlight.read_background": "#74ade81a",
         "editor.document_highlight.write_background": "#555a6366",
-        "terminal.background": "#282c34ff",
-        "terminal.foreground": "#abb2bfff",
+        "terminal.background": "#282c33ff",
+        "terminal.foreground": "#dce0e5ff",
         "terminal.bright_foreground": "#dce0e5ff",
-        "terminal.dim_foreground": "#636d83ff",
-        "terminal.ansi.black": "#282c34ff",
-        "terminal.ansi.bright_black": "#636d83ff",
-        "terminal.ansi.dim_black": "#3b3f4aff",
-        "terminal.ansi.red": "#e06c75ff",
-        "terminal.ansi.bright_red": "#EA858Bff",
-        "terminal.ansi.dim_red": "#a7545aff",
-        "terminal.ansi.green": "#98c379ff",
-        "terminal.ansi.bright_green": "#AAD581ff",
-        "terminal.ansi.dim_green": "#6d8f59ff",
-        "terminal.ansi.yellow": "#e5c07bff",
-        "terminal.ansi.bright_yellow": "#FFD885ff",
-        "terminal.ansi.dim_yellow": "#b8985bff",
-        "terminal.ansi.blue": "#61afefff",
-        "terminal.ansi.bright_blue": "#85C1FFff",
-        "terminal.ansi.dim_blue": "#457cadff",
-        "terminal.ansi.magenta": "#c678ddff",
-        "terminal.ansi.bright_magenta": "#D398EBff",
-        "terminal.ansi.dim_magenta": "#8d54a0ff",
-        "terminal.ansi.cyan": "#56b6c2ff",
-        "terminal.ansi.bright_cyan": "#6ED5DEff",
-        "terminal.ansi.dim_cyan": "#3c818aff",
-        "terminal.ansi.white": "#abb2bfff",
+        "terminal.dim_foreground": "#282c33ff",
+        "terminal.ansi.black": "#282c33ff",
+        "terminal.ansi.bright_black": "#525561ff",
+        "terminal.ansi.dim_black": "#dce0e5ff",
+        "terminal.ansi.red": "#d07277ff",
+        "terminal.ansi.bright_red": "#673a3cff",
+        "terminal.ansi.dim_red": "#eab7b9ff",
+        "terminal.ansi.green": "#a1c181ff",
+        "terminal.ansi.bright_green": "#4d6140ff",
+        "terminal.ansi.dim_green": "#d1e0bfff",
+        "terminal.ansi.yellow": "#dec184ff",
+        "terminal.ansi.bright_yellow": "#e5c07bff",
+        "terminal.ansi.dim_yellow": "#f1dfc1ff",
+        "terminal.ansi.blue": "#74ade8ff",
+        "terminal.ansi.bright_blue": "#385378ff",
+        "terminal.ansi.dim_blue": "#bed5f4ff",
+        "terminal.ansi.magenta": "#b477cfff",
+        "terminal.ansi.bright_magenta": "#d6b4e4ff",
+        "terminal.ansi.dim_magenta": "#612a79ff",
+        "terminal.ansi.cyan": "#6eb4bfff",
+        "terminal.ansi.bright_cyan": "#3a565bff",
+        "terminal.ansi.dim_cyan": "#b9d9dfff",
+        "terminal.ansi.white": "#dce0e5ff",
         "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#8f969bff",
+        "terminal.ansi.dim_white": "#575d65ff",
         "link_text.hover": "#74ade8ff",
         "version_control.added": "#27a657ff",
         "version_control.modified": "#d3b020ff",
-        "version_control.word_added": "#2EA04859",
-        "version_control.word_deleted": "#78081BCC",
         "version_control.deleted": "#e06c76ff",
         "version_control.conflict_marker.ours": "#a1c1811a",
         "version_control.conflict_marker.theirs": "#74ade81a",
@@ -449,7 +446,6 @@
         "tab.inactive_background": "#ebebecff",
         "tab.active_background": "#fafafaff",
         "search.match_background": "#5c79e266",
-        "search.active_match_background": "#d0a92366",
         "panel.background": "#ebebecff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -473,38 +469,36 @@
         "editor.document_highlight.read_background": "#5c78e225",
         "editor.document_highlight.write_background": "#a3a3a466",
         "terminal.background": "#fafafaff",
-        "terminal.foreground": "#2a2c33ff",
-        "terminal.bright_foreground": "#2a2c33ff",
-        "terminal.dim_foreground": "#bbbbbbff",
-        "terminal.ansi.black": "#000000ff",
-        "terminal.ansi.bright_black": "#000000ff",
-        "terminal.ansi.dim_black": "#555555ff",
-        "terminal.ansi.red": "#de3e35ff",
-        "terminal.ansi.bright_red": "#de3e35ff",
-        "terminal.ansi.dim_red": "#9c2b26ff",
-        "terminal.ansi.green": "#3f953aff",
-        "terminal.ansi.bright_green": "#3f953aff",
-        "terminal.ansi.dim_green": "#2b6927ff",
-        "terminal.ansi.yellow": "#d2b67cff",
-        "terminal.ansi.bright_yellow": "#d2b67cff",
-        "terminal.ansi.dim_yellow": "#a48c5aff",
-        "terminal.ansi.blue": "#2f5af3ff",
-        "terminal.ansi.bright_blue": "#2f5af3ff",
-        "terminal.ansi.dim_blue": "#2140abff",
-        "terminal.ansi.magenta": "#950095ff",
-        "terminal.ansi.bright_magenta": "#a00095ff",
-        "terminal.ansi.dim_magenta": "#6a006aff",
-        "terminal.ansi.cyan": "#3f953aff",
-        "terminal.ansi.bright_cyan": "#3f953aff",
-        "terminal.ansi.dim_cyan": "#2b6927ff",
-        "terminal.ansi.white": "#bbbbbbff",
+        "terminal.foreground": "#242529ff",
+        "terminal.bright_foreground": "#242529ff",
+        "terminal.dim_foreground": "#fafafaff",
+        "terminal.ansi.black": "#242529ff",
+        "terminal.ansi.bright_black": "#747579ff",
+        "terminal.ansi.dim_black": "#97979aff",
+        "terminal.ansi.red": "#d36151ff",
+        "terminal.ansi.bright_red": "#f0b0a4ff",
+        "terminal.ansi.dim_red": "#6f312aff",
+        "terminal.ansi.green": "#669f59ff",
+        "terminal.ansi.bright_green": "#b2cfa9ff",
+        "terminal.ansi.dim_green": "#354d2eff",
+        "terminal.ansi.yellow": "#dec184ff",
+        "terminal.ansi.bright_yellow": "#826221ff",
+        "terminal.ansi.dim_yellow": "#786441ff",
+        "terminal.ansi.blue": "#5c78e2ff",
+        "terminal.ansi.bright_blue": "#b5baf2ff",
+        "terminal.ansi.dim_blue": "#2d3d75ff",
+        "terminal.ansi.magenta": "#984ea5ff",
+        "terminal.ansi.bright_magenta": "#cea6d3ff",
+        "terminal.ansi.dim_magenta": "#4b2a50ff",
+        "terminal.ansi.cyan": "#3a82b7ff",
+        "terminal.ansi.bright_cyan": "#a3bedaff",
+        "terminal.ansi.dim_cyan": "#254058ff",
+        "terminal.ansi.white": "#fafafaff",
         "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#888888ff",
+        "terminal.ansi.dim_white": "#aaaaaaff",
         "link_text.hover": "#5c78e2ff",
         "version_control.added": "#27a657ff",
         "version_control.modified": "#d3b020ff",
-        "version_control.word_added": "#2EA04859",
-        "version_control.word_deleted": "#F85149CC",
         "version_control.deleted": "#e06c76ff",
         "conflict": "#a48819ff",
         "conflict.background": "#faf2e6ff",

clippy.toml

@@ -14,7 +14,6 @@ disallowed-methods = [
     { path = "std::process::Command::stderr", reason = "`smol::process::Command::from()` does not preserve stdio configuration", replacement = "smol::process::Command::stderr" },
     { path = "serde_json::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892. Use `serde_json::from_slice` instead." },
     { path = "serde_json_lenient::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892, Use `serde_json_lenient::from_slice` instead." },
-    { path = "cocoa::foundation::NSString::alloc", reason = "NSString must be autoreleased to avoid memory leaks. Use `ns_string()` helper instead." },
 ]
 disallowed-types = [
     # { path = "std::collections::HashMap", replacement = "collections::HashMap" },

crates/acp_thread/Cargo.toml

@@ -46,7 +46,6 @@ url.workspace = true
 util.workspace = true
 uuid.workspace = true
 watch.workspace = true
-urlencoding.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true

crates/acp_thread/src/acp_thread.rs

@@ -201,19 +201,17 @@ impl ToolCall {
         };
         let mut content = Vec::with_capacity(tool_call.content.len());
         for item in tool_call.content {
-            if let Some(item) = ToolCallContent::from_acp(
+            content.push(ToolCallContent::from_acp(
                 item,
                 language_registry.clone(),
                 path_style,
                 terminals,
                 cx,
-            )? {
-                content.push(item);
-            }
+            )?);
         }
 
         let result = Self {
-            id: tool_call.tool_call_id,
+            id: tool_call.id,
             label: cx
                 .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
             kind: tool_call.kind,
@@ -243,7 +241,6 @@ impl ToolCall {
             locations,
             raw_input,
             raw_output,
-            ..
         } = fields;
 
         if let Some(kind) = kind {
@@ -265,29 +262,21 @@ impl ToolCall {
         }
 
         if let Some(content) = content {
-            let mut new_content_len = content.len();
+            let new_content_len = content.len();
             let mut content = content.into_iter();
 
             // Reuse existing content if we can
             for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
-                let valid_content =
-                    old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
-                if !valid_content {
-                    new_content_len -= 1;
-                }
+                old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
             }
             for new in content {
-                if let Some(new) = ToolCallContent::from_acp(
+                self.content.push(ToolCallContent::from_acp(
                     new,
                     language_registry.clone(),
                     path_style,
                     terminals,
                     cx,
-                )? {
-                    self.content.push(new);
-                } else {
-                    new_content_len -= 1;
-                }
+                )?)
             }
             self.content.truncate(new_content_len);
         }
@@ -358,13 +347,13 @@ impl ToolCall {
         let buffer = buffer.await.log_err()?;
         let position = buffer
             .update(cx, |buffer, _| {
-                let snapshot = buffer.snapshot();
                 if let Some(row) = location.line {
+                    let snapshot = buffer.snapshot();
                     let column = snapshot.indent_size_for_line(row).len;
                     let point = snapshot.clip_point(Point::new(row, column), Bias::Left);
                     snapshot.anchor_before(point)
                 } else {
-                    Anchor::min_for_buffer(snapshot.remote_id())
+                    Anchor::MIN
                 }
             })
             .ok()?;
@@ -436,7 +425,6 @@ impl From<acp::ToolCallStatus> for ToolCallStatus {
             acp::ToolCallStatus::InProgress => Self::InProgress,
             acp::ToolCallStatus::Completed => Self::Completed,
             acp::ToolCallStatus::Failed => Self::Failed,
-            _ => Self::Pending,
         }
     }
 }
@@ -549,7 +537,7 @@ impl ContentBlock {
                 ..
             }) => Self::resource_link_md(&uri, path_style),
             acp::ContentBlock::Image(image) => Self::image_md(&image),
-            _ => String::new(),
+            acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => String::new(),
         }
     }
 
@@ -603,17 +591,15 @@ impl ToolCallContent {
         path_style: PathStyle,
         terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) -> Result<Option<Self>> {
+    ) -> Result<Self> {
         match content {
-            acp::ToolCallContent::Content(acp::Content { content, .. }) => {
-                Ok(Some(Self::ContentBlock(ContentBlock::new(
-                    content,
-                    &language_registry,
-                    path_style,
-                    cx,
-                ))))
-            }
-            acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
+            acp::ToolCallContent::Content { content } => Ok(Self::ContentBlock(ContentBlock::new(
+                content,
+                &language_registry,
+                path_style,
+                cx,
+            ))),
+            acp::ToolCallContent::Diff { diff } => Ok(Self::Diff(cx.new(|cx| {
                 Diff::finalized(
                     diff.path.to_string_lossy().into_owned(),
                     diff.old_text,
@@ -621,13 +607,12 @@ impl ToolCallContent {
                     language_registry,
                     cx,
                 )
-            })))),
-            acp::ToolCallContent::Terminal(acp::Terminal { terminal_id, .. }) => terminals
+            }))),
+            acp::ToolCallContent::Terminal { terminal_id } => terminals
                 .get(&terminal_id)
                 .cloned()
-                .map(|terminal| Some(Self::Terminal(terminal)))
+                .map(Self::Terminal)
                 .ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
-            _ => Ok(None),
         }
     }
 
@@ -638,9 +623,9 @@ impl ToolCallContent {
         path_style: PathStyle,
         terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
         cx: &mut App,
-    ) -> Result<bool> {
+    ) -> Result<()> {
         let needs_update = match (&self, &new) {
-            (Self::Diff(old_diff), acp::ToolCallContent::Diff(new_diff)) => {
+            (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
                 old_diff.read(cx).needs_update(
                     new_diff.old_text.as_deref().unwrap_or(""),
                     &new_diff.new_text,
@@ -650,14 +635,10 @@ impl ToolCallContent {
             _ => true,
         };
 
-        if let Some(update) = Self::from_acp(new, language_registry, path_style, terminals, cx)? {
-            if needs_update {
-                *self = update;
-            }
-            Ok(true)
-        } else {
-            Ok(false)
+        if needs_update {
+            *self = Self::from_acp(new, language_registry, path_style, terminals, cx)?;
         }
+        Ok(())
     }
 
     pub fn to_markdown(&self, cx: &App) -> String {
@@ -679,7 +660,7 @@ pub enum ToolCallUpdate {
 impl ToolCallUpdate {
     fn id(&self) -> &acp::ToolCallId {
         match self {
-            Self::UpdateFields(update) => &update.tool_call_id,
+            Self::UpdateFields(update) => &update.id,
             Self::UpdateDiff(diff) => &diff.id,
             Self::UpdateTerminal(terminal) => &terminal.id,
         }
@@ -751,7 +732,6 @@ impl Plan {
                 acp::PlanEntryStatus::Completed => {
                     stats.completed += 1;
                 }
-                _ => {}
             }
         }
 
@@ -1174,7 +1154,6 @@ impl AcpThread {
                 current_mode_id,
                 ..
             }) => cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id)),
-            _ => {}
         }
         Ok(())
     }
@@ -1308,7 +1287,11 @@ impl AcpThread {
                     label: cx.new(|cx| Markdown::new("Tool call not found".into(), None, None, cx)),
                     kind: acp::ToolKind::Fetch,
                     content: vec![ToolCallContent::ContentBlock(ContentBlock::new(
-                        "Tool call not found".into(),
+                        acp::ContentBlock::Text(acp::TextContent {
+                            text: "Tool call not found".to_string(),
+                            annotations: None,
+                            meta: None,
+                        }),
                         &languages,
                         path_style,
                         cx,
@@ -1332,7 +1315,7 @@ impl AcpThread {
                 let location_updated = update.fields.locations.is_some();
                 call.update_fields(update.fields, languages, path_style, &self.terminals, cx)?;
                 if location_updated {
-                    self.resolve_locations(update.tool_call_id, cx);
+                    self.resolve_locations(update.id, cx);
                 }
             }
             ToolCallUpdate::UpdateDiff(update) => {
@@ -1370,9 +1353,9 @@ impl AcpThread {
     ) -> Result<(), acp::Error> {
         let language_registry = self.project.read(cx).languages().clone();
         let path_style = self.project.read(cx).path_style(cx);
-        let id = update.tool_call_id.clone();
+        let id = update.id.clone();
 
-        let agent_telemetry_id = self.connection().telemetry_id();
+        let agent = self.connection().telemetry_id();
         let session = self.session_id();
         if let ToolCallStatus::Completed | ToolCallStatus::Failed = status {
             let status = if matches!(status, ToolCallStatus::Completed) {
@@ -1380,12 +1363,7 @@ impl AcpThread {
             } else {
                 "failed"
             };
-            telemetry::event!(
-                "Agent Tool Call Completed",
-                agent_telemetry_id,
-                session,
-                status
-            );
+            telemetry::event!("Agent Tool Call Completed", agent, session, status);
         }
 
         if let Some(ix) = self.index_for_tool_call(&id) {
@@ -1540,16 +1518,16 @@ impl AcpThread {
             // some tools would (incorrectly) continue to auto-accept.
             if let Some(allow_once_option) = options.iter().find_map(|option| {
                 if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
-                    Some(option.option_id.clone())
+                    Some(option.id.clone())
                 } else {
                     None
                 }
             }) {
                 self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
                 return Ok(async {
-                    acp::RequestPermissionOutcome::Selected(acp::SelectedPermissionOutcome::new(
-                        allow_once_option,
-                    ))
+                    acp::RequestPermissionOutcome::Selected {
+                        option_id: allow_once_option,
+                    }
                 }
                 .boxed());
             }
@@ -1565,9 +1543,7 @@ impl AcpThread {
 
         let fut = async {
             match rx.await {
-                Ok(option) => acp::RequestPermissionOutcome::Selected(
-                    acp::SelectedPermissionOutcome::new(option),
-                ),
+                Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
                 Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
             }
         }
@@ -1594,7 +1570,6 @@ impl AcpThread {
             acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
                 ToolCallStatus::InProgress
             }
-            _ => ToolCallStatus::InProgress,
         };
 
         let curr_status = mem::replace(&mut call.status, new_status);
@@ -1673,7 +1648,14 @@ impl AcpThread {
         message: &str,
         cx: &mut Context<Self>,
     ) -> BoxFuture<'static, Result<()>> {
-        self.send(vec![message.into()], cx)
+        self.send(
+            vec![acp::ContentBlock::Text(acp::TextContent {
+                text: message.to_string(),
+                annotations: None,
+                meta: None,
+            })],
+            cx,
+        )
     }
 
     pub fn send(
@@ -1687,7 +1669,11 @@ impl AcpThread {
             self.project.read(cx).path_style(cx),
             cx,
         );
-        let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
+        let request = acp::PromptRequest {
+            prompt: message.clone(),
+            session_id: self.session_id.clone(),
+            meta: None,
+        };
         let git_store = self.project.read(cx).git_store().clone();
 
         let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
@@ -1779,7 +1765,7 @@ impl AcpThread {
                             result,
                             Ok(Ok(acp::PromptResponse {
                                 stop_reason: acp::StopReason::Cancelled,
-                                ..
+                                meta: None,
                             }))
                         );
 
@@ -1795,7 +1781,7 @@ impl AcpThread {
                         // Handle refusal - distinguish between user prompt and tool call refusals
                         if let Ok(Ok(acp::PromptResponse {
                             stop_reason: acp::StopReason::Refusal,
-                            ..
+                            meta: _,
                         })) = result
                         {
                             if let Some((user_msg_ix, _)) = this.last_user_message() {
@@ -2031,7 +2017,7 @@ impl AcpThread {
                         })?;
                     Ok(project.open_buffer(path, cx))
                 })
-                .map_err(|e| acp::Error::internal_error().data(e.to_string()))
+                .map_err(|e| acp::Error::internal_error().with_data(e.to_string()))
                 .flatten()?;
 
             let buffer = load.await?;
@@ -2064,7 +2050,7 @@ impl AcpThread {
             let start_position = Point::new(line, 0);
 
             if start_position > max_point {
-                return Err(acp::Error::invalid_params().data(format!(
+                return Err(acp::Error::invalid_params().with_data(format!(
                     "Attempting to read beyond the end of the file, line {}:{}",
                     max_point.row + 1,
                     max_point.column
@@ -2134,7 +2120,7 @@ impl AcpThread {
                         position: edits
                             .last()
                             .map(|(range, _)| range.end)
-                            .unwrap_or(Anchor::min_for_buffer(buffer.read(cx).remote_id())),
+                            .unwrap_or(Anchor::MIN),
                     }),
                     cx,
                 );
@@ -2216,7 +2202,7 @@ impl AcpThread {
         let language_registry = project.read(cx).languages().clone();
         let is_windows = project.read(cx).path_style(cx).is_windows();
 
-        let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(Uuid::new_v4().to_string().into());
         let terminal_task = cx.spawn({
             let terminal_id = terminal_id.clone();
             async move |_this, cx| {
@@ -2426,7 +2412,7 @@ mod tests {
             .await
             .unwrap();
 
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
 
         // Send Output BEFORE Created - should be buffered by acp_thread
         thread.update(cx, |thread, cx| {
@@ -2488,7 +2474,7 @@ mod tests {
             .await
             .unwrap();
 
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
 
         // Send Output BEFORE Created
         thread.update(cx, |thread, cx| {
@@ -2506,7 +2492,11 @@ mod tests {
             thread.on_terminal_provider_event(
                 TerminalProviderEvent::Exit {
                     terminal_id: terminal_id.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                 },
                 cx,
             );
@@ -2563,7 +2553,15 @@ mod tests {
 
         // Test creating a new user message
         thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(None, "Hello, ".into(), cx);
+            thread.push_user_content_block(
+                None,
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "Hello, ".to_string(),
+                    meta: None,
+                }),
+                cx,
+            );
         });
 
         thread.update(cx, |thread, cx| {
@@ -2579,7 +2577,15 @@ mod tests {
         // Test appending to existing user message
         let message_1_id = UserMessageId::new();
         thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
+            thread.push_user_content_block(
+                Some(message_1_id.clone()),
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "world!".to_string(),
+                    meta: None,
+                }),
+                cx,
+            );
         });
 
         thread.update(cx, |thread, cx| {
@@ -2594,14 +2600,26 @@ mod tests {
 
         // Test creating new user message after assistant message
         thread.update(cx, |thread, cx| {
-            thread.push_assistant_content_block("Assistant response".into(), false, cx);
+            thread.push_assistant_content_block(
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "Assistant response".to_string(),
+                    meta: None,
+                }),
+                false,
+                cx,
+            );
         });
 
         let message_2_id = UserMessageId::new();
         thread.update(cx, |thread, cx| {
             thread.push_user_content_block(
                 Some(message_2_id.clone()),
-                "New user message".into(),
+                acp::ContentBlock::Text(acp::TextContent {
+                    annotations: None,
+                    text: "New user message".to_string(),
+                    meta: None,
+                }),
                 cx,
             );
         });
@@ -2629,22 +2647,27 @@ mod tests {
                     thread.update(&mut cx, |thread, cx| {
                         thread
                             .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "Thinking ".into(),
-                                )),
+                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
+                                    content: "Thinking ".into(),
+                                    meta: None,
+                                }),
                                 cx,
                             )
                             .unwrap();
                         thread
                             .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "hard!".into(),
-                                )),
+                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
+                                    content: "hard!".into(),
+                                    meta: None,
+                                }),
                                 cx,
                             )
                             .unwrap();
                     })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             },
@@ -2712,7 +2735,10 @@ mod tests {
                         .unwrap()
                         .await
                         .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             },
@@ -2934,7 +2960,7 @@ mod tests {
             .await
             .unwrap_err();
 
-        assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
+        assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
     }
 
     #[gpui::test]
@@ -2943,7 +2969,7 @@ mod tests {
 
         let fs = FakeFs::new(cx.executor());
         let project = Project::test(fs, [], cx).await;
-        let id = acp::ToolCallId::new("test");
+        let id = acp::ToolCallId("test".into());
 
         let connection = Rc::new(FakeAgentConnection::new().on_user_message({
             let id = id.clone();
@@ -2953,17 +2979,26 @@ mod tests {
                     thread
                         .update(&mut cx, |thread, cx| {
                             thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new(id.clone(), "Label")
-                                        .kind(acp::ToolKind::Fetch)
-                                        .status(acp::ToolCallStatus::InProgress),
-                                ),
+                                acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                    id: id.clone(),
+                                    title: "Label".into(),
+                                    kind: acp::ToolKind::Fetch,
+                                    status: acp::ToolCallStatus::InProgress,
+                                    content: vec![],
+                                    locations: vec![],
+                                    raw_input: None,
+                                    raw_output: None,
+                                    meta: None,
+                                }),
                                 cx,
                             )
                         })
                         .unwrap()
                         .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             }
@@ -3005,10 +3040,14 @@ mod tests {
         thread
             .update(cx, |thread, cx| {
                 thread.handle_session_update(
-                    acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
+                    acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
                         id,
-                        acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                    )),
+                        fields: acp::ToolCallUpdateFields {
+                            status: Some(acp::ToolCallStatus::Completed),
+                            ..Default::default()
+                        },
+                        meta: None,
+                    }),
                     cx,
                 )
             })
@@ -3040,21 +3079,33 @@ mod tests {
                     thread
                         .update(&mut cx, |thread, cx| {
                             thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new("test", "Label")
-                                        .kind(acp::ToolKind::Edit)
-                                        .status(acp::ToolCallStatus::Completed)
-                                        .content(vec![acp::ToolCallContent::Diff(acp::Diff::new(
-                                            "/test/test.txt",
-                                            "foo",
-                                        ))]),
-                                ),
+                                acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                    id: acp::ToolCallId("test".into()),
+                                    title: "Label".into(),
+                                    kind: acp::ToolKind::Edit,
+                                    status: acp::ToolCallStatus::Completed,
+                                    content: vec![acp::ToolCallContent::Diff {
+                                        diff: acp::Diff {
+                                            path: "/test/test.txt".into(),
+                                            old_text: None,
+                                            new_text: "foo".into(),
+                                            meta: None,
+                                        },
+                                    }],
+                                    locations: vec![],
+                                    raw_input: None,
+                                    raw_output: None,
+                                    meta: None,
+                                }),
                                 cx,
                             )
                         })
                         .unwrap()
                         .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             }
@@ -3107,14 +3158,18 @@ mod tests {
                     thread.update(&mut cx, |thread, cx| {
                         thread
                             .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
+                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                                    content: content.text.to_uppercase().into(),
+                                    meta: None,
+                                }),
                                 cx,
                             )
                             .unwrap();
                     })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             }
@@ -3270,22 +3325,34 @@ mod tests {
                         thread.update(&mut cx, |thread, cx| {
                             thread
                                 .handle_session_update(
-                                    acp::SessionUpdate::ToolCall(
-                                        acp::ToolCall::new("tool1", "Test Tool")
-                                            .kind(acp::ToolKind::Fetch)
-                                            .status(acp::ToolCallStatus::Completed)
-                                            .raw_input(serde_json::json!({"query": "test"}))
-                                            .raw_output(serde_json::json!({"result": "inappropriate content"})),
-                                    ),
+                                    acp::SessionUpdate::ToolCall(acp::ToolCall {
+                                        id: acp::ToolCallId("tool1".into()),
+                                        title: "Test Tool".into(),
+                                        kind: acp::ToolKind::Fetch,
+                                        status: acp::ToolCallStatus::Completed,
+                                        content: vec![],
+                                        locations: vec![],
+                                        raw_input: Some(serde_json::json!({"query": "test"})),
+                                        raw_output: Some(
+                                            serde_json::json!({"result": "inappropriate content"}),
+                                        ),
+                                        meta: None,
+                                    }),
                                     cx,
                                 )
                                 .unwrap();
                         })?;
 
                         // Now return refusal because of the tool result
-                        Ok(acp::PromptResponse::new(acp::StopReason::Refusal))
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        })
                     } else {
-                        Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
+                        })
                     }
                 }
                 .boxed_local()
@@ -3313,7 +3380,16 @@ mod tests {
         });
 
         // Send a user message - this will trigger tool call and then refusal
-        let send_task = thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
+        let send_task = thread.update(cx, |thread, cx| {
+            thread.send(
+                vec![acp::ContentBlock::Text(acp::TextContent {
+                    text: "Hello".into(),
+                    annotations: None,
+                    meta: None,
+                })],
+                cx,
+            )
+        });
         cx.background_executor.spawn(send_task).detach();
         cx.run_until_parked();
 
@@ -3359,11 +3435,21 @@ mod tests {
             let refuse_next = refuse_next.clone();
             move |_request, _thread, _cx| {
                 if refuse_next.load(SeqCst) {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::Refusal)) }
-                        .boxed_local()
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        })
+                    }
+                    .boxed_local()
                 } else {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
-                        .boxed_local()
+                    async move {
+                        Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::EndTurn,
+                            meta: None,
+                        })
+                    }
+                    .boxed_local()
                 }
             }
         }));
@@ -3420,7 +3506,10 @@ mod tests {
                 let refuse_next = refuse_next.clone();
                 async move {
                     if refuse_next.load(SeqCst) {
-                        return Ok(acp::PromptResponse::new(acp::StopReason::Refusal));
+                        return Ok(acp::PromptResponse {
+                            stop_reason: acp::StopReason::Refusal,
+                            meta: None,
+                        });
                     }
 
                     let acp::ContentBlock::Text(content) = &request.prompt[0] else {
@@ -3429,14 +3518,18 @@ mod tests {
                     thread.update(&mut cx, |thread, cx| {
                         thread
                             .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
+                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
+                                    content: content.text.to_uppercase().into(),
+                                    meta: None,
+                                }),
                                 cx,
                             )
                             .unwrap();
                     })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 }
                 .boxed_local()
             }
@@ -3561,8 +3654,8 @@ mod tests {
     }
 
     impl AgentConnection for FakeAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "fake".into()
+        fn telemetry_id(&self) -> &'static str {
+            "fake"
         }
 
         fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -3575,12 +3668,13 @@ mod tests {
             _cwd: &Path,
             cx: &mut App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(
+            let session_id = acp::SessionId(
                 rand::rng()
                     .sample_iter(&distr::Alphanumeric)
                     .take(7)
                     .map(char::from)
-                    .collect::<String>(),
+                    .collect::<String>()
+                    .into(),
             );
             let action_log = cx.new(|_| ActionLog::new(project.clone()));
             let thread = cx.new(|cx| {
@@ -3590,12 +3684,12 @@ mod tests {
                     project,
                     action_log,
                     session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                        meta: None,
+                    }),
                     cx,
                 )
             });
@@ -3624,7 +3718,10 @@ mod tests {
                 let thread = thread.clone();
                 cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
             } else {
-                Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
+                Task::ready(Ok(acp::PromptResponse {
+                    stop_reason: acp::StopReason::EndTurn,
+                    meta: None,
+                }))
             }
         }
 
@@ -3679,13 +3776,17 @@ mod tests {
             .unwrap();
 
         // Try to update a tool call that doesn't exist
-        let nonexistent_id = acp::ToolCallId::new("nonexistent-tool-call");
+        let nonexistent_id = acp::ToolCallId("nonexistent-tool-call".into());
         thread.update(cx, |thread, cx| {
             let result = thread.handle_session_update(
-                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
-                    nonexistent_id.clone(),
-                    acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                )),
+                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
+                    id: nonexistent_id.clone(),
+                    fields: acp::ToolCallUpdateFields {
+                        status: Some(acp::ToolCallStatus::Completed),
+                        ..Default::default()
+                    },
+                    meta: None,
+                }),
                 cx,
             );
 
@@ -3760,7 +3861,7 @@ mod tests {
         .unwrap();
 
         // Create 2 terminals BEFORE the checkpoint that have completed running
-        let terminal_id_1 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id_1 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
         let mock_terminal_1 = cx.new(|cx| {
             let builder = ::terminal::TerminalBuilder::new_display_only(
                 ::terminal::terminal_settings::CursorShape::default(),
@@ -3799,13 +3900,17 @@ mod tests {
             thread.on_terminal_provider_event(
                 TerminalProviderEvent::Exit {
                     terminal_id: terminal_id_1.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                 },
                 cx,
             );
         });
 
-        let terminal_id_2 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id_2 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
         let mock_terminal_2 = cx.new(|cx| {
             let builder = ::terminal::TerminalBuilder::new_display_only(
                 ::terminal::terminal_settings::CursorShape::default(),
@@ -3844,7 +3949,11 @@ mod tests {
             thread.on_terminal_provider_event(
                 TerminalProviderEvent::Exit {
                     terminal_id: terminal_id_2.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
+                    status: acp::TerminalExitStatus {
+                        exit_code: Some(0),
+                        signal: None,
+                        meta: None,
+                    },
                 },
                 cx,
             );
@@ -3864,7 +3973,7 @@ mod tests {
 
         // Create a terminal AFTER the checkpoint we'll restore to.
         // This simulates the AI agent starting a long-running terminal command.
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
+        let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
         let mock_terminal = cx.new(|cx| {
             let builder = ::terminal::TerminalBuilder::new_display_only(
                 ::terminal::terminal_settings::CursorShape::default(),
@@ -3906,15 +4015,21 @@ mod tests {
         thread.update(cx, |thread, cx| {
             thread
                 .handle_session_update(
-                    acp::SessionUpdate::ToolCall(
-                        acp::ToolCall::new("terminal-tool-1", "Running command")
-                            .kind(acp::ToolKind::Execute)
-                            .status(acp::ToolCallStatus::InProgress)
-                            .content(vec![acp::ToolCallContent::Terminal(acp::Terminal::new(
-                                terminal_id.clone(),
-                            ))])
-                            .raw_input(serde_json::json!({"command": "sleep 1000", "cd": "/test"})),
-                    ),
+                    acp::SessionUpdate::ToolCall(acp::ToolCall {
+                        id: acp::ToolCallId("terminal-tool-1".into()),
+                        title: "Running command".into(),
+                        kind: acp::ToolKind::Execute,
+                        status: acp::ToolCallStatus::InProgress,
+                        content: vec![acp::ToolCallContent::Terminal {
+                            terminal_id: terminal_id.clone(),
+                        }],
+                        locations: vec![],
+                        raw_input: Some(
+                            serde_json::json!({"command": "sleep 1000", "cd": "/test"}),
+                        ),
+                        raw_output: None,
+                        meta: None,
+                    }),
                     cx,
                 )
                 .unwrap();

crates/acp_thread/src/connection.rs

@@ -20,7 +20,7 @@ impl UserMessageId {
 }
 
 pub trait AgentConnection {
-    fn telemetry_id(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;
 
     fn new_thread(
         self: Rc<Self>,
@@ -197,11 +197,6 @@ pub trait AgentModelSelector: 'static {
     fn watch(&self, _cx: &mut App) -> Option<watch::Receiver<()>> {
         None
     }
-
-    /// Returns whether the model picker should render a footer.
-    fn should_render_footer(&self) -> bool {
-        false
-    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -322,8 +317,8 @@ mod test_support {
     }
 
     impl AgentConnection for StubAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "stub".into()
+        fn telemetry_id(&self) -> &'static str {
+            "stub"
         }
 
         fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -336,7 +331,7 @@ mod test_support {
             _cwd: &Path,
             cx: &mut gpui::App,
         ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(self.sessions.lock().len().to_string());
+            let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
             let action_log = cx.new(|_| ActionLog::new(project.clone()));
             let thread = cx.new(|cx| {
                 AcpThread::new(
@@ -345,12 +340,12 @@ mod test_support {
                     project,
                     action_log,
                     session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
+                    watch::Receiver::constant(acp::PromptCapabilities {
+                        image: true,
+                        audio: true,
+                        embedded_context: true,
+                        meta: None,
+                    }),
                     cx,
                 )
             });
@@ -389,7 +384,10 @@ mod test_support {
                 response_tx.replace(tx);
                 cx.spawn(async move |_| {
                     let stop_reason = rx.await?;
-                    Ok(acp::PromptResponse::new(stop_reason))
+                    Ok(acp::PromptResponse {
+                        stop_reason,
+                        meta: None,
+                    })
                 })
             } else {
                 for update in self.next_prompt_updates.lock().drain(..) {
@@ -397,7 +395,7 @@ mod test_support {
                     let update = update.clone();
                     let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) =
                         &update
-                        && let Some(options) = self.permission_requests.get(&tool_call.tool_call_id)
+                        && let Some(options) = self.permission_requests.get(&tool_call.id)
                     {
                         Some((tool_call.clone(), options.clone()))
                     } else {
@@ -426,7 +424,10 @@ mod test_support {
 
                 cx.spawn(async move |_| {
                     try_join_all(tasks).await?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+                    Ok(acp::PromptResponse {
+                        stop_reason: acp::StopReason::EndTurn,
+                        meta: None,
+                    })
                 })
             }
         }

crates/acp_thread/src/diff.rs

@@ -50,14 +50,9 @@ impl Diff {
                         let hunk_ranges = {
                             let buffer = buffer.read(cx);
                             let diff = diff.read(cx);
-                            diff.hunks_intersecting_range(
-                                Anchor::min_for_buffer(buffer.remote_id())
-                                    ..Anchor::max_for_buffer(buffer.remote_id()),
-                                buffer,
-                                cx,
-                            )
-                            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
-                            .collect::<Vec<_>>()
+                            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
+                                .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
+                                .collect::<Vec<_>>()
                         };
 
                         multibuffer.set_excerpts_for_path(
@@ -166,7 +161,7 @@ impl Diff {
     }
 
     pub fn has_revealed_range(&self, cx: &App) -> bool {
-        self.multibuffer().read(cx).paths().next().is_some()
+        self.multibuffer().read(cx).excerpt_paths().next().is_some()
     }
 
     pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
@@ -321,12 +316,7 @@ impl PendingDiff {
         let buffer = self.new_buffer.read(cx);
         let diff = self.diff.read(cx);
         let mut ranges = diff
-            .hunks_intersecting_range(
-                Anchor::min_for_buffer(buffer.remote_id())
-                    ..Anchor::max_for_buffer(buffer.remote_id()),
-                buffer,
-                cx,
-            )
+            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
             .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
             .collect::<Vec<_>>();
         ranges.extend(

crates/acp_thread/src/mention.rs

@@ -4,14 +4,12 @@ use file_icons::FileIcons;
 use prompt_store::{PromptId, UserPromptId};
 use serde::{Deserialize, Serialize};
 use std::{
-    borrow::Cow,
     fmt,
     ops::RangeInclusive,
     path::{Path, PathBuf},
 };
 use ui::{App, IconName, SharedString};
 use url::Url;
-use urlencoding::decode;
 use util::paths::PathStyle;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
@@ -76,13 +74,11 @@ impl MentionUri {
         let path = url.path();
         match url.scheme() {
             "file" => {
-                let normalized = if path_style.is_windows() {
+                let path = if path_style.is_windows() {
                     path.trim_start_matches("/")
                 } else {
                     path
                 };
-                let decoded = decode(normalized).unwrap_or(Cow::Borrowed(normalized));
-                let path = decoded.as_ref();
 
                 if let Some(fragment) = url.fragment() {
                     let line_range = parse_line_range(fragment)?;
@@ -112,7 +108,7 @@ impl MentionUri {
                 if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
                     let name = single_query_param(&url, "name")?.context("Missing thread name")?;
                     Ok(Self::Thread {
-                        id: acp::SessionId::new(thread_id),
+                        id: acp::SessionId(thread_id.into()),
                         name,
                     })
                 } else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
@@ -410,19 +406,6 @@ mod tests {
         assert_eq!(parsed.to_uri().to_string(), selection_uri);
     }
 
-    #[test]
-    fn test_parse_file_uri_with_non_ascii() {
-        let file_uri = uri!("file:///path/to/%E6%97%A5%E6%9C%AC%E8%AA%9E.txt");
-        let parsed = MentionUri::parse(file_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::File { abs_path } => {
-                assert_eq!(abs_path, Path::new(path!("/path/to/日本語.txt")));
-            }
-            _ => panic!("Expected File variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), file_uri);
-    }
-
     #[test]
     fn test_parse_untitled_selection_uri() {
         let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");

crates/acp_thread/src/terminal.rs

@@ -75,9 +75,11 @@ impl Terminal {
 
                     let exit_status = exit_status.map(portable_pty::ExitStatus::from);
 
-                    acp::TerminalExitStatus::new()
-                        .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                        .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
+                    acp::TerminalExitStatus {
+                        exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                        signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                        meta: None,
+                    }
                 })
                 .shared(),
         }
@@ -101,19 +103,25 @@ impl Terminal {
         if let Some(output) = self.output.as_ref() {
             let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
 
-            acp::TerminalOutputResponse::new(
-                output.content.clone(),
-                output.original_content_len > output.content.len(),
-            )
-            .exit_status(
-                acp::TerminalExitStatus::new()
-                    .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                    .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
-            )
+            acp::TerminalOutputResponse {
+                output: output.content.clone(),
+                truncated: output.original_content_len > output.content.len(),
+                exit_status: Some(acp::TerminalExitStatus {
+                    exit_code: exit_status.as_ref().map(|e| e.exit_code()),
+                    signal: exit_status.and_then(|e| e.signal().map(Into::into)),
+                    meta: None,
+                }),
+                meta: None,
+            }
         } else {
             let (current_content, original_len) = self.truncated_output(cx);
-            let truncated = current_content.len() < original_len;
-            acp::TerminalOutputResponse::new(current_content, truncated)
+
+            acp::TerminalOutputResponse {
+                truncated: current_content.len() < original_len,
+                output: current_content,
+                exit_status: None,
+                meta: None,
+            }
         }
     }
 
@@ -187,10 +195,8 @@ pub async fn create_terminal_entity(
         Default::default()
     };
 
-    // Disable pagers so agent/terminal commands don't hang behind interactive UIs
+    // Disables paging for `git` and hopefully other commands
     env.insert("PAGER".into(), "".into());
-    // Override user core.pager (e.g. delta) which Git prefers over PAGER
-    env.insert("GIT_PAGER".into(), "cat".into());
     env.extend(env_vars);
 
     // Use remote shell or default system shell, as appropriate

crates/acp_tools/src/acp_tools.rs

@@ -371,13 +371,13 @@ impl AcpTools {
                                     syntax: cx.theme().syntax().clone(),
                                     code_block_overflow_x_scroll: true,
                                     code_block: StyleRefinement {
-                                        text: TextStyleRefinement {
+                                        text: Some(TextStyleRefinement {
                                             font_family: Some(
                                                 theme_settings.buffer_font.family.clone(),
                                             ),
                                             font_size: Some((base_size * 0.8).into()),
                                             ..Default::default()
-                                        },
+                                        }),
                                         ..Default::default()
                                     },
                                     ..Default::default()
@@ -528,7 +528,7 @@ impl Render for AcpTools {
                                 .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
                                 .size_full(),
                             )
-                            .vertical_scrollbar_for(&connection.list_state, window, cx)
+                            .vertical_scrollbar_for(connection.list_state.clone(), window, cx)
                             .into_any()
                     }
                 }

crates/action_log/src/action_log.rs

@@ -409,11 +409,9 @@ impl ActionLog {
                     let new_diff_base = new_diff_base.clone();
                     async move {
                         let mut unreviewed_edits = Patch::default();
-                        for hunk in diff_snapshot.hunks_intersecting_range(
-                            Anchor::min_for_buffer(buffer_snapshot.remote_id())
-                                ..Anchor::max_for_buffer(buffer_snapshot.remote_id()),
-                            &buffer_snapshot,
-                        ) {
+                        for hunk in diff_snapshot
+                            .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer_snapshot)
+                        {
                             let old_range = new_diff_base
                                 .offset_to_point(hunk.diff_base_byte_range.start)
                                 ..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
@@ -734,10 +732,12 @@ impl ActionLog {
         cx: &mut Context<Self>,
     ) -> Task<()> {
         let futures = self.changed_buffers(cx).into_keys().map(|buffer| {
-            let buffer_ranges = vec![Anchor::min_max_range_for_buffer(
-                buffer.read(cx).remote_id(),
-            )];
-            let reject = self.reject_edits_in_ranges(buffer, buffer_ranges, telemetry.clone(), cx);
+            let reject = self.reject_edits_in_ranges(
+                buffer,
+                vec![Anchor::MIN..Anchor::MAX],
+                telemetry.clone(),
+                cx,
+            );
 
             async move {
                 reject.await.log_err();
@@ -777,7 +777,7 @@ impl ActionLog {
 
 #[derive(Clone)]
 pub struct ActionLogTelemetry {
-    pub agent_telemetry_id: SharedString,
+    pub agent_telemetry_id: &'static str,
     pub session_id: Arc<str>,
 }
 
@@ -2010,8 +2010,7 @@ mod tests {
 
         // User accepts the single hunk
         action_log.update(cx, |log, cx| {
-            let buffer_range = Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id());
-            log.keep_edits_in_range(buffer.clone(), buffer_range, None, cx)
+            log.keep_edits_in_range(buffer.clone(), Anchor::MIN..Anchor::MAX, None, cx)
         });
         cx.run_until_parked();
         assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
@@ -2032,14 +2031,7 @@ mod tests {
         // User rejects the hunk
         action_log
             .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Anchor::min_max_range_for_buffer(
-                        buffer.read(cx).remote_id(),
-                    )],
-                    None,
-                    cx,
-                )
+                log.reject_edits_in_ranges(buffer.clone(), vec![Anchor::MIN..Anchor::MAX], None, cx)
             })
             .await
             .unwrap();

crates/activity_indicator/Cargo.toml

@@ -23,7 +23,6 @@ gpui.workspace = true
 language.workspace = true
 project.workspace = true
 proto.workspace = true
-semver.workspace = true
 smallvec.workspace = true
 ui.workspace = true
 util.workspace = true

crates/activity_indicator/src/activity_indicator.rs

@@ -925,15 +925,15 @@ impl StatusItemView for ActivityIndicator {
 
 #[cfg(test)]
 mod tests {
+    use gpui::SemanticVersion;
     use release_channel::AppCommitSha;
-    use semver::Version;
 
     use super::*;
 
     #[test]
     fn test_version_tooltip_message() {
         let message = ActivityIndicator::version_tooltip_message(&VersionCheckType::Semantic(
-            Version::new(1, 0, 0),
+            SemanticVersion::new(1, 0, 0),
         ));
 
         assert_eq!(message, "Version: 1.0.0");

crates/agent/Cargo.toml

@@ -83,7 +83,6 @@ ctor.workspace = true
 db = { workspace = true, "features" = ["test-support"] }
 editor = { workspace = true, "features" = ["test-support"] }
 env_logger.workspace = true
-eval_utils.workspace = true
 fs = { workspace = true, "features" = ["test-support"] }
 git = { workspace = true, "features" = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }

crates/agent/src/agent.rs

@@ -33,8 +33,7 @@ use gpui::{
 use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
-    ProjectContext, PromptStore, RULES_FILE_NAMES, RulesFileContext, UserRulesContext,
-    WorktreeContext,
+    ProjectContext, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
 use settings::{LanguageModelSelection, update_settings_file};
@@ -52,6 +51,18 @@ pub struct ProjectSnapshot {
     pub timestamp: DateTime<Utc>,
 }
 
+const RULES_FILE_NAMES: [&str; 9] = [
+    ".rules",
+    ".cursorrules",
+    ".windsurfrules",
+    ".clinerules",
+    ".github/copilot-instructions.md",
+    "CLAUDE.md",
+    "AGENT.md",
+    "AGENTS.md",
+    "GEMINI.md",
+];
+
 pub struct RulesLoadingError {
     pub message: SharedString,
 }
@@ -159,7 +170,7 @@ impl LanguageModels {
     }
 
     fn model_id(model: &Arc<dyn LanguageModel>) -> acp::ModelId {
-        acp::ModelId::new(format!("{}/{}", model.provider_id().0, model.id().0))
+        acp::ModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
     }
 
     fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
@@ -778,12 +789,28 @@ impl NativeAgentConnection {
                             }
                             ThreadEvent::AgentText(text) => {
                                 acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), false, cx)
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                            meta: None,
+                                        }),
+                                        false,
+                                        cx,
+                                    )
                                 })?;
                             }
                             ThreadEvent::AgentThinking(text) => {
                                 acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), true, cx)
+                                    thread.push_assistant_content_block(
+                                        acp::ContentBlock::Text(acp::TextContent {
+                                            text,
+                                            annotations: None,
+                                            meta: None,
+                                        }),
+                                        true,
+                                        cx,
+                                    )
                                 })?;
                             }
                             ThreadEvent::ToolCallAuthorization(ToolCallAuthorization {
@@ -797,9 +824,8 @@ impl NativeAgentConnection {
                                     )
                                 })??;
                                 cx.background_spawn(async move {
-                                    if let acp::RequestPermissionOutcome::Selected(
-                                        acp::SelectedPermissionOutcome { option_id, .. },
-                                    ) = outcome_task.await
+                                    if let acp::RequestPermissionOutcome::Selected { option_id } =
+                                        outcome_task.await
                                     {
                                         response
                                             .send(option_id)
@@ -826,7 +852,10 @@ impl NativeAgentConnection {
                             }
                             ThreadEvent::Stop(stop_reason) => {
                                 log::debug!("Assistant message complete: {:?}", stop_reason);
-                                return Ok(acp::PromptResponse::new(stop_reason));
+                                return Ok(acp::PromptResponse {
+                                    stop_reason,
+                                    meta: None,
+                                });
                             }
                         }
                     }
@@ -838,7 +867,10 @@ impl NativeAgentConnection {
             }
 
             log::debug!("Response stream completed");
-            anyhow::Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
+            anyhow::Ok(acp::PromptResponse {
+                stop_reason: acp::StopReason::EndTurn,
+                meta: None,
+            })
         })
     }
 }
@@ -929,15 +961,11 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
     fn watch(&self, cx: &mut App) -> Option<watch::Receiver<()>> {
         Some(self.connection.0.read(cx).models.watch())
     }
-
-    fn should_render_footer(&self) -> bool {
-        true
-    }
 }
 
 impl acp_thread::AgentConnection for NativeAgentConnection {
-    fn telemetry_id(&self) -> SharedString {
-        "zed".into()
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
     }
 
     fn new_thread(
@@ -1208,15 +1236,6 @@ impl TerminalHandle for AcpTerminalHandle {
         self.terminal
             .read_with(cx, |term, cx| term.current_output(cx))
     }
-
-    fn kill(&self, cx: &AsyncApp) -> Result<()> {
-        cx.update(|cx| {
-            self.terminal.update(cx, |terminal, cx| {
-                terminal.kill(cx);
-            });
-        })?;
-        Ok(())
-    }
 }
 
 #[cfg(test)]
@@ -1351,7 +1370,7 @@ mod internal_tests {
             IndexMap::from_iter([(
                 AgentModelGroupName("Fake".into()),
                 vec![AgentModelInfo {
-                    id: acp::ModelId::new("fake/fake"),
+                    id: acp::ModelId("fake/fake".into()),
                     name: "Fake".into(),
                     description: None,
                     icon: Some(ui::IconName::ZedAssistant),
@@ -1412,7 +1431,7 @@ mod internal_tests {
 
         // Select a model
         let selector = connection.model_selector(&session_id).unwrap();
-        let model_id = acp::ModelId::new("fake/fake");
+        let model_id = acp::ModelId("fake/fake".into());
         cx.update(|cx| selector.select_model(model_id.clone(), cx))
             .await
             .unwrap();
@@ -1498,14 +1517,20 @@ mod internal_tests {
             thread.send(
                 vec![
                     "What does ".into(),
-                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                        "b.md",
-                        MentionUri::File {
+                    acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: "b.md".into(),
+                        uri: MentionUri::File {
                             abs_path: path!("/a/b.md").into(),
                         }
                         .to_uri()
                         .to_string(),
-                    )),
+                        annotations: None,
+                        description: None,
+                        mime_type: None,
+                        size: None,
+                        title: None,
+                        meta: None,
+                    }),
                     " mean?".into(),
                 ],
                 cx,

crates/agent/src/db.rs

@@ -150,7 +150,6 @@ impl DbThread {
                                     .unwrap_or_default(),
                                 input: tool_use.input,
                                 is_input_complete: true,
-                                thought_signature: None,
                             },
                         ));
                     }
@@ -182,7 +181,6 @@ impl DbThread {
                     crate::Message::Agent(AgentMessage {
                         content,
                         tool_results,
-                        reasoning_details: None,
                     })
                 }
                 language_model::Role::System => {
@@ -366,7 +364,7 @@ impl ThreadsDatabase {
 
             for (id, summary, updated_at) in rows {
                 threads.push(DbThreadMetadata {
-                    id: acp::SessionId::new(id),
+                    id: acp::SessionId(id),
                     title: summary.into(),
                     updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
                 });
@@ -424,20 +422,4 @@ impl ThreadsDatabase {
             Ok(())
         })
     }
-
-    pub fn delete_threads(&self) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-
-        self.executor.spawn(async move {
-            let connection = connection.lock();
-
-            let mut delete = connection.exec_bound::<()>(indoc! {"
-                DELETE FROM threads
-            "})?;
-
-            delete(())?;
-
-            Ok(())
-        })
-    }
 }

crates/agent/src/edit_agent.rs

@@ -172,14 +172,14 @@ impl EditAgent {
                 project.set_agent_location(
                     Some(AgentLocation {
                         buffer: buffer.downgrade(),
-                        position: language::Anchor::max_for_buffer(buffer.read(cx).remote_id()),
+                        position: language::Anchor::MAX,
                     }),
                     cx,
                 )
             });
             output_events_tx
                 .unbounded_send(EditAgentOutputEvent::Edited(
-                    Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id()),
+                    language::Anchor::MIN..language::Anchor::MAX,
                 ))
                 .ok();
         })?;
@@ -187,7 +187,7 @@ impl EditAgent {
         while let Some(event) = parse_rx.next().await {
             match event? {
                 CreateFileParserEvent::NewTextChunk { chunk } => {
-                    let buffer_id = cx.update(|cx| {
+                    cx.update(|cx| {
                         buffer.update(cx, |buffer, cx| buffer.append(chunk, cx));
                         self.action_log
                             .update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
@@ -195,18 +195,15 @@ impl EditAgent {
                             project.set_agent_location(
                                 Some(AgentLocation {
                                     buffer: buffer.downgrade(),
-                                    position: language::Anchor::max_for_buffer(
-                                        buffer.read(cx).remote_id(),
-                                    ),
+                                    position: language::Anchor::MAX,
                                 }),
                                 cx,
                             )
                         });
-                        buffer.read(cx).remote_id()
                     })?;
                     output_events_tx
                         .unbounded_send(EditAgentOutputEvent::Edited(
-                            Anchor::min_max_range_for_buffer(buffer_id),
+                            language::Anchor::MIN..language::Anchor::MAX,
                         ))
                         .ok();
                 }
@@ -706,7 +703,6 @@ impl EditAgent {
             role: Role::User,
             content: vec![MessageContent::Text(prompt)],
             cache: false,
-            reasoning_details: None,
         });
 
         // Include tools in the request so that we can take advantage of
@@ -1203,9 +1199,7 @@ mod tests {
             project.read_with(cx, |project, _| project.agent_location()),
             Some(AgentLocation {
                 buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
+                position: language::Anchor::MAX
             })
         );
 
@@ -1223,9 +1217,7 @@ mod tests {
             project.read_with(cx, |project, _| project.agent_location()),
             Some(AgentLocation {
                 buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
+                position: language::Anchor::MAX
             })
         );
 
@@ -1243,9 +1235,7 @@ mod tests {
             project.read_with(cx, |project, _| project.agent_location()),
             Some(AgentLocation {
                 buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
+                position: language::Anchor::MAX
             })
         );
 
@@ -1263,9 +1253,7 @@ mod tests {
             project.read_with(cx, |project, _| project.agent_location()),
             Some(AgentLocation {
                 buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
+                position: language::Anchor::MAX
             })
         );
 
@@ -1280,9 +1268,7 @@ mod tests {
             project.read_with(cx, |project, _| project.agent_location()),
             Some(AgentLocation {
                 buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
+                position: language::Anchor::MAX
             })
         );
     }

crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md

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

crates/agent/src/history_store.rs

@@ -188,15 +188,6 @@ impl HistoryStore {
         })
     }
 
-    pub fn delete_threads(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.spawn(async move |this, cx| {
-            let database = database_future.await.map_err(|err| anyhow!(err))?;
-            database.delete_threads().await?;
-            this.update(cx, |this, cx| this.reload(cx))
-        })
-    }
-
     pub fn delete_text_thread(
         &mut self,
         path: Arc<Path>,
@@ -354,9 +345,9 @@ impl HistoryStore {
                 .into_iter()
                 .take(MAX_RECENTLY_OPENED_ENTRIES)
                 .flat_map(|entry| match entry {
-                    SerializedRecentOpen::AcpThread(id) => {
-                        Some(HistoryEntryId::AcpThread(acp::SessionId::new(id.as_str())))
-                    }
+                    SerializedRecentOpen::AcpThread(id) => Some(HistoryEntryId::AcpThread(
+                        acp::SessionId(id.as_str().into()),
+                    )),
                     SerializedRecentOpen::TextThread(file_name) => Some(
                         HistoryEntryId::TextThread(text_threads_dir().join(file_name).into()),
                     ),

crates/agent/src/native_agent_server.rs

@@ -21,6 +21,10 @@ impl NativeAgentServer {
 }
 
 impl AgentServer for NativeAgentServer {
+    fn telemetry_id(&self) -> &'static str {
+        "zed"
+    }
+
     fn name(&self) -> SharedString {
         "Zed Agent".into()
     }

crates/agent/src/outline.rs

@@ -48,7 +48,7 @@ pub async fn get_buffer_content_or_outline(
         if outline_items.is_empty() {
             let text = buffer.read_with(cx, |buffer, _| {
                 let snapshot = buffer.snapshot();
-                let len = snapshot.len().min(snapshot.as_rope().floor_char_boundary(1024));
+                let len = snapshot.len().min(1024);
                 let content = snapshot.text_for_range(0..len).collect::<String>();
                 if let Some(path) = path {
                     format!("# First 1KB of {path} (file too large to show full content, and no outline available)\n\n{content}")
@@ -66,9 +66,11 @@ pub async fn get_buffer_content_or_outline(
         let outline_text = render_outline(outline_items, None, 0, usize::MAX).await?;
 
         let text = if let Some(path) = path {
-            format!("# File outline for {path}\n\n{outline_text}",)
+            format!(
+                "# File outline for {path} (file too large to show full content)\n\n{outline_text}",
+            )
         } else {
-            format!("# File outline\n\n{outline_text}",)
+            format!("# File outline (file too large to show full content)\n\n{outline_text}",)
         };
         Ok(BufferContent {
             text,
@@ -176,7 +178,7 @@ mod tests {
         let fs = FakeFs::new(cx.executor());
         let project = Project::test(fs, [], cx).await;
 
-        let content = "⚡".repeat(100 * 1024); // 100KB
+        let content = "A".repeat(100 * 1024); // 100KB
         let content_len = content.len();
         let buffer = project
             .update(cx, |project, cx| project.create_buffer(true, cx))
@@ -192,7 +194,7 @@ mod tests {
 
         // Should contain some of the actual file content
         assert!(
-            result.text.contains("⚡⚡⚡⚡⚡⚡⚡"),
+            result.text.contains("AAAAAAAAAA"),
             "Result did not contain content subset"
         );
 

crates/agent/src/templates/system_prompt.hbs

@@ -16,7 +16,7 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 3. DO NOT use tools to access items that are already available in the context section.
 4. Use only the tools that are currently available.
 5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-6. When running commands that may run indefinitely or for a long time (such as build scripts, tests, servers, or file watchers), specify `timeout_ms` to bound runtime. If the command times out, the user can always ask you to run it again with a longer timeout or no timeout if they're willing to wait or cancel manually.
+6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.
 7. Avoid HTML entity escaping - use plain characters instead.
 
 ## Searching and Reading

crates/agent/src/tests/mod.rs

@@ -9,16 +9,14 @@ use collections::IndexMap;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
 use futures::{
-    FutureExt as _, StreamExt,
+    StreamExt,
     channel::{
         mpsc::{self, UnboundedReceiver},
         oneshot,
     },
-    future::{Fuse, Shared},
 };
 use gpui::{
-    App, AppContext, AsyncApp, Entity, Task, TestAppContext, UpdateGlobal,
-    http_client::FakeHttpClient,
+    App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
 };
 use indoc::indoc;
 use language_model::{
@@ -37,109 +35,12 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use settings::{Settings, SettingsStore};
-use std::{
-    path::Path,
-    pin::Pin,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    },
-    time::Duration,
-};
+use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
 use util::path;
 
 mod test_tools;
 use test_tools::*;
 
-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-    });
-}
-
-struct FakeTerminalHandle {
-    killed: Arc<AtomicBool>,
-    wait_for_exit: Shared<Task<acp::TerminalExitStatus>>,
-    output: acp::TerminalOutputResponse,
-    id: acp::TerminalId,
-}
-
-impl FakeTerminalHandle {
-    fn new_never_exits(cx: &mut App) -> Self {
-        let killed = Arc::new(AtomicBool::new(false));
-
-        let killed_for_task = killed.clone();
-        let wait_for_exit = cx
-            .spawn(async move |cx| {
-                loop {
-                    if killed_for_task.load(Ordering::SeqCst) {
-                        return acp::TerminalExitStatus::new();
-                    }
-                    cx.background_executor()
-                        .timer(Duration::from_millis(1))
-                        .await;
-                }
-            })
-            .shared();
-
-        Self {
-            killed,
-            wait_for_exit,
-            output: acp::TerminalOutputResponse::new("partial output".to_string(), false),
-            id: acp::TerminalId::new("fake_terminal".to_string()),
-        }
-    }
-
-    fn was_killed(&self) -> bool {
-        self.killed.load(Ordering::SeqCst)
-    }
-}
-
-impl crate::TerminalHandle for FakeTerminalHandle {
-    fn id(&self, _cx: &AsyncApp) -> Result<acp::TerminalId> {
-        Ok(self.id.clone())
-    }
-
-    fn current_output(&self, _cx: &AsyncApp) -> Result<acp::TerminalOutputResponse> {
-        Ok(self.output.clone())
-    }
-
-    fn wait_for_exit(&self, _cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>> {
-        Ok(self.wait_for_exit.clone())
-    }
-
-    fn kill(&self, _cx: &AsyncApp) -> Result<()> {
-        self.killed.store(true, Ordering::SeqCst);
-        Ok(())
-    }
-}
-
-struct FakeThreadEnvironment {
-    handle: Rc<FakeTerminalHandle>,
-}
-
-impl crate::ThreadEnvironment for FakeThreadEnvironment {
-    fn create_terminal(
-        &self,
-        _command: String,
-        _cwd: Option<std::path::PathBuf>,
-        _output_byte_limit: Option<u64>,
-        _cx: &mut AsyncApp,
-    ) -> Task<Result<Rc<dyn crate::TerminalHandle>>> {
-        Task::ready(Ok(self.handle.clone() as Rc<dyn crate::TerminalHandle>))
-    }
-}
-
-fn always_allow_tools(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
-        settings.always_allow_tool_actions = true;
-        agent_settings::AgentSettings::override_global(settings, cx);
-    });
-}
-
 #[gpui::test]
 async fn test_echo(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -170,120 +71,6 @@ async fn test_echo(cx: &mut TestAppContext) {
     assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
 }
 
-#[gpui::test]
-async fn test_terminal_tool_timeout_kills_handle(cx: &mut TestAppContext) {
-    init_test(cx);
-    always_allow_tools(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-
-    let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
-    let environment = Rc::new(FakeThreadEnvironment {
-        handle: handle.clone(),
-    });
-
-    #[allow(clippy::arc_with_non_send_sync)]
-    let tool = Arc::new(crate::TerminalTool::new(project, environment));
-    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
-
-    let task = cx.update(|cx| {
-        tool.run(
-            crate::TerminalToolInput {
-                command: "sleep 1000".to_string(),
-                cd: ".".to_string(),
-                timeout_ms: Some(5),
-            },
-            event_stream,
-            cx,
-        )
-    });
-
-    let update = rx.expect_update_fields().await;
-    assert!(
-        update.content.iter().any(|blocks| {
-            blocks
-                .iter()
-                .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
-        }),
-        "expected tool call update to include terminal content"
-    );
-
-    let mut task_future: Pin<Box<Fuse<Task<Result<String>>>>> = Box::pin(task.fuse());
-
-    let deadline = std::time::Instant::now() + Duration::from_millis(500);
-    loop {
-        if let Some(result) = task_future.as_mut().now_or_never() {
-            let result = result.expect("terminal tool task should complete");
-
-            assert!(
-                handle.was_killed(),
-                "expected terminal handle to be killed on timeout"
-            );
-            assert!(
-                result.contains("partial output"),
-                "expected result to include terminal output, got: {result}"
-            );
-            return;
-        }
-
-        if std::time::Instant::now() >= deadline {
-            panic!("timed out waiting for terminal tool task to complete");
-        }
-
-        cx.run_until_parked();
-        cx.background_executor.timer(Duration::from_millis(1)).await;
-    }
-}
-
-#[gpui::test]
-#[ignore]
-async fn test_terminal_tool_without_timeout_does_not_kill_handle(cx: &mut TestAppContext) {
-    init_test(cx);
-    always_allow_tools(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-
-    let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
-    let environment = Rc::new(FakeThreadEnvironment {
-        handle: handle.clone(),
-    });
-
-    #[allow(clippy::arc_with_non_send_sync)]
-    let tool = Arc::new(crate::TerminalTool::new(project, environment));
-    let (event_stream, mut rx) = crate::ToolCallEventStream::test();
-
-    let _task = cx.update(|cx| {
-        tool.run(
-            crate::TerminalToolInput {
-                command: "sleep 1000".to_string(),
-                cd: ".".to_string(),
-                timeout_ms: None,
-            },
-            event_stream,
-            cx,
-        )
-    });
-
-    let update = rx.expect_update_fields().await;
-    assert!(
-        update.content.iter().any(|blocks| {
-            blocks
-                .iter()
-                .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
-        }),
-        "expected tool call update to include terminal content"
-    );
-
-    smol::Timer::after(Duration::from_millis(25)).await;
-
-    assert!(
-        !handle.was_killed(),
-        "did not expect terminal handle to be killed without a timeout"
-    );
-}
-
 #[gpui::test]
 async fn test_thinking(cx: &mut TestAppContext) {
     let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -428,8 +215,7 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
         vec![LanguageModelRequestMessage {
             role: Role::User,
             content: vec!["Message 1".into()],
-            cache: true,
-            reasoning_details: None,
+            cache: true
         }]
     );
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text(
@@ -453,20 +239,17 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Message 1".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec!["Response to Message 1".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Message 2".into()],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             }
         ]
     );
@@ -491,7 +274,6 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
         raw_input: json!({"text": "test"}).to_string(),
         input: json!({"text": "test"}),
         is_input_complete: true,
-        thought_signature: None,
     };
     fake_model
         .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
@@ -512,44 +294,37 @@ async fn test_prompt_caching(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Message 1".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec!["Response to Message 1".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Message 2".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec!["Response to Message 2".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Use the echo tool".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![MessageContent::ToolResult(tool_result)],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             }
         ]
     );
@@ -686,7 +461,6 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
@@ -696,7 +470,6 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -706,14 +479,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     // Approve the first
     tool_call_auth_1
         .response
-        .send(tool_call_auth_1.options[1].option_id.clone())
+        .send(tool_call_auth_1.options[1].id.clone())
         .unwrap();
     cx.run_until_parked();
 
     // Reject the second
     tool_call_auth_2
         .response
-        .send(tool_call_auth_1.options[2].option_id.clone())
+        .send(tool_call_auth_1.options[2].id.clone())
         .unwrap();
     cx.run_until_parked();
 
@@ -723,14 +496,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         message.content,
         vec![
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_1.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_1.tool_call.id.0.to_string().into(),
                 tool_name: ToolRequiringPermission::name().into(),
                 is_error: false,
                 content: "Allowed".into(),
                 output: Some("Allowed".into())
             }),
             language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_2.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_2.tool_call.id.0.to_string().into(),
                 tool_name: ToolRequiringPermission::name().into(),
                 is_error: true,
                 content: "Permission to run tool denied by user".into(),
@@ -747,7 +520,6 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -756,7 +528,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
     let tool_call_auth_3 = next_tool_call_authorization(&mut events).await;
     tool_call_auth_3
         .response
-        .send(tool_call_auth_3.options[0].option_id.clone())
+        .send(tool_call_auth_3.options[0].id.clone())
         .unwrap();
     cx.run_until_parked();
     let completion = fake_model.pending_completions().pop().unwrap();
@@ -765,7 +537,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
         message.content,
         vec![language_model::MessageContent::ToolResult(
             LanguageModelToolResult {
-                tool_use_id: tool_call_auth_3.tool_call.tool_call_id.0.to_string().into(),
+                tool_use_id: tool_call_auth_3.tool_call.id.0.to_string().into(),
                 tool_name: ToolRequiringPermission::name().into(),
                 is_error: false,
                 content: "Allowed".into(),
@@ -782,7 +554,6 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -821,7 +592,6 @@ async fn test_tool_hallucination(cx: &mut TestAppContext) {
             raw_input: "{}".into(),
             input: json!({}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -851,7 +621,6 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
         raw_input: "{}".into(),
         input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
         is_input_complete: true,
-        thought_signature: None,
     };
     fake_model
         .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
@@ -872,26 +641,25 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![MessageContent::ToolUse(tool_use.clone())],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![MessageContent::ToolResult(tool_result.clone())],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             },
         ]
     );
 
     // Simulate reaching tool use limit.
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUseLimitReached);
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::StatusUpdate(
+        cloud_llm_client::CompletionRequestStatus::ToolUseLimitReached,
+    ));
     fake_model.end_last_completion_stream();
     let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
     assert!(
@@ -909,26 +677,22 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![MessageContent::ToolResult(tool_result)],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Continue where you left off".into()],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             }
         ]
     );
@@ -967,7 +731,6 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
         raw_input: "{}".into(),
         input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
         is_input_complete: true,
-        thought_signature: None,
     };
     let tool_result = LanguageModelToolResult {
         tool_use_id: "tool_id_1".into(),
@@ -978,7 +741,9 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
     };
     fake_model
         .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUseLimitReached);
+    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::StatusUpdate(
+        cloud_llm_client::CompletionRequestStatus::ToolUseLimitReached,
+    ));
     fake_model.end_last_completion_stream();
     let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
     assert!(
@@ -1000,26 +765,22 @@ async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![MessageContent::ToolResult(tool_result)],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["ghi".into()],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             }
         ]
     );
@@ -1276,7 +1037,6 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             raw_input: json!({"text": "test"}).to_string(),
             input: json!({"text": "test"}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -1320,7 +1080,6 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             raw_input: json!({"text": "mcp"}).to_string(),
             input: json!({"text": "mcp"}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
@@ -1330,7 +1089,6 @@ async fn test_mcp_tools(cx: &mut TestAppContext) {
             raw_input: json!({"text": "native"}).to_string(),
             input: json!({"text": "native"}),
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -1566,20 +1324,20 @@ async fn test_cancellation(cx: &mut TestAppContext) {
             ThreadEvent::ToolCall(tool_call) => {
                 assert_eq!(tool_call.title, expected_tools.remove(0));
                 if tool_call.title == "Echo" {
-                    echo_id = Some(tool_call.tool_call_id);
+                    echo_id = Some(tool_call.id);
                 }
             }
             ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
                 acp::ToolCallUpdate {
-                    tool_call_id,
+                    id,
                     fields:
                         acp::ToolCallUpdateFields {
                             status: Some(acp::ToolCallStatus::Completed),
                             ..
                         },
-                    ..
+                    meta: None,
                 },
-            )) if Some(&tool_call_id) == echo_id.as_ref() => {
+            )) if Some(&id) == echo_id.as_ref() => {
                 echo_completed = true;
             }
             _ => {}
@@ -2030,7 +1788,6 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
         raw_input: "{}".into(),
         input: json!({}),
         is_input_complete: true,
-        thought_signature: None,
     };
     let echo_tool_use = LanguageModelToolUse {
         id: "tool_id_2".into(),
@@ -2038,7 +1795,6 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
         raw_input: json!({"text": "test"}).to_string(),
         input: json!({"text": "test"}),
         is_input_complete: true,
-        thought_signature: None,
     };
     fake_model.send_last_completion_stream_text_chunk("Hi!");
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
@@ -2062,8 +1818,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Hey!".into()],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
@@ -2071,8 +1826,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
                     MessageContent::Text("Hi!".into()),
                     MessageContent::ToolUse(echo_tool_use.clone())
                 ],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
@@ -2083,8 +1837,7 @@ async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
                     content: "test".into(),
                     output: Some("test".into())
                 })],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
         ],
     );
@@ -2208,7 +1961,11 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
         .update(|cx| {
             connection.prompt(
                 Some(acp_thread::UserMessageId::new()),
-                acp::PromptRequest::new(session_id.clone(), vec!["ghi".into()]),
+                acp::PromptRequest {
+                    session_id: session_id.clone(),
+                    prompt: vec!["ghi".into()],
+                    meta: None,
+                },
                 cx,
             )
         })
@@ -2243,7 +2000,6 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
             raw_input: input.to_string(),
             input,
             is_input_complete: false,
-            thought_signature: None,
         },
     ));
 
@@ -2256,7 +2012,6 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
             raw_input: input.to_string(),
             input,
             is_input_complete: true,
-            thought_signature: None,
         },
     ));
     fake_model.end_last_completion_stream();
@@ -2265,50 +2020,68 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
     let tool_call = expect_tool_call(&mut events).await;
     assert_eq!(
         tool_call,
-        acp::ToolCall::new("1", "Thinking")
-            .kind(acp::ToolKind::Think)
-            .raw_input(json!({}))
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                "thinking".into()
-            )]))
+        acp::ToolCall {
+            id: acp::ToolCallId("1".into()),
+            title: "Thinking".into(),
+            kind: acp::ToolKind::Think,
+            status: acp::ToolCallStatus::Pending,
+            content: vec![],
+            locations: vec![],
+            raw_input: Some(json!({})),
+            raw_output: None,
+            meta: Some(json!({ "tool_name": "thinking" })),
+        }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
     assert_eq!(
         update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .title("Thinking")
-                .kind(acp::ToolKind::Think)
-                .raw_input(json!({ "content": "Thinking hard!"}))
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                title: Some("Thinking".into()),
+                kind: Some(acp::ToolKind::Think),
+                raw_input: Some(json!({ "content": "Thinking hard!" })),
+                ..Default::default()
+            },
+            meta: None,
+        }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
     assert_eq!(
         update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress)
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                status: Some(acp::ToolCallStatus::InProgress),
+                ..Default::default()
+            },
+            meta: None,
+        }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
     assert_eq!(
         update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().content(vec!["Thinking hard!".into()])
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                content: Some(vec!["Thinking hard!".into()]),
+                ..Default::default()
+            },
+            meta: None,
+        }
     );
     let update = expect_tool_call_update_fields(&mut events).await;
     assert_eq!(
         update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .status(acp::ToolCallStatus::Completed)
-                .raw_output("Finished thinking.")
-        )
+        acp::ToolCallUpdate {
+            id: acp::ToolCallId("1".into()),
+            fields: acp::ToolCallUpdateFields {
+                status: Some(acp::ToolCallStatus::Completed),
+                raw_output: Some("Finished thinking.".into()),
+                ..Default::default()
+            },
+            meta: None,
+        }
     );
 }
 
@@ -2441,7 +2214,6 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
         raw_input: json!({"text": "test"}).to_string(),
         input: json!({"text": "test"}),
         is_input_complete: true,
-        thought_signature: None,
     };
     fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
         tool_use_1.clone(),
@@ -2460,14 +2232,12 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
             LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec!["Call the echo tool!".into()],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::Assistant,
                 content: vec![language_model::MessageContent::ToolUse(tool_use_1.clone())],
-                cache: false,
-                reasoning_details: None,
+                cache: false
             },
             LanguageModelRequestMessage {
                 role: Role::User,
@@ -2480,8 +2250,7 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
                         output: Some("test".into())
                     }
                 )],
-                cache: true,
-                reasoning_details: None,
+                cache: true
             },
         ]
     );
@@ -2495,8 +2264,7 @@ async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
             thread.last_message(),
             Some(Message::Agent(AgentMessage {
                 content: vec![AgentMessageContent::Text("Done".into())],
-                tool_results: IndexMap::default(),
-                reasoning_details: None,
+                tool_results: IndexMap::default()
             }))
         );
     })
@@ -2744,7 +2512,7 @@ fn setup_context_server(
         let mut settings = ProjectSettings::get_global(cx).clone();
         settings.context_servers.insert(
             name.into(),
-            project::project_settings::ContextServerSettings::Stdio {
+            project::project_settings::ContextServerSettings::Custom {
                 enabled: true,
                 command: ContextServerCommand {
                     path: "somebinary".into(),

crates/agent/src/thread.rs

@@ -15,7 +15,7 @@ use agent_settings::{
 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
 use client::{ModelRequestUsage, RequestUsage, UserStore};
-use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
+use cloud_llm_client::{CompletionIntent, CompletionRequestStatus, Plan, UsageLimit};
 use collections::{HashMap, HashSet, IndexMap};
 use fs::Fs;
 use futures::stream;
@@ -113,7 +113,6 @@ impl Message {
                 role: Role::User,
                 content: vec!["Continue where you left off".into()],
                 cache: false,
-                reasoning_details: None,
             }],
         }
     }
@@ -178,7 +177,6 @@ impl UserMessage {
             role: Role::User,
             content: Vec::with_capacity(self.content.len()),
             cache: false,
-            reasoning_details: None,
         };
 
         const OPEN_CONTEXT: &str = "<context>\n\
@@ -446,7 +444,6 @@ impl AgentMessage {
             role: Role::Assistant,
             content: Vec::with_capacity(self.content.len()),
             cache: false,
-            reasoning_details: self.reasoning_details.clone(),
         };
         for chunk in &self.content {
             match chunk {
@@ -482,7 +479,6 @@ impl AgentMessage {
             role: Role::User,
             content: Vec::new(),
             cache: false,
-            reasoning_details: None,
         };
 
         for tool_result in self.tool_results.values() {
@@ -512,7 +508,6 @@ impl AgentMessage {
 pub struct AgentMessage {
     pub content: Vec<AgentMessageContent>,
     pub tool_results: IndexMap<LanguageModelToolUseId, LanguageModelToolResult>,
-    pub reasoning_details: Option<serde_json::Value>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -530,7 +525,6 @@ pub trait TerminalHandle {
     fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId>;
     fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse>;
     fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>>;
-    fn kill(&self, cx: &AsyncApp) -> Result<()>;
 }
 
 pub trait ThreadEnvironment {
@@ -620,9 +614,12 @@ pub struct Thread {
 impl Thread {
     fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
         let image = model.map_or(true, |model| model.supports_images());
-        acp::PromptCapabilities::new()
-            .image(image)
-            .embedded_context(true)
+        acp::PromptCapabilities {
+            meta: None,
+            image,
+            audio: false,
+            embedded_context: true,
+        }
     }
 
     pub fn new(
@@ -638,7 +635,7 @@ impl Thread {
         let (prompt_capabilities_tx, prompt_capabilities_rx) =
             watch::channel(Self::prompt_capabilities(model.as_deref()));
         Self {
-            id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
+            id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
             prompt_id: PromptId::new(),
             updated_at: Utc::now(),
             title: None,
@@ -735,11 +732,17 @@ impl Thread {
         let Some(tool) = tool else {
             stream
                 .0
-                .unbounded_send(Ok(ThreadEvent::ToolCall(
-                    acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
-                        .status(acp::ToolCallStatus::Failed)
-                        .raw_input(tool_use.input.clone()),
-                )))
+                .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
+                    meta: None,
+                    id: acp::ToolCallId(tool_use.id.to_string().into()),
+                    title: tool_use.name.to_string(),
+                    kind: acp::ToolKind::Other,
+                    status: acp::ToolCallStatus::Failed,
+                    content: Vec::new(),
+                    locations: Vec::new(),
+                    raw_input: Some(tool_use.input.clone()),
+                    raw_output: None,
+                })))
                 .ok();
             return;
         };
@@ -769,8 +772,8 @@ impl Thread {
 
         stream.update_tool_call_fields(
             &tool_use.id,
-            acp::ToolCallUpdateFields::new()
-                .status(
+            acp::ToolCallUpdateFields {
+                status: Some(
                     tool_result
                         .as_ref()
                         .map_or(acp::ToolCallStatus::Failed, |result| {
@@ -780,8 +783,10 @@ impl Thread {
                                 acp::ToolCallStatus::Completed
                             }
                         }),
-                )
-                .raw_output(output),
+                ),
+                raw_output: output,
+                ..Default::default()
+            },
         );
     }
 
@@ -1264,13 +1269,15 @@ impl Thread {
 
                 event_stream.update_tool_call_fields(
                     &tool_result.tool_use_id,
-                    acp::ToolCallUpdateFields::new()
-                        .status(if tool_result.is_error {
+                    acp::ToolCallUpdateFields {
+                        status: Some(if tool_result.is_error {
                             acp::ToolCallStatus::Failed
                         } else {
                             acp::ToolCallStatus::Completed
-                        })
-                        .raw_output(tool_result.output.clone()),
+                        }),
+                        raw_output: tool_result.output.clone(),
+                        ..Default::default()
+                    },
                 );
                 this.update(cx, |this, _cx| {
                     this.pending_message()
@@ -1391,18 +1398,6 @@ impl Thread {
                 self.handle_thinking_event(text, signature, event_stream, cx)
             }
             RedactedThinking { data } => self.handle_redacted_thinking_event(data, cx),
-            ReasoningDetails(details) => {
-                let last_message = self.pending_message();
-                // Store the last non-empty reasoning_details (overwrites earlier ones)
-                // This ensures we keep the encrypted reasoning with signatures, not the early text reasoning
-                if let serde_json::Value::Array(ref arr) = details {
-                    if !arr.is_empty() {
-                        last_message.reasoning_details = Some(details);
-                    }
-                } else {
-                    last_message.reasoning_details = Some(details);
-                }
-            }
             ToolUse(tool_use) => {
                 return Ok(self.handle_tool_use_event(tool_use, event_stream, cx));
             }
@@ -1435,16 +1430,20 @@ impl Thread {
                 );
                 self.update_token_usage(usage, cx);
             }
-            UsageUpdated { amount, limit } => {
+            StatusUpdate(CompletionRequestStatus::UsageUpdated { amount, limit }) => {
                 self.update_model_request_usage(amount, limit, cx);
             }
-            ToolUseLimitReached => {
+            StatusUpdate(
+                CompletionRequestStatus::Started
+                | CompletionRequestStatus::Queued { .. }
+                | CompletionRequestStatus::Failed { .. },
+            ) => {}
+            StatusUpdate(CompletionRequestStatus::ToolUseLimitReached) => {
                 self.tool_use_limit_reached = true;
             }
             Stop(StopReason::Refusal) => return Err(CompletionError::Refusal.into()),
             Stop(StopReason::MaxTokens) => return Err(CompletionError::MaxTokens.into()),
             Stop(StopReason::ToolUse | StopReason::EndTurn) => {}
-            Started | Queued { .. } => {}
         }
 
         Ok(None)
@@ -1548,10 +1547,12 @@ impl Thread {
         } else {
             event_stream.update_tool_call_fields(
                 &tool_use.id,
-                acp::ToolCallUpdateFields::new()
-                    .title(title.as_str())
-                    .kind(kind)
-                    .raw_input(tool_use.input.clone()),
+                acp::ToolCallUpdateFields {
+                    title: Some(title.into()),
+                    kind: Some(kind),
+                    raw_input: Some(tool_use.input.clone()),
+                    ..Default::default()
+                },
             );
         }
 
@@ -1573,9 +1574,10 @@ impl Thread {
         let fs = self.project.read(cx).fs().clone();
         let tool_event_stream =
             ToolCallEventStream::new(tool_use.id.clone(), event_stream.clone(), Some(fs));
-        tool_event_stream.update_fields(
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress),
-        );
+        tool_event_stream.update_fields(acp::ToolCallUpdateFields {
+            status: Some(acp::ToolCallStatus::InProgress),
+            ..Default::default()
+        });
         let supports_images = self.model().is_some_and(|model| model.supports_images());
         let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
         log::debug!("Running tool {}", tool_use.name);
@@ -1675,7 +1677,6 @@ impl Thread {
             role: Role::User,
             content: vec![SUMMARIZE_THREAD_DETAILED_PROMPT.into()],
             cache: false,
-            reasoning_details: None,
         });
 
         let task = cx
@@ -1686,7 +1687,9 @@ impl Thread {
                     let event = event.log_err()?;
                     let text = match event {
                         LanguageModelCompletionEvent::Text(text) => text,
-                        LanguageModelCompletionEvent::UsageUpdated { amount, limit } => {
+                        LanguageModelCompletionEvent::StatusUpdate(
+                            CompletionRequestStatus::UsageUpdated { amount, limit },
+                        ) => {
                             this.update(cx, |thread, cx| {
                                 thread.update_model_request_usage(amount, limit, cx);
                             })
@@ -1740,7 +1743,6 @@ impl Thread {
             role: Role::User,
             content: vec![SUMMARIZE_THREAD_PROMPT.into()],
             cache: false,
-            reasoning_details: None,
         });
         self.pending_title_generation = Some(cx.spawn(async move |this, cx| {
             let mut title = String::new();
@@ -1751,7 +1753,9 @@ impl Thread {
                     let event = event?;
                     let text = match event {
                         LanguageModelCompletionEvent::Text(text) => text,
-                        LanguageModelCompletionEvent::UsageUpdated { amount, limit } => {
+                        LanguageModelCompletionEvent::StatusUpdate(
+                            CompletionRequestStatus::UsageUpdated { amount, limit },
+                        ) => {
                             this.update(cx, |thread, cx| {
                                 thread.update_model_request_usage(amount, limit, cx);
                             })?;
@@ -1988,7 +1992,6 @@ impl Thread {
             role: Role::System,
             content: vec![system_prompt.into()],
             cache: false,
-            reasoning_details: None,
         }];
         for message in &self.messages {
             messages.extend(message.to_request());
@@ -2366,13 +2369,19 @@ impl ThreadEventStream {
         kind: acp::ToolKind,
         input: serde_json::Value,
     ) -> acp::ToolCall {
-        acp::ToolCall::new(id.to_string(), title)
-            .kind(kind)
-            .raw_input(input)
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                tool_name.into(),
-            )]))
+        acp::ToolCall {
+            meta: Some(serde_json::json!({
+                "tool_name": tool_name
+            })),
+            id: acp::ToolCallId(id.to_string().into()),
+            title,
+            kind,
+            status: acp::ToolCallStatus::Pending,
+            content: vec![],
+            locations: vec![],
+            raw_input: Some(input),
+            raw_output: None,
+        }
     }
 
     fn update_tool_call_fields(
@@ -2382,7 +2391,12 @@ impl ThreadEventStream {
     ) {
         self.0
             .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp::ToolCallUpdate::new(tool_use_id.to_string(), fields).into(),
+                acp::ToolCallUpdate {
+                    meta: None,
+                    id: acp::ToolCallId(tool_use_id.to_string().into()),
+                    fields,
+                }
+                .into(),
             )))
             .ok();
     }
@@ -2445,7 +2459,7 @@ impl ToolCallEventStream {
             .0
             .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
                 acp_thread::ToolCallUpdateDiff {
-                    id: acp::ToolCallId::new(self.tool_use_id.to_string()),
+                    id: acp::ToolCallId(self.tool_use_id.to_string().into()),
                     diff,
                 }
                 .into(),
@@ -2463,26 +2477,33 @@ impl ToolCallEventStream {
             .0
             .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
                 ToolCallAuthorization {
-                    tool_call: acp::ToolCallUpdate::new(
-                        self.tool_use_id.to_string(),
-                        acp::ToolCallUpdateFields::new().title(title.into()),
-                    ),
+                    tool_call: acp::ToolCallUpdate {
+                        meta: None,
+                        id: acp::ToolCallId(self.tool_use_id.to_string().into()),
+                        fields: acp::ToolCallUpdateFields {
+                            title: Some(title.into()),
+                            ..Default::default()
+                        },
+                    },
                     options: vec![
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("always_allow"),
-                            "Always Allow",
-                            acp::PermissionOptionKind::AllowAlways,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("allow"),
-                            "Allow",
-                            acp::PermissionOptionKind::AllowOnce,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("deny"),
-                            "Deny",
-                            acp::PermissionOptionKind::RejectOnce,
-                        ),
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("always_allow".into()),
+                            name: "Always Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowAlways,
+                            meta: None,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("allow".into()),
+                            name: "Allow".into(),
+                            kind: acp::PermissionOptionKind::AllowOnce,
+                            meta: None,
+                        },
+                        acp::PermissionOption {
+                            id: acp::PermissionOptionId("deny".into()),
+                            name: "Deny".into(),
+                            kind: acp::PermissionOptionKind::RejectOnce,
+                            meta: None,
+                        },
                     ],
                     response: response_tx,
                 },
@@ -2627,15 +2648,7 @@ impl UserMessageContent {
                     // TODO
                     Self::Text("[blob]".to_string())
                 }
-                other => {
-                    log::warn!("Unexpected content type: {:?}", other);
-                    Self::Text("[unknown]".to_string())
-                }
             },
-            other => {
-                log::warn!("Unexpected content type: {:?}", other);
-                Self::Text("[unknown]".to_string())
-            }
         }
     }
 }
@@ -2643,15 +2656,32 @@ impl UserMessageContent {
 impl From<UserMessageContent> for acp::ContentBlock {
     fn from(content: UserMessageContent) -> Self {
         match content {
-            UserMessageContent::Text(text) => text.into(),
-            UserMessageContent::Image(image) => {
-                acp::ContentBlock::Image(acp::ImageContent::new(image.source, "image/png"))
+            UserMessageContent::Text(text) => acp::ContentBlock::Text(acp::TextContent {
+                text,
+                annotations: None,
+                meta: None,
+            }),
+            UserMessageContent::Image(image) => acp::ContentBlock::Image(acp::ImageContent {
+                data: image.source.to_string(),
+                mime_type: "image/png".to_string(),
+                meta: None,
+                annotations: None,
+                uri: None,
+            }),
+            UserMessageContent::Mention { uri, content } => {
+                acp::ContentBlock::Resource(acp::EmbeddedResource {
+                    meta: None,
+                    resource: acp::EmbeddedResourceResource::TextResourceContents(
+                        acp::TextResourceContents {
+                            meta: None,
+                            mime_type: None,
+                            text: content,
+                            uri: uri.to_uri().to_string(),
+                        },
+                    ),
+                    annotations: None,
+                })
             }
-            UserMessageContent::Mention { uri, content } => acp::ContentBlock::Resource(
-                acp::EmbeddedResource::new(acp::EmbeddedResourceResource::TextResourceContents(
-                    acp::TextResourceContents::new(content, uri.to_uri().to_string()),
-                )),
-            ),
         }
     }
 }
@@ -2659,6 +2689,7 @@ impl From<UserMessageContent> for acp::ContentBlock {
 fn convert_image(image_content: acp::ImageContent) -> LanguageModelImage {
     LanguageModelImage {
         source: image_content.data.into(),
-        size: None,
+        // TODO: make this optional?
+        size: gpui::Size::new(0.into(), 0.into()),
     }
 }

crates/agent/src/tools.rs

@@ -4,7 +4,6 @@ mod create_directory_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_file_tool;
-
 mod fetch_tool;
 mod find_path_tool;
 mod grep_tool;
@@ -13,7 +12,6 @@ mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod read_file_tool;
-
 mod terminal_tool;
 mod thinking_tool;
 mod web_search_tool;
@@ -27,7 +25,6 @@ pub use create_directory_tool::*;
 pub use delete_path_tool::*;
 pub use diagnostics_tool::*;
 pub use edit_file_tool::*;
-
 pub use fetch_tool::*;
 pub use find_path_tool::*;
 pub use grep_tool::*;
@@ -36,7 +33,6 @@ pub use move_path_tool::*;
 pub use now_tool::*;
 pub use open_tool::*;
 pub use read_file_tool::*;
-
 pub use terminal_tool::*;
 pub use thinking_tool::*;
 pub use web_search_tool::*;

crates/agent/src/tools/edit_file_tool.rs

@@ -273,9 +273,14 @@ impl AgentTool for EditFileTool {
         };
         let abs_path = project.read(cx).absolute_path(&project_path, cx);
         if let Some(abs_path) = abs_path.clone() {
-            event_stream.update_fields(
-                ToolCallUpdateFields::new().locations(vec![acp::ToolCallLocation::new(abs_path)]),
-            );
+            event_stream.update_fields(ToolCallUpdateFields {
+                locations: Some(vec![acp::ToolCallLocation {
+                    path: abs_path,
+                    line: None,
+                    meta: None,
+                }]),
+                ..Default::default()
+            });
         }
 
         let authorize = self.authorize(&input, &event_stream, cx);
@@ -384,7 +389,10 @@ impl AgentTool for EditFileTool {
                                 range.start.to_point(&buffer.snapshot()).row
                             }).ok();
                             if let Some(abs_path) = abs_path.clone() {
-                                event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
+                                event_stream.update_fields(ToolCallUpdateFields {
+                                    locations: Some(vec![ToolCallLocation { path: abs_path, line, meta: None }]),
+                                    ..Default::default()
+                                });
                             }
                             emitted_location = true;
                         }

crates/agent/src/tools/find_path_tool.rs

@@ -118,29 +118,33 @@ impl AgentTool for FindPathTool {
             let paginated_matches: &[PathBuf] = &matches[cmp::min(input.offset, matches.len())
                 ..cmp::min(input.offset + RESULTS_PER_PAGE, matches.len())];
 
-            event_stream.update_fields(
-                acp::ToolCallUpdateFields::new()
-                    .title(if paginated_matches.is_empty() {
-                        "No matches".into()
-                    } else if paginated_matches.len() == 1 {
-                        "1 match".into()
-                    } else {
-                        format!("{} matches", paginated_matches.len())
-                    })
-                    .content(
-                        paginated_matches
-                            .iter()
-                            .map(|path| {
-                                acp::ToolCallContent::Content(acp::Content::new(
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        path.to_string_lossy(),
-                                        format!("file://{}", path.display()),
-                                    )),
-                                ))
-                            })
-                            .collect::<Vec<_>>(),
-                    ),
-            );
+            event_stream.update_fields(acp::ToolCallUpdateFields {
+                title: Some(if paginated_matches.is_empty() {
+                    "No matches".into()
+                } else if paginated_matches.len() == 1 {
+                    "1 match".into()
+                } else {
+                    format!("{} matches", paginated_matches.len())
+                }),
+                content: Some(
+                    paginated_matches
+                        .iter()
+                        .map(|path| acp::ToolCallContent::Content {
+                            content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                                uri: format!("file://{}", path.display()),
+                                name: path.to_string_lossy().into(),
+                                annotations: None,
+                                description: None,
+                                mime_type: None,
+                                size: None,
+                                title: None,
+                                meta: None,
+                            }),
+                        })
+                        .collect(),
+                ),
+                ..Default::default()
+            });
 
             Ok(FindPathToolOutput {
                 offset: input.offset,
@@ -173,7 +177,7 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
         let mut results = Vec::new();
         for snapshot in snapshots {
             for entry in snapshot.entries(false, 0) {
-                if path_matcher.is_match(&snapshot.root_name().join(&entry.path)) {
+                if path_matcher.is_match(snapshot.root_name().join(&entry.path).as_std_path()) {
                     results.push(snapshot.absolutize(&entry.path));
                 }
             }

crates/agent/src/tools/grep_tool.rs

@@ -32,21 +32,8 @@ pub struct GrepToolInput {
     /// Do NOT specify a path here! This will only be matched against the code **content**.
     pub regex: String,
     /// A glob pattern for the paths of files to include in the search.
-    /// Supports standard glob patterns like "**/*.rs" or "frontend/src/**/*.ts".
+    /// Supports standard glob patterns like "**/*.rs" or "src/**/*.ts".
     /// If omitted, all files in the project will be searched.
-    ///
-    /// The glob pattern is matched against the full path including the project root directory.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - /a/b/backend
-    /// - /c/d/frontend
-    ///
-    /// Use "backend/**/*.rs" to search only Rust files in the backend root directory.
-    /// Use "frontend/src/**/*.ts" to search TypeScript files only in the frontend root directory (sub-directory "src").
-    /// Use "**/*.rs" to search Rust files across all root directories.
-    /// </example>
     pub include_pattern: Option<String>,
     /// Optional starting position for paginated results (0-based).
     /// When not provided, starts from the beginning.
@@ -145,7 +132,8 @@ impl AgentTool for GrepTool {
             let exclude_patterns = global_settings
                 .file_scan_exclusions
                 .sources()
-                .chain(global_settings.private_files.sources());
+                .iter()
+                .chain(global_settings.private_files.sources().iter());
 
             match PathMatcher::new(exclude_patterns, path_style) {
                 Ok(matcher) => matcher,
@@ -322,6 +310,7 @@ mod tests {
 
     use super::*;
     use gpui::{TestAppContext, UpdateGlobal};
+    use language::{Language, LanguageConfig, LanguageMatcher};
     use project::{FakeFs, Project};
     use serde_json::json;
     use settings::SettingsStore;
@@ -563,7 +552,7 @@ mod tests {
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
 
         project.update(cx, |project, _cx| {
-            project.languages().add(language::rust_lang())
+            project.languages().add(rust_lang().into())
         });
 
         project
@@ -792,6 +781,22 @@ mod tests {
         });
     }
 
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(include_str!("../../../languages/src/rust/outline.scm"))
+        .unwrap()
+    }
+
     #[gpui::test]
     async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
         init_test(cx);

crates/agent/src/tools/read_file_tool.rs

@@ -17,9 +17,6 @@ use crate::{AgentTool, Thread, ToolCallEventStream, outline};
 /// Reads the content of the given file in the project.
 ///
 /// - Never attempt to read a path that hasn't been previously mentioned.
-/// - For large files, this tool returns a file outline with symbol names and line numbers instead of the full content.
-///   This outline IS a successful response - use the line numbers to read specific sections with start_line/end_line.
-///   Do NOT retry reading the same file without line numbers if you receive an outline.
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ReadFileToolInput {
     /// The relative path of the file to read.
@@ -153,10 +150,14 @@ impl AgentTool for ReadFileTool {
 
         let file_path = input.path.clone();
 
-        event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
-                acp::ToolCallLocation::new(&abs_path)
-                    .line(input.start_line.map(|line| line.saturating_sub(1))),
-            ]));
+        event_stream.update_fields(ToolCallUpdateFields {
+            locations: Some(vec![acp::ToolCallLocation {
+                path: abs_path.clone(),
+                line: input.start_line.map(|line| line.saturating_sub(1)),
+                meta: None,
+            }]),
+            ..Default::default()
+        });
 
         if image_store::is_image_file(&self.project, &project_path, cx) {
             return cx.spawn(async move |cx| {
@@ -253,15 +254,16 @@ impl AgentTool for ReadFileTool {
 
                 if buffer_content.is_outline {
                     Ok(formatdoc! {"
-                        SUCCESS: File outline retrieved. This file is too large to read all at once, so the outline below shows the file's structure with line numbers.
-
-                        IMPORTANT: Do NOT retry this call without line numbers - you will get the same outline.
-                        Instead, use the line numbers below to read specific sections by calling this tool again with start_line and end_line parameters.
+                        This file was too big to read all at once.
 
                         {}
 
-                        NEXT STEPS: To read a specific symbol's implementation, call read_file with the same path plus start_line and end_line from the outline above.
-                        For example, to read a function shown as [L100-150], use start_line: 100 and end_line: 150.", buffer_content.text
+                        Using the line numbers in this outline, you can call this tool again
+                        while specifying the start_line and end_line fields to see the
+                        implementations of symbols in the outline.
+
+                        Alternatively, you can fall back to the `grep` tool (if available)
+                        to search the file for specific content.", buffer_content.text
                     }
                     .into())
                 } else {
@@ -273,9 +275,7 @@ impl AgentTool for ReadFileTool {
                 project.set_agent_location(
                     Some(AgentLocation {
                         buffer: buffer.downgrade(),
-                        position: anchor.unwrap_or_else(|| {
-                            text::Anchor::min_for_buffer(buffer.read(cx).remote_id())
-                        }),
+                        position: anchor.unwrap_or(text::Anchor::MIN),
                     }),
                     cx,
                 );
@@ -285,9 +285,12 @@ impl AgentTool for ReadFileTool {
                         text,
                     }
                     .to_string();
-                    event_stream.update_fields(ToolCallUpdateFields::new().content(vec![
-                        acp::ToolCallContent::Content(acp::Content::new(markdown)),
-                    ]));
+                    event_stream.update_fields(ToolCallUpdateFields {
+                        content: Some(vec![acp::ToolCallContent::Content {
+                            content: markdown.into(),
+                        }]),
+                        ..Default::default()
+                    })
                 }
             })?;
 
@@ -301,6 +304,7 @@ mod test {
     use super::*;
     use crate::{ContextServerRegistry, Templates, Thread};
     use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
+    use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
     use language_model::fake_provider::FakeLanguageModel;
     use project::{FakeFs, Project};
     use prompt_store::ProjectContext;
@@ -404,7 +408,7 @@ mod test {
         .await;
         let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
         let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(language::rust_lang());
+        language_registry.add(Arc::new(rust_lang()));
         let action_log = cx.new(|_| ActionLog::new(project.clone()));
         let context_server_registry =
             cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -434,7 +438,7 @@ mod test {
         let content = result.to_str().unwrap();
 
         assert_eq!(
-            content.lines().skip(7).take(6).collect::<Vec<_>>(),
+            content.lines().skip(4).take(6).collect::<Vec<_>>(),
             vec![
                 "struct Test0 [L1-4]",
                 " a [L2]",
@@ -469,7 +473,7 @@ mod test {
         pretty_assertions::assert_eq!(
             content
                 .lines()
-                .skip(7)
+                .skip(4)
                 .take(expected_content.len())
                 .collect::<Vec<_>>(),
             expected_content
@@ -594,6 +598,49 @@ mod test {
         });
     }
 
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_outline_query(
+            r#"
+            (line_comment) @annotation
+
+            (struct_item
+                "struct" @context
+                name: (_) @name) @item
+            (enum_item
+                "enum" @context
+                name: (_) @name) @item
+            (enum_variant
+                name: (_) @name) @item
+            (field_declaration
+                name: (_) @name) @item
+            (impl_item
+                "impl" @context
+                trait: (_)? @name
+                "for"? @context
+                type: (_) @name
+                body: (_ "{" (_)* "}")) @item
+            (function_item
+                "fn" @context
+                name: (_) @name) @item
+            (mod_item
+                "mod" @context
+                name: (_) @name) @item
+            "#,
+        )
+        .unwrap()
+    }
+
     #[gpui::test]
     async fn test_read_file_security(cx: &mut TestAppContext) {
         init_test(cx);

crates/agent/src/tools/terminal_tool.rs

@@ -1,7 +1,6 @@
 use agent_client_protocol as acp;
 use anyhow::Result;
-use futures::FutureExt as _;
-use gpui::{App, AppContext, Entity, SharedString, Task};
+use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -9,7 +8,6 @@ use std::{
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
-    time::Duration,
 };
 use util::markdown::MarkdownInlineCode;
 
@@ -27,17 +25,13 @@ const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
 ///
 /// Do not use this tool for commands that run indefinitely, such as servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers that don't terminate on their own.
 ///
-/// For potentially long-running commands, prefer specifying `timeout_ms` to bound runtime and prevent indefinite hangs.
-///
 /// Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct TerminalToolInput {
     /// The one-liner command to execute.
-    pub command: String,
+    command: String,
     /// Working directory for the command. This must be one of the root directories of the project.
-    pub cd: String,
-    /// Optional maximum runtime (in milliseconds). If exceeded, the running terminal task is killed.
-    pub timeout_ms: Option<u64>,
+    cd: String,
 }
 
 pub struct TerminalTool {
@@ -118,30 +112,12 @@ impl AgentTool for TerminalTool {
                 .await?;
 
             let terminal_id = terminal.id(cx)?;
-            event_stream.update_fields(acp::ToolCallUpdateFields::new().content(vec![
-                acp::ToolCallContent::Terminal(acp::Terminal::new(terminal_id)),
-            ]));
-
-            let timeout = input.timeout_ms.map(Duration::from_millis);
-
-            let exit_status = match timeout {
-                Some(timeout) => {
-                    let wait_for_exit = terminal.wait_for_exit(cx)?;
-                    let timeout_task = cx.background_spawn(async move {
-                        smol::Timer::after(timeout).await;
-                    });
-
-                    futures::select! {
-                        status = wait_for_exit.clone().fuse() => status,
-                        _ = timeout_task.fuse() => {
-                            terminal.kill(cx)?;
-                            wait_for_exit.await
-                        }
-                    }
-                }
-                None => terminal.wait_for_exit(cx)?.await,
-            };
+            event_stream.update_fields(acp::ToolCallUpdateFields {
+                content: Some(vec![acp::ToolCallContent::Terminal { terminal_id }]),
+                ..Default::default()
+            });
 
+            let exit_status = terminal.wait_for_exit(cx)?.await;
             let output = terminal.current_output(cx)?;
 
             Ok(process_content(output, &input.command, exit_status))

crates/agent/src/tools/thinking_tool.rs

@@ -43,8 +43,10 @@ impl AgentTool for ThinkingTool {
         event_stream: ToolCallEventStream,
         _cx: &mut App,
     ) -> Task<Result<String>> {
-        event_stream
-            .update_fields(acp::ToolCallUpdateFields::new().content(vec![input.content.into()]));
+        event_stream.update_fields(acp::ToolCallUpdateFields {
+            content: Some(vec![input.content.into()]),
+            ..Default::default()
+        });
         Task::ready(Ok("Finished thinking.".to_string()))
     }
 }

crates/agent/src/tools/web_search_tool.rs

@@ -76,8 +76,10 @@ impl AgentTool for WebSearchTool {
             let response = match search_task.await {
                 Ok(response) => response,
                 Err(err) => {
-                    event_stream
-                        .update_fields(acp::ToolCallUpdateFields::new().title("Web Search Failed"));
+                    event_stream.update_fields(acp::ToolCallUpdateFields {
+                        title: Some("Web Search Failed".to_string()),
+                        ..Default::default()
+                    });
                     return Err(err);
                 }
             };
@@ -105,23 +107,26 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
     } else {
         format!("{} results", response.results.len())
     };
-    event_stream.update_fields(
-        acp::ToolCallUpdateFields::new()
-            .title(format!("Searched the web: {result_text}"))
-            .content(
-                response
-                    .results
-                    .iter()
-                    .map(|result| {
-                        acp::ToolCallContent::Content(acp::Content::new(
-                            acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(result.title.clone(), result.url.clone())
-                                    .title(result.title.clone())
-                                    .description(result.text.clone()),
-                            ),
-                        ))
-                    })
-                    .collect::<Vec<_>>(),
-            ),
-    );
+    event_stream.update_fields(acp::ToolCallUpdateFields {
+        title: Some(format!("Searched the web: {result_text}")),
+        content: Some(
+            response
+                .results
+                .iter()
+                .map(|result| acp::ToolCallContent::Content {
+                    content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
+                        name: result.title.clone(),
+                        uri: result.url.clone(),
+                        title: Some(result.title.clone()),
+                        description: Some(result.text.clone()),
+                        mime_type: None,
+                        annotations: None,
+                        size: None,
+                        meta: None,
+                    }),
+                })
+                .collect(),
+        ),
+        ..Default::default()
+    });
 }

crates/agent_servers/src/acp.rs

@@ -9,8 +9,6 @@ use futures::io::BufReader;
 use project::Project;
 use project::agent_server_store::AgentServerCommand;
 use serde::Deserialize;
-use settings::Settings as _;
-use task::ShellBuilder;
 use util::ResultExt as _;
 
 use std::path::PathBuf;
@@ -23,7 +21,7 @@ use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntit
 
 use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
 use terminal::TerminalBuilder;
-use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
+use terminal::terminal_settings::{AlternateScroll, CursorShape};
 
 #[derive(Debug, Error)]
 #[error("Unsupported version")]
@@ -31,13 +29,12 @@ pub struct UnsupportedVersion;
 
 pub struct AcpConnection {
     server_name: SharedString,
-    telemetry_id: SharedString,
+    telemetry_id: &'static str,
     connection: Rc<acp::ClientSideConnection>,
     sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
     auth_methods: Vec<acp::AuthMethod>,
     agent_capabilities: acp::AgentCapabilities,
     default_mode: Option<acp::SessionModeId>,
-    default_model: Option<acp::ModelId>,
     root_dir: PathBuf,
     // NB: Don't move this into the wait_task, since we need to ensure the process is
     // killed on drop (setting kill_on_drop on the command seems to not always work).
@@ -56,19 +53,19 @@ pub struct AcpSession {
 
 pub async fn connect(
     server_name: SharedString,
+    telemetry_id: &'static str,
     command: AgentServerCommand,
     root_dir: &Path,
     default_mode: Option<acp::SessionModeId>,
-    default_model: Option<acp::ModelId>,
     is_remote: bool,
     cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
     let conn = AcpConnection::stdio(
         server_name,
+        telemetry_id,
         command.clone(),
         root_dir,
         default_mode,
-        default_model,
         is_remote,
         cx,
     )
@@ -76,23 +73,21 @@ pub async fn connect(
     Ok(Rc::new(conn) as _)
 }
 
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
+const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
 
 impl AcpConnection {
     pub async fn stdio(
         server_name: SharedString,
+        telemetry_id: &'static str,
         command: AgentServerCommand,
         root_dir: &Path,
         default_mode: Option<acp::SessionModeId>,
-        default_model: Option<acp::ModelId>,
         is_remote: bool,
         cx: &mut AsyncApp,
     ) -> Result<Self> {
-        let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone())?;
-        let builder = ShellBuilder::new(&shell, cfg!(windows)).non_interactive();
-        let mut child =
-            builder.build_command(Some(command.path.display().to_string()), &command.args);
+        let mut child = util::command::new_smol_command(&command.path);
         child
+            .args(command.args.iter().map(|arg| arg.as_str()))
             .envs(command.env.iter().flatten())
             .stdin(std::process::Stdio::piped())
             .stdout(std::process::Stdio::piped())
@@ -175,38 +170,34 @@ impl AcpConnection {
         })?;
 
         let response = connection
-            .initialize(
-                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
-                    .client_capabilities(
-                        acp::ClientCapabilities::new()
-                            .fs(acp::FileSystemCapability::new()
-                                .read_text_file(true)
-                                .write_text_file(true))
-                            .terminal(true)
-                            // Experimental: Allow for rendering terminal output from the agents
-                            .meta(acp::Meta::from_iter([
-                                ("terminal_output".into(), true.into()),
-                                ("terminal-auth".into(), true.into()),
-                            ])),
-                    )
-                    .client_info(
-                        acp::Implementation::new("zed", version)
-                            .title(release_channel.map(ToOwned::to_owned)),
-                    ),
-            )
+            .initialize(acp::InitializeRequest {
+                protocol_version: acp::VERSION,
+                client_capabilities: acp::ClientCapabilities {
+                    fs: acp::FileSystemCapability {
+                        read_text_file: true,
+                        write_text_file: true,
+                        meta: None,
+                    },
+                    terminal: true,
+                    meta: Some(serde_json::json!({
+                        // Experimental: Allow for rendering terminal output from the agents
+                        "terminal_output": true,
+                        "terminal-auth": true,
+                    })),
+                },
+                client_info: Some(acp::Implementation {
+                    name: "zed".to_owned(),
+                    title: release_channel.map(|c| c.to_owned()),
+                    version,
+                }),
+                meta: None,
+            })
             .await?;
 
         if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
             return Err(UnsupportedVersion.into());
         }
 
-        let telemetry_id = response
-            .agent_info
-            // Use the one the agent provides if we have one
-            .map(|info| info.name.into())
-            // Otherwise, just use the name
-            .unwrap_or_else(|| server_name.clone());
-
         Ok(Self {
             auth_methods: response.auth_methods,
             root_dir: root_dir.to_owned(),
@@ -216,7 +207,6 @@ impl AcpConnection {
             sessions,
             agent_capabilities: response.agent_capabilities,
             default_mode,
-            default_model,
             _io_task: io_task,
             _wait_task: wait_task,
             _stderr_task: stderr_task,
@@ -241,8 +231,8 @@ impl Drop for AcpConnection {
 }
 
 impl AgentConnection for AcpConnection {
-    fn telemetry_id(&self) -> SharedString {
-        self.telemetry_id.clone()
+    fn telemetry_id(&self) -> &'static str {
+        self.telemetry_id
     }
 
     fn new_thread(
@@ -255,7 +245,6 @@ impl AgentConnection for AcpConnection {
         let conn = self.connection.clone();
         let sessions = self.sessions.clone();
         let default_mode = self.default_mode.clone();
-        let default_model = self.default_model.clone();
         let cwd = cwd.to_path_buf();
         let context_server_store = project.read(cx).context_server_store().read(cx);
         let mcp_servers = if project.read(cx).is_local() {
@@ -264,37 +253,23 @@ impl AgentConnection for AcpConnection {
                 .iter()
                 .filter_map(|id| {
                     let configuration = context_server_store.configuration_for_server(id)?;
-                    match &*configuration {
-                        project::context_server_store::ContextServerConfiguration::Custom {
-                            command,
-                            ..
-                        }
-                        | project::context_server_store::ContextServerConfiguration::Extension {
-                            command,
-                            ..
-                        } => Some(acp::McpServer::Stdio(
-                            acp::McpServerStdio::new(id.0.to_string(), &command.path)
-                                .args(command.args.clone())
-                                .env(if let Some(env) = command.env.as_ref() {
-                                    env.iter()
-                                        .map(|(name, value)| acp::EnvVariable::new(name, value))
-                                        .collect()
-                                } else {
-                                    vec![]
-                                }),
-                        )),
-                        project::context_server_store::ContextServerConfiguration::Http {
-                            url,
-                            headers,
-                        } => Some(acp::McpServer::Http(
-                            acp::McpServerHttp::new(id.0.to_string(), url.to_string()).headers(
-                                headers
-                                    .iter()
-                                    .map(|(name, value)| acp::HttpHeader::new(name, value))
-                                    .collect(),
-                            ),
-                        )),
-                    }
+                    let command = configuration.command();
+                    Some(acp::McpServer::Stdio {
+                        name: id.0.to_string(),
+                        command: command.path.clone(),
+                        args: command.args.clone(),
+                        env: if let Some(env) = command.env.as_ref() {
+                            env.iter()
+                                .map(|(name, value)| acp::EnvVariable {
+                                    name: name.clone(),
+                                    value: value.clone(),
+                                    meta: None,
+                                })
+                                .collect()
+                        } else {
+                            vec![]
+                        },
+                    })
                 })
                 .collect()
         } else {
@@ -306,13 +281,13 @@ impl AgentConnection for AcpConnection {
 
         cx.spawn(async move |cx| {
             let response = conn
-                .new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
+                .new_session(acp::NewSessionRequest { mcp_servers, cwd, meta: None })
                 .await
                 .map_err(|err| {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                         let mut error = AuthRequired::new();
 
-                        if err.message != acp::ErrorCode::AuthRequired.to_string() {
+                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
                             error = error.with_description(err.message);
                         }
 
@@ -337,9 +312,12 @@ impl AgentConnection for AcpConnection {
                             let default_mode = default_mode.clone();
                             let session_id = response.session_id.clone();
                             let modes = modes.clone();
-                            let conn = conn.clone();
                             async move |_| {
-                                let result = conn.set_session_mode(acp::SetSessionModeRequest::new(session_id, default_mode))
+                                let result = conn.set_session_mode(acp::SetSessionModeRequest {
+                                    session_id,
+                                    mode_id: default_mode,
+                                    meta: None,
+                                })
                                 .await.log_err();
 
                                 if result.is_none() {
@@ -368,49 +346,6 @@ impl AgentConnection for AcpConnection {
                 }
             }
 
-            if let Some(default_model) = default_model {
-                if let Some(models) = models.as_ref() {
-                    let mut models_ref = models.borrow_mut();
-                    let has_model = models_ref.available_models.iter().any(|model| model.model_id == default_model);
-
-                    if has_model {
-                        let initial_model_id = models_ref.current_model_id.clone();
-
-                        cx.spawn({
-                            let default_model = default_model.clone();
-                            let session_id = response.session_id.clone();
-                            let models = models.clone();
-                            let conn = conn.clone();
-                            async move |_| {
-                                let result = conn.set_session_model(acp::SetSessionModelRequest::new(session_id, default_model))
-                                .await.log_err();
-
-                                if result.is_none() {
-                                    models.borrow_mut().current_model_id = initial_model_id;
-                                }
-                            }
-                        }).detach();
-
-                        models_ref.current_model_id = default_model;
-                    } else {
-                        let available_models = models_ref
-                            .available_models
-                            .iter()
-                            .map(|model| format!("- `{}`: {}", model.model_id, model.name))
-                            .collect::<Vec<_>>()
-                            .join("\n");
-
-                        log::warn!(
-                            "`{default_model}` is not a valid {name} model. Available options:\n{available_models}",
-                        );
-                    }
-                } else {
-                    log::warn!(
-                        "`{name}` does not support model selection, but `default_model` was set in settings.",
-                    );
-                }
-            }
-
             let session_id = response.session_id;
             let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
             let thread = cx.new(|cx| {
@@ -446,8 +381,12 @@ impl AgentConnection for AcpConnection {
     fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
         let conn = self.connection.clone();
         cx.foreground_executor().spawn(async move {
-            conn.authenticate(acp::AuthenticateRequest::new(method_id))
-                .await?;
+            conn.authenticate(acp::AuthenticateRequest {
+                method_id: method_id.clone(),
+                meta: None,
+            })
+            .await?;
+
             Ok(())
         })
     }
@@ -474,11 +413,11 @@ impl AgentConnection for AcpConnection {
             match result {
                 Ok(response) => Ok(response),
                 Err(err) => {
-                    if err.code == acp::ErrorCode::AuthRequired {
+                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                         return Err(anyhow!(acp::Error::auth_required()));
                     }
 
-                    if err.code != ErrorCode::InternalError {
+                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                         anyhow::bail!(err)
                     }
 
@@ -501,7 +440,10 @@ impl AgentConnection for AcpConnection {
                                 && (details.contains("This operation was aborted")
                                     || details.contains("The user aborted a request"))
                             {
-                                Ok(acp::PromptResponse::new(acp::StopReason::Cancelled))
+                                Ok(acp::PromptResponse {
+                                    stop_reason: acp::StopReason::Cancelled,
+                                    meta: None,
+                                })
                             } else {
                                 Err(anyhow!(details))
                             }
@@ -518,7 +460,10 @@ impl AgentConnection for AcpConnection {
             session.suppress_abort_err = true;
         }
         let conn = self.connection.clone();
-        let params = acp::CancelNotification::new(session_id.clone());
+        let params = acp::CancelNotification {
+            session_id: session_id.clone(),
+            meta: None,
+        };
         cx.foreground_executor()
             .spawn(async move { conn.cancel(params).await })
             .detach();
@@ -599,7 +544,11 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
         let state = self.state.clone();
         cx.foreground_executor().spawn(async move {
             let result = connection
-                .set_session_mode(acp::SetSessionModeRequest::new(session_id, mode_id))
+                .set_session_mode(acp::SetSessionModeRequest {
+                    session_id,
+                    mode_id,
+                    meta: None,
+                })
                 .await;
 
             if result.is_err() {
@@ -658,7 +607,11 @@ impl acp_thread::AgentModelSelector for AcpModelSelector {
         let state = self.state.clone();
         cx.foreground_executor().spawn(async move {
             let result = connection
-                .set_session_model(acp::SetSessionModelRequest::new(session_id, model_id))
+                .set_session_model(acp::SetSessionModelRequest {
+                    session_id,
+                    model_id,
+                    meta: None,
+                })
                 .await;
 
             if result.is_err() {
@@ -720,7 +673,10 @@ impl acp::Client for ClientDelegate {
 
         let outcome = task.await;
 
-        Ok(acp::RequestPermissionResponse::new(outcome))
+        Ok(acp::RequestPermissionResponse {
+            outcome,
+            meta: None,
+        })
     }
 
     async fn write_text_file(
@@ -752,7 +708,10 @@ impl acp::Client for ClientDelegate {
 
         let content = task.await?;
 
-        Ok(acp::ReadTextFileResponse::new(content))
+        Ok(acp::ReadTextFileResponse {
+            content,
+            meta: None,
+        })
     }
 
     async fn session_notification(
@@ -787,7 +746,7 @@ impl acp::Client for ClientDelegate {
                 if let Some(terminal_info) = meta.get("terminal_info") {
                     if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
                     {
-                        let terminal_id = acp::TerminalId::new(id_str);
+                        let terminal_id = acp::TerminalId(id_str.into());
                         let cwd = terminal_info
                             .get("cwd")
                             .and_then(|v| v.as_str().map(PathBuf::from));
@@ -803,7 +762,7 @@ impl acp::Client for ClientDelegate {
                             let lower = cx.new(|cx| builder.subscribe(cx));
                             thread.on_terminal_provider_event(
                                 TerminalProviderEvent::Created {
-                                    terminal_id,
+                                    terminal_id: terminal_id.clone(),
                                     label: tc.title.clone(),
                                     cwd,
                                     output_byte_limit: None,
@@ -828,12 +787,15 @@ impl acp::Client for ClientDelegate {
             if let Some(meta) = &tcu.meta {
                 if let Some(term_out) = meta.get("terminal_output") {
                     if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
+                        let terminal_id = acp::TerminalId(id_str.into());
                         if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
                             let data = s.as_bytes().to_vec();
                             let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
                                 thread.on_terminal_provider_event(
-                                    TerminalProviderEvent::Output { terminal_id, data },
+                                    TerminalProviderEvent::Output {
+                                        terminal_id: terminal_id.clone(),
+                                        data,
+                                    },
                                     cx,
                                 );
                             });
@@ -844,24 +806,21 @@ impl acp::Client for ClientDelegate {
                 // terminal_exit
                 if let Some(term_exit) = meta.get("terminal_exit") {
                     if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
-                        let status = acp::TerminalExitStatus::new()
-                            .exit_code(
-                                term_exit
-                                    .get("exit_code")
-                                    .and_then(|v| v.as_u64())
-                                    .map(|i| i as u32),
-                            )
-                            .signal(
-                                term_exit
-                                    .get("signal")
-                                    .and_then(|v| v.as_str().map(|s| s.to_string())),
-                            );
-
+                        let terminal_id = acp::TerminalId(id_str.into());
+                        let status = acp::TerminalExitStatus {
+                            exit_code: term_exit
+                                .get("exit_code")
+                                .and_then(|v| v.as_u64())
+                                .map(|i| i as u32),
+                            signal: term_exit
+                                .get("signal")
+                                .and_then(|v| v.as_str().map(|s| s.to_string())),
+                            meta: None,
+                        };
                         let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
                             thread.on_terminal_provider_event(
                                 TerminalProviderEvent::Exit {
-                                    terminal_id,
+                                    terminal_id: terminal_id.clone(),
                                     status,
                                 },
                                 cx,
@@ -898,7 +857,7 @@ impl acp::Client for ClientDelegate {
         // Register with renderer
         let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
             thread.register_terminal_created(
-                acp::TerminalId::new(uuid::Uuid::new_v4().to_string()),
+                acp::TerminalId(uuid::Uuid::new_v4().to_string().into()),
                 format!("{} {}", args.command, args.args.join(" ")),
                 args.cwd.clone(),
                 args.output_byte_limit,
@@ -908,7 +867,10 @@ impl acp::Client for ClientDelegate {
         })?;
         let terminal_id =
             terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone())?;
-        Ok(acp::CreateTerminalResponse::new(terminal_id))
+        Ok(acp::CreateTerminalResponse {
+            terminal_id,
+            meta: None,
+        })
     }
 
     async fn kill_terminal_command(
@@ -969,7 +931,10 @@ impl acp::Client for ClientDelegate {
             })??
             .await;
 
-        Ok(acp::WaitForTerminalExitResponse::new(exit_status))
+        Ok(acp::WaitForTerminalExitResponse {
+            exit_status,
+            meta: None,
+        })
     }
 }
 

crates/agent_servers/src/agent_servers.rs

@@ -56,6 +56,7 @@ impl AgentServerDelegate {
 pub trait AgentServer: Send {
     fn logo(&self) -> ui::IconName;
     fn name(&self) -> SharedString;
+    fn telemetry_id(&self) -> &'static str;
     fn default_mode(&self, _cx: &mut App) -> Option<agent_client_protocol::SessionModeId> {
         None
     }
@@ -67,18 +68,6 @@ pub trait AgentServer: Send {
     ) {
     }
 
-    fn default_model(&self, _cx: &mut App) -> Option<agent_client_protocol::ModelId> {
-        None
-    }
-
-    fn set_default_model(
-        &self,
-        _model_id: Option<agent_client_protocol::ModelId>,
-        _fs: Arc<dyn Fs>,
-        _cx: &mut App,
-    ) {
-    }
-
     fn connect(
         &self,
         root_dir: Option<&Path>,

crates/agent_servers/src/claude.rs

@@ -22,6 +22,10 @@ pub struct AgentServerLoginCommand {
 }
 
 impl AgentServer for ClaudeCode {
+    fn telemetry_id(&self) -> &'static str {
+        "claude-code"
+    }
+
     fn name(&self) -> SharedString {
         "Claude Code".into()
     }
@@ -37,7 +41,7 @@ impl AgentServer for ClaudeCode {
 
         settings
             .as_ref()
-            .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
+            .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
     }
 
     fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
@@ -51,27 +55,6 @@ impl AgentServer for ClaudeCode {
         });
     }
 
-    fn default_model(&self, cx: &mut App) -> Option<acp::ModelId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).claude.clone()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
-    }
-
-    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .claude
-                .get_or_insert_default()
-                .default_model = model_id.map(|m| m.to_string())
-        });
-    }
-
     fn connect(
         &self,
         root_dir: Option<&Path>,
@@ -79,12 +62,12 @@ impl AgentServer for ClaudeCode {
         cx: &mut App,
     ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
         let name = self.name();
+        let telemetry_id = self.telemetry_id();
         let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
         let is_remote = delegate.project.read(cx).is_via_remote_server();
         let store = delegate.store.downgrade();
         let extra_env = load_proxy_env(cx);
         let default_mode = self.default_mode(cx);
-        let default_model = self.default_model(cx);
 
         cx.spawn(async move |cx| {
             let (command, root_dir, login) = store
@@ -103,10 +86,10 @@ impl AgentServer for ClaudeCode {
                 .await?;
             let connection = crate::acp::connect(
                 name,
+                telemetry_id,
                 command,
                 root_dir.as_ref(),
                 default_mode,
-                default_model,
                 is_remote,
                 cx,
             )