zeta: Do not show usage for copilot/supermaven (#30563)

Follow up to #29952

Release Notes:

- Fix an issue where zeta usage would show up when using Copilot as an
edit prediction provider

.cargo/config.toml

@@ -13,6 +13,12 @@ rustflags = ["-C", "link-arg=-fuse-ld=mold"]
 linker = "clang"
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]
 
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-args=-all_load"]
+
+[target.x86_64-apple-darwin]
+rustflags = ["-C", "link-args=-all_load"]
+
 [target.'cfg(target_os = "windows")']
 rustflags = [
     "--cfg",

.git-blame-ignore-revs

@@ -30,7 +30,3 @@ ffdda588b41f7d9d270ffe76cab116f828ad545e
 # 2024-07-05 Improved formatting of default keymaps (single line per bind)
 # https://github.com/zed-industries/zed/pull/13887
 813cc3f5e537372fc86720b5e71b6e1c815440ab
-
-# 2024-07-24 docs: Format docs
-# https://github.com/zed-industries/zed/pull/15352
-3a44a59f8ec114ac1ba22f7da1652717ef7e4e5c

.github/ISSUE_TEMPLATE/01_bug_agent.yml

@@ -1,8 +1,8 @@
-name: Bug Report (Debugger)
-description: Zed Debugger-Related Bugs
+name: Bug Report (Agent Panel)
+description: Zed Agent Panel Bugs
 type: "Bug"
-labels: ["debugger"]
-title: "Debugger: <a short description of the Debugger bug>"
+labels: ["agent", "ai"]
+title: "Agent Panel: <a short description of the Agent Panel bug>"
 body:
   - type: textarea
     attributes:
@@ -14,6 +14,7 @@ body:
 
         ### Description
         <!--  Describe with sufficient detail to reproduce from a clean Zed install. -->
+        <!--  Please include the LLM provider and model name you are using -->
         Steps to trigger the problem:
         1.
         2.
@@ -21,15 +22,15 @@ body:
 
         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"'
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
       placeholder: |
-        Output of "zed: copy system specs into clipboard"
+        Output of "zed: Copy System Specs Into Clipboard"
     validations:
       required: true

.github/ISSUE_TEMPLATE/01_bug_ai.yml

@@ -1,42 +0,0 @@
-name: Bug Report (AI Related)
-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.
-
-        Actual Behavior:
-        Expected 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)
-        - MCP Servers in-use:
-        - Other Details:
-    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

.github/ISSUE_TEMPLATE/02_bug_edit_predictions.yml

@@ -29,8 +29,8 @@ body:
     id: environment
     attributes:
       label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
       placeholder: |
-        Output of "zed: copy system specs into clipboard"
+        Output of "zed: Copy System Specs Into Clipboard"
     validations:
       required: true

.github/ISSUE_TEMPLATE/03_bug_git.yml

@@ -28,8 +28,8 @@ body:
     id: environment
     attributes:
       label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
       placeholder: |
-        Output of "zed: copy system specs into clipboard"
+        Output of "zed: Copy System Specs Into Clipboard"
     validations:
       required: true

.github/ISSUE_TEMPLATE/10_bug_report.yml

@@ -49,8 +49,8 @@ body:
     attributes:
       label: Zed Version and System Specs
       description: |
-        Open Zed, from the command palette select "zed: copy system specs into clipboard"
+        Open Zed, from the command palette select "zed: Copy System Specs Into Clipboard"
       placeholder: |
-        Output of "zed: copy system specs into clipboard"
+        Output of "zed: Copy System Specs Into Clipboard"
     validations:
       required: true

.github/ISSUE_TEMPLATE/11_crash_report.yml

@@ -26,9 +26,9 @@ body:
     id: environment
     attributes:
       label: Zed Version and System Specs
-      description: 'Open Zed, and in the command palette select "zed: copy system specs into clipboard"'
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
       placeholder: |
-        Output of "zed: copy system specs into clipboard"
+        Output of "zed: Copy System Specs Into Clipboard"
     validations:
       required: true
   - type: textarea

.github/workflows/ci.yml

@@ -482,9 +482,7 @@ jobs:
       - macos_tests
       - windows_clippy
       - windows_tests
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      always()
+    if: always()
     steps:
       - name: Check all tests passed
         run: |
@@ -526,6 +524,7 @@ jobs:
       APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
       APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
@@ -612,6 +611,7 @@ jobs:
     needs: [linux_tests]
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
@@ -669,6 +669,7 @@ jobs:
     needs: [linux_tests]
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
     steps:
@@ -716,13 +717,49 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   nix-build:
-    name: Build with Nix
-    uses: ./.github/workflows/nix.yml
+    timeout-minutes: 60
+    name: Nix Build
+    continue-on-error: true
     if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
-    with:
-      flake-output: debug
-      # excludes the final package to only cache dependencies
-      cachix-filter: "-zed-editor-[0-9.]*-nightly"
+    strategy:
+      fail-fast: false
+      matrix:
+        system:
+          - os: x86 Linux
+            runner: buildjet-16vcpu-ubuntu-2204
+            install_nix: true
+          - os: arm Mac
+            runner: [macOS, ARM64, test]
+            install_nix: false
+    runs-on: ${{ matrix.system.runner }}
+    env:
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
+      GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+      - name: Set path
+        if: ${{ ! matrix.system.install_nix }}
+        run: |
+          echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
+          echo "/Users/administrator/.nix-profile/bin" >> $GITHUB_PATH
+
+      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        if: ${{ matrix.system.install_nix }}
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          name: zed-industries
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          skipPush: true
+      - run: nix build .#debug
+      - name: Limit /nix/store to 50GB
+        run: "[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d"
 
   auto-release-preview:
     name: Auto release preview

.github/workflows/nix.yml

@@ -1,66 +0,0 @@
-name: "Nix build"
-
-on:
-  workflow_call:
-    inputs:
-      flake-output:
-        type: string
-        default: "default"
-      cachix-filter:
-        type: string
-        default: ""
-
-jobs:
-  nix-build:
-    timeout-minutes: 60
-    name: (${{ matrix.system.os }}) Nix Build
-    continue-on-error: true # TODO: remove when we want this to start blocking CI
-    strategy:
-      fail-fast: false
-      matrix:
-        system:
-          - os: x86 Linux
-            runner: buildjet-16vcpu-ubuntu-2204
-            install_nix: true
-          - os: arm Mac
-            runner: [macOS, ARM64, test]
-            install_nix: false
-    if: github.repository_owner == 'zed-industries'
-    runs-on: ${{ matrix.system.runner }}
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      # on our macs we manually install nix. for some reason the cachix action is running
-      # under a non-login /bin/bash shell which doesn't source the proper script to add the
-      # nix profile to PATH, so we manually add them here
-      - name: Set path
-        if: ${{ ! matrix.system.install_nix }}
-        run: |
-          echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
-          echo "/Users/administrator/.nix-profile/bin" >> $GITHUB_PATH
-
-      - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
-        if: ${{ matrix.system.install_nix }}
-        with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
-        with:
-          name: zed
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          pushFilter: "${{ inputs.cachix-filter }}"
-          cachixArgs: '-v'
-
-      - run: nix build .#${{ inputs.flake-output }} -L --accept-flake-config
-
-      - name: Limit /nix/store to 50GB on macs
-        if: ${{ ! matrix.system.install_nix }}
-        run: |
-          [ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d || :

.github/workflows/release_nightly.yml

@@ -68,6 +68,7 @@ jobs:
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
     steps:
       - name: Install Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
@@ -103,6 +104,7 @@ jobs:
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -142,6 +144,7 @@ jobs:
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -167,11 +170,6 @@ jobs:
       - name: Upload Zed Nightly
         run: script/upload-nightly linux-targz
 
-  bundle-nix:
-    name: Build and cache Nix package
-    needs: tests
-    uses: ./.github/workflows/nix.yml
-
   update-nightly-tag:
     name: Update nightly tag
     if: github.repository_owner == 'zed-industries'

.gitignore

@@ -2,7 +2,6 @@
 **/cargo-target
 **/target
 **/venv
-**/.direnv
 *.wasm
 *.xcodeproj
 .DS_Store

.mailmap

@@ -19,8 +19,6 @@ amtoaer <amtoaer@gmail.com>
 amtoaer <amtoaer@gmail.com> <amtoaer@outlook.com>
 Andrei Zvonimir Crnković <andrei@0x7f.dev>
 Andrei Zvonimir Crnković <andrei@0x7f.dev> <andreicek@0x7f.dev>
-Angelk90 <angelo.k90@hotmail.it>
-Angelk90 <angelo.k90@hotmail.it> <20476002+Angelk90@users.noreply.github.com>
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Ben Kunkle <ben@zed.dev>
@@ -40,8 +38,6 @@ Dairon Medina <dairon.medina@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
 Edwin Aronsson <75266237+4teapo@users.noreply.github.com>
-Elvis Pranskevichus <elvis@geldata.com>
-Elvis Pranskevichus <elvis@geldata.com> <elvis@magic.io>
 Evren Sen <nervenes@icloud.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrensen467@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrsen@users.noreply.github.com>
@@ -73,8 +69,6 @@ Lilith Iris <itslirissama@gmail.com> <83819417+Irilith@users.noreply.github.com>
 LoganDark <contact@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
-Marko Kungla <marko.kungla@gmail.com>
-Marko Kungla <marko.kungla@gmail.com> <marko@mkungla.dev>
 Marshall Bowers <git@maxdeviant.com>
 Marshall Bowers <git@maxdeviant.com> <elliott.codes@gmail.com>
 Marshall Bowers <git@maxdeviant.com> <marshall@zed.dev>
@@ -90,7 +84,6 @@ Michael Sloan <michael@zed.dev> <mgsloan@google.com>
 Mikayla Maki <mikayla@zed.dev>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
-Morgan Krey <morgan@zed.dev>
 Muhammad Talal Anwar <mail@talal.io>
 Muhammad Talal Anwar <mail@talal.io> <talalanwar@outlook.com>
 Nate Butler <iamnbutler@gmail.com>
@@ -123,18 +116,11 @@ Shish <webmaster@shishnet.org>
 Shish <webmaster@shishnet.org> <shish@shishnet.org>
 Smit Barmase <0xtimsb@gmail.com>
 Smit Barmase <0xtimsb@gmail.com> <smit@zed.dev>
-Thomas <github.thomaub@gmail.com>
-Thomas <github.thomaub@gmail.com> <thomas.aubry94@gmail.com>
-Thomas <github.thomaub@gmail.com> <thomas.aubry@paylead.fr>
-Thomas Heartman <thomasheartman+github@gmail.com>
-Thomas Heartman <thomasheartman+github@gmail.com> <thomas@getunleash.io>
-Thomas Mickley-Doyle <tmickleydoyle@gmail.com>
-Thomas Mickley-Doyle <tmickleydoyle@gmail.com> <thomas@zed.dev>
 Thorben Kröger <dev@thorben.net>
 Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
-Thorsten Ball <mrnugget@gmail.com>
-Thorsten Ball <mrnugget@gmail.com> <me@thorstenball.com>
-Thorsten Ball <mrnugget@gmail.com> <thorsten@zed.dev>
+Thorsten Ball <thorsten@zed.dev>
+Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
+Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
 Tristan Hume <tris.hume@gmail.com>
 Tristan Hume <tris.hume@gmail.com> <tristan@anthropic.com>
 Uladzislau Kaminski <i@uladkaminski.com>

.rules

@@ -115,7 +115,7 @@ Other entities can then register a callback to handle these events by doing `cx.
 GPUI has had some changes to its APIs. Always write code using the new APIs:
 
 * `spawn` methods now take async closures (`AsyncFn`), and so should be called like `cx.spawn(async move |cx| ...)`.
-* Use `Entity<T>`. This replaces `Model<T>` and `View<T>` which no longer exist and should NEVER be used.
+* Use `Entity<T>`. This replaces `Model<T>` and `View<T>` which longer exists and should NEVER be used.
 * Use `App` references. This replaces `AppContext` which no longer exists and should NEVER be used.
 * Use `Context<T>` references. This replaces `ModelContext<T>` which no longer exists and should NEVER be used.
 * `Window` is now passed around explicitly. The new interface adds a `Window` reference parameter to some methods, and adds some new "*_in" methods for plumbing `Window`. The old types `WindowContext` and `ViewContext<T>` should NEVER be used.

.zed/debug.json

@@ -2,11 +2,18 @@
   {
     "label": "Debug Zed (CodeLLDB)",
     "adapter": "CodeLLDB",
-    "build": { "label": "Build Zed", "command": "cargo", "args": ["build"] }
+    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
+    "request": "launch",
+    "cwd": "$ZED_WORKTREE_ROOT"
   },
   {
     "label": "Debug Zed (GDB)",
     "adapter": "GDB",
-    "build": { "label": "Build Zed", "command": "cargo", "args": ["build"] }
+    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
+    "request": "launch",
+    "cwd": "$ZED_WORKTREE_ROOT",
+    "initialize_args": {
+      "stopAtBeginningOfMainSubprogram": true
+    }
   }
 ]

Cargo.toml

@@ -3,11 +3,11 @@ resolver = "2"
 members = [
     "crates/activity_indicator",
     "crates/agent",
-    "crates/agent_settings",
     "crates/anthropic",
     "crates/askpass",
     "crates/assets",
     "crates/assistant_context_editor",
+    "crates/assistant_settings",
     "crates/assistant_slash_command",
     "crates/assistant_slash_commands",
     "crates/assistant_tool",
@@ -31,13 +31,13 @@ members = [
     "crates/command_palette",
     "crates/command_palette_hooks",
     "crates/component",
+    "crates/component_preview",
     "crates/context_server",
     "crates/copilot",
     "crates/credentials_provider",
     "crates/dap",
     "crates/dap_adapters",
     "crates/db",
-    "crates/debug_adapter_extension",
     "crates/debugger_tools",
     "crates/debugger_ui",
     "crates/deepseek",
@@ -73,14 +73,12 @@ members = [
     "crates/indexed_docs",
     "crates/inline_completion",
     "crates/inline_completion_button",
-    "crates/inspector_ui",
     "crates/install_cli",
-    "crates/jj",
-    "crates/jj_ui",
     "crates/journal",
     "crates/language",
     "crates/language_extension",
     "crates/language_model",
+    "crates/language_model_selector",
     "crates/language_models",
     "crates/language_selector",
     "crates/language_tools",
@@ -211,12 +209,12 @@ edition = "2024"
 
 activity_indicator = { path = "crates/activity_indicator" }
 agent = { path = "crates/agent" }
-agent_settings = { path = "crates/agent_settings" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
+assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 assistant_tool = { path = "crates/assistant_tool" }
@@ -240,13 +238,13 @@ collections = { path = "crates/collections" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
+component_preview = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
 copilot = { path = "crates/copilot" }
 credentials_provider = { path = "crates/credentials_provider" }
 dap = { path = "crates/dap" }
 dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
-debug_adapter_extension = { path = "crates/debug_adapter_extension" }
 debugger_tools = { path = "crates/debugger_tools" }
 debugger_ui = { path = "crates/debugger_ui" }
 deepseek = { path = "crates/deepseek" }
@@ -280,14 +278,12 @@ image_viewer = { path = "crates/image_viewer" }
 indexed_docs = { path = "crates/indexed_docs" }
 inline_completion = { path = "crates/inline_completion" }
 inline_completion_button = { path = "crates/inline_completion_button" }
-inspector_ui = { path = "crates/inspector_ui" }
 install_cli = { path = "crates/install_cli" }
-jj = { path = "crates/jj" }
-jj_ui = { path = "crates/jj_ui" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
 language_extension = { path = "crates/language_extension" }
 language_model = { path = "crates/language_model" }
+language_model_selector = { path = "crates/language_model_selector" }
 language_models = { path = "crates/language_models" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
@@ -414,9 +410,9 @@ aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -430,9 +426,8 @@ convert_case = "0.8.0"
 core-foundation = "0.10.0"
 core-foundation-sys = "0.8.6"
 core-video = { version = "0.4.3", features = ["metal"] }
-criterion = { version = "0.5", features = ["html_reports"] }
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "68516de327fa1be15214133a0a2e52a12982ce75" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "be69a016ba710191b9fdded28c8b042af4b617f7" }
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
@@ -449,7 +444,6 @@ futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
-hashbrown = "0.15.3"
 handlebars = "4.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
@@ -464,8 +458,6 @@ indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
-jj-lib = { git = "https://github.com/jj-vcs/jj", rev = "e18eb8e05efaa153fad5ef46576af145bba1807f" }
-json_dotpath = "1.1"
 jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
@@ -473,13 +465,13 @@ jupyter-websocket-client = {  git = "https://github.com/ConradIrwin/runtimed" ,r
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
+linkme = "0.3.31"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "c9c189f1c5dd53c624a419ce35bc77ad6a908d18" }
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
 mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
-moka = { version = "0.12.10", features = ["sync"] }
-naga = { version = "25.0", features = ["wgsl-in"] }
+naga = { version = "23.1.0", features = ["wgsl-in"] }
 nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
@@ -553,13 +545,13 @@ streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.0", features = ["derive"] }
 subtle = "2.5.0"
-syn = { version = "2.0.101", features = ["full", "extra-traits"] }
+syn = { version = "1.0.72", features = ["full", "extra-traits"] }
 sys-locale = "0.3.1"
 sysinfo = "0.31.0"
 take-until = "0.2.0"
-tempfile = "3.20.0"
+tempfile = "3.9.0"
 thiserror = "2.0.12"
-tiktoken-rs = "0.7.0"
+tiktoken-rs = "0.6.0"
 time = { version = "0.3", features = [
     "macros",
     "parsing",
@@ -572,7 +564,7 @@ tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
 toml = "0.8"
 tower-http = "0.4.4"
-tree-sitter = { version = "0.25.5", features = ["wasm"] }
+tree-sitter = { version = "0.25.3", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
@@ -602,7 +594,7 @@ unindent = "0.2.0"
 url = "2.2"
 urlencoding = "2.1.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
-walkdir = "2.5"
+walkdir = "2.3"
 wasm-encoder = "0.221"
 wasmparser = "0.221"
 wasmtime = { version = "29", default-features = false, features = [
@@ -611,13 +603,12 @@ wasmtime = { version = "29", default-features = false, features = [
     "runtime",
     "cranelift",
     "component-model",
-    "incremental-cache",
-    "parallel-compilation",
 ] }
 wasmtime-wasi = "29"
 which = "6.0.0"
+wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.8.4"
+zed_llm_client = "0.8.0"
 zstd = "0.11"
 
 [workspace.dependencies.async-stripe]
@@ -797,9 +788,6 @@ let_underscore_future = "allow"
 # running afoul of the borrow checker.
 too_many_arguments = "allow"
 
-# We often have large enum variants yet we rarely actually bother with splitting them up.
-large_enum_variant = "allow"
-
 [workspace.metadata.cargo-machete]
 ignored = [
     "bindgen",
@@ -807,6 +795,7 @@ ignored = [
     "prost_build",
     "serde",
     "component",
+    "linkme",
     "documented",
     "workspace-hack",
 ]

Dockerfile-collab

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 
-FROM rust:1.87-bookworm as builder
+FROM rust:1.86-bookworm as builder
 WORKDIR app
 COPY . .
 

README.md

@@ -8,6 +8,10 @@ Welcome to Zed, a high-performance, multiplayer code editor from the creators of
 
 ### Installation
 
+<a href="https://repology.org/project/zed-editor/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/zed-editor.svg?minversion=0.143.5" alt="Packaging status" align="right">
+</a>
+
 On macOS and Linux 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:

assets/icons/bolt.svg

@@ -1,3 +1,3 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.3 1.75L3 7.35H5.8L4.7 12.25L11 6.65H8.2L9.3 1.75Z" stroke="black" stroke-width="1.25" stroke-linejoin="round"/>
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.76019 3.50003H6.50231C6.71012 3.50003 6.89761 3.62971 6.95698 3.82346C7.04292 4.01876 6.98823 4.23906 6.83199 4.37656L2.83214 7.87643C2.65558 8.02954 2.39731 8.04204 2.20857 7.90455C2.01967 7.76705 1.95092 7.51706 2.04295 7.30301L3.24462 4.49999H1.48844C1.29423 4.49999 1.10767 4.37031 1.0344 4.17657C0.961132 3.98126 1.01643 3.76096 1.17323 3.62346L5.17261 0.123753C5.34917 -0.0299914 5.60697 -0.0417097 5.79603 0.0954726C5.98508 0.232749 6.05383 0.482177 5.96165 0.69695L4.76013 3.49981L4.76019 3.50003Z" fill="white"/>
 </svg>

assets/icons/bolt_filled.svg

@@ -1,3 +0,0 @@
-<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.76019 3.50003H6.50231C6.71012 3.50003 6.89761 3.62971 6.95698 3.82346C7.04292 4.01876 6.98823 4.23906 6.83199 4.37656L2.83214 7.87643C2.65558 8.02954 2.39731 8.04204 2.20857 7.90455C2.01967 7.76705 1.95092 7.51706 2.04295 7.30301L3.24462 4.49999H1.48844C1.29423 4.49999 1.10767 4.37031 1.0344 4.17657C0.961132 3.98126 1.01643 3.76096 1.17323 3.62346L5.17261 0.123753C5.34917 -0.0299914 5.60697 -0.0417097 5.79603 0.0954726C5.98508 0.232749 6.05383 0.482177 5.96165 0.69695L4.76013 3.49981L4.76019 3.50003Z" fill="white"/>
-</svg>

assets/icons/cursor_i_beam.svg

@@ -1,4 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 20H16C14.9391 20 13.9217 19.6629 13.1716 19.0627C12.4214 18.4626 12 17.6487 12 16.8V7.2C12 6.35131 12.4214 5.53737 13.1716 4.93726C13.9217 4.33714 14.9391 4 16 4H17" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 20H8C9.06087 20 10.0783 19.5786 10.8284 18.8284C11.5786 18.0783 12 17.0609 12 16V15" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 4H8C9.06087 4 10.0783 4.42143 10.8284 5.17157C11.5786 5.92172 12 6.93913 12 8V9" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

assets/icons/play_alt.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 3L13 8L4 13V3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/play_bug.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 12C2.35977 11.85 1 10.575 1 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M1.00875 15.2C1.00875 13.625 0.683456 12.275 4.00001 12.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 9C7 10.575 5.62857 11.85 4 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 12.2C6.98117 12.2 7 13.625 7 15.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="2.5" y="9" width="3" height="6" rx="1.5" fill="black"/>
-<path d="M9 10L13 8L4 3V7.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/sliders.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36667 3.79167C5.53364 3.79167 4.85833 4.46697 4.85833 5.3C4.85833 6.13303 5.53364 6.80833 6.36667 6.80833C7.1997 6.80833 7.875 6.13303 7.875 5.3C7.875 4.46697 7.1997 3.79167 6.36667 3.79167ZM2.1 5.925H3.67944C3.9626 7.14732 5.05824 8.05833 6.36667 8.05833C7.67509 8.05833 8.77073 7.14732 9.05389 5.925H14.9C15.2452 5.925 15.525 5.64518 15.525 5.3C15.525 4.95482 15.2452 4.675 14.9 4.675H9.05389C8.77073 3.45268 7.67509 2.54167 6.36667 2.54167C5.05824 2.54167 3.9626 3.45268 3.67944 4.675H2.1C1.75482 4.675 1.475 4.95482 1.475 5.3C1.475 5.64518 1.75482 5.925 2.1 5.925ZM13.3206 12.325C13.0374 13.5473 11.9418 14.4583 10.6333 14.4583C9.32491 14.4583 8.22927 13.5473 7.94611 12.325H2.1C1.75482 12.325 1.475 12.0452 1.475 11.7C1.475 11.3548 1.75482 11.075 2.1 11.075H7.94611C8.22927 9.85268 9.32491 8.94167 10.6333 8.94167C11.9418 8.94167 13.0374 9.85268 13.3206 11.075H14.9C15.2452 11.075 15.525 11.3548 15.525 11.7C15.525 12.0452 15.2452 12.325 14.9 12.325H13.3206ZM9.125 11.7C9.125 10.867 9.8003 10.1917 10.6333 10.1917C11.4664 10.1917 12.1417 10.867 12.1417 11.7C12.1417 12.533 11.4664 13.2083 10.6333 13.2083C9.8003 13.2083 9.125 12.533 9.125 11.7Z" fill="black"/>
 </svg>

assets/icons/zed_assistant.svg

@@ -1,5 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2L6.72534 5.87534C6.6601 6.07367 6.5492 6.25392 6.40155 6.40155C6.25392 6.5492 6.07367 6.6601 5.87534 6.72534L2 8L5.87534 9.27466C6.07367 9.3399 6.25392 9.4508 6.40155 9.59845C6.5492 9.74608 6.6601 9.92633 6.72534 10.1247L8 14L9.27466 10.1247C9.3399 9.92633 9.4508 9.74608 9.59845 9.59845C9.74608 9.4508 9.92633 9.3399 10.1247 9.27466L14 8L10.1247 6.72534C9.92633 6.6601 9.74608 6.5492 9.59845 6.40155C9.4508 6.25392 9.3399 6.07367 9.27466 5.87534L8 2Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 1.75L5.88467 5.14092C5.82759 5.31446 5.73055 5.47218 5.60136 5.60136C5.47218 5.73055 5.31446 5.82759 5.14092 5.88467L1.75 7L5.14092 8.11533C5.31446 8.17241 5.47218 8.26945 5.60136 8.39864C5.73055 8.52782 5.82759 8.68554 5.88467 8.85908L7 12.25L8.11533 8.85908C8.17241 8.68554 8.26945 8.52782 8.39864 8.39864C8.52782 8.26945 8.68554 8.17241 8.85908 8.11533L12.25 7L8.85908 5.88467C8.68554 5.82759 8.52782 5.73055 8.39864 5.60136C8.26945 5.47218 8.17241 5.31446 8.11533 5.14092L7 1.75Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.91667 1.75V4.08333M1.75 2.91667H4.08333" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.0833 9.91667V12.25M9.91667 11.0833H12.25" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

assets/icons/zed_burn_mode.svg

@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.99207 8.14741C5.37246 8.14741 5.73726 7.9963 6.00623 7.72733C6.27521 7.45836 6.42631 7.09355 6.42631 6.71317C6.42631 5.92147 6.13946 5.56578 5.85262 4.99208C5.23761 3.76265 5.72411 2.66631 7.00001 1.5499C7.28686 2.98414 8.1474 4.36101 9.2948 5.27893C10.4422 6.19684 11.0159 7.28687 11.0159 8.43426C11.0159 8.96163 10.912 9.48384 10.7102 9.97107C10.5084 10.4583 10.2126 10.901 9.83967 11.2739C9.46676 11.6468 9.02405 11.9426 8.53682 12.1444C8.04959 12.3463 7.52738 12.4501 7.00001 12.4501C6.47264 12.4501 5.95043 12.3463 5.4632 12.1444C4.97597 11.9426 4.53326 11.6468 4.16035 11.2739C3.78745 10.901 3.49164 10.4583 3.28982 9.97107C3.088 9.48384 2.98413 8.96163 2.98413 8.43426C2.98413 7.77279 3.23254 7.1182 3.55783 6.71317C3.55783 7.09355 3.70894 7.45836 3.97791 7.72733C4.24688 7.9963 4.61169 8.14741 4.99207 8.14741Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/zed_burn_mode_on.svg

@@ -1,13 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2595_5640)">
-<path d="M4.99207 8.14741C5.37246 8.14741 5.73726 7.9963 6.00623 7.72733C6.27521 7.45836 6.42631 7.09355 6.42631 6.71317C6.42631 5.92147 6.13946 5.56578 5.85262 4.99208C5.23761 3.76265 5.72411 2.66631 7.00001 1.5499C7.28686 2.98414 8.1474 4.36101 9.2948 5.27893C10.4422 6.19684 11.0159 7.28687 11.0159 8.43426C11.0159 8.96163 10.912 9.48384 10.7102 9.97107C10.5084 10.4583 10.2126 10.901 9.83967 11.2739C9.46676 11.6468 9.02405 11.9426 8.53682 12.1444C8.04959 12.3463 7.52738 12.4501 7.00001 12.4501C6.47264 12.4501 5.95043 12.3463 5.4632 12.1444C4.97597 11.9426 4.53326 11.6468 4.16035 11.2739C3.78745 10.901 3.49164 10.4583 3.28982 9.97107C3.088 9.48384 2.98413 8.96163 2.98413 8.43426C2.98413 7.77279 3.23254 7.1182 3.55783 6.71317C3.55783 7.09355 3.70894 7.45836 3.97791 7.72733C4.24688 7.9963 4.61169 8.14741 4.99207 8.14741Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2 4C2.55228 4 3 3.55228 3 3C3 2.44772 2.55228 2 2 2C1.44772 2 1 2.44772 1 3C1 3.55228 1.44772 4 2 4Z" fill="black"/>
-<path d="M10 2C10.5523 2 11 1.55228 11 1C11 0.44772 10.5523 0 10 0C9.44772 0 9 0.44772 9 1C9 1.55228 9.44772 2 10 2Z" fill="black"/>
-<path d="M13 5C13.5522 5 14 4.55228 14 4C14 3.44772 13.5522 3 13 3C12.4478 3 12 3.44772 12 4C12 4.55228 12.4478 5 13 5Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2595_5640">
-<rect width="14" height="14" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/zed_max_mode.svg

@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2489_484)">
+<path d="M11 8.9V11C8.51716 11 7.48284 11 5 11V10.4L11 5.6V5H5V7.1" stroke="black" stroke-width="1.5"/>
+<path d="M1.5 5.5V1.5H5" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
+<path d="M14.5 5.5V1.5H11" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
+<path d="M1.5 10.5V14.5H5" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
+<path d="M14.5 10.5V14.5H11" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
+</g>
+<defs>
+<clipPath id="clip0_2489_484">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/keymaps/default-linux.json

@@ -31,8 +31,8 @@
       "ctrl-,": "zed::OpenSettings",
       "ctrl-q": "zed::Quit",
       "f4": "debugger::Start",
+      "f5": "debugger::Continue",
       "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::Restart",
       "f6": "debugger::Pause",
       "f7": "debugger::StepOver",
       "cmd-f11": "debugger::StepInto",
@@ -125,7 +125,9 @@
       "shift-f10": "editor::OpenContextMenu",
       "ctrl-shift-e": "editor::ToggleEditPrediction",
       "f9": "editor::ToggleBreakpoint",
-      "shift-f9": "editor::EditLogBreakpoint"
+      "shift-f9": "editor::EditLogBreakpoint",
+      "ctrl-shift-backspace": "editor::GoToPreviousChange",
+      "ctrl-shift-alt-backspace": "editor::GoToNextChange"
     }
   },
   {
@@ -144,8 +146,6 @@
       "ctrl->": "assistant::QuoteSelection",
       "ctrl-<": "assistant::InsertIntoEditor",
       "ctrl-alt-e": "editor::SelectEnclosingSymbol",
-      "ctrl-shift-backspace": "editor::GoToPreviousChange",
-      "ctrl-shift-alt-backspace": "editor::GoToNextChange",
       "alt-enter": "editor::OpenSelectionsInMultibuffer"
     }
   },
@@ -217,6 +217,7 @@
     "context": "ContextEditor > Editor",
     "bindings": {
       "ctrl-enter": "assistant::Assist",
+      "ctrl-shift-enter": "assistant::Edit",
       "ctrl-s": "workspace::Save",
       "save": "workspace::Save",
       "ctrl->": "assistant::QuoteSelection",
@@ -242,14 +243,11 @@
       "ctrl-i": "agent::ToggleProfileSelector",
       "ctrl-alt-/": "agent::ToggleModelSelector",
       "ctrl-shift-a": "agent::ToggleContextPicker",
-      "ctrl-shift-j": "agent::ToggleNavigationMenu",
+      "ctrl-shift-o": "agent::ToggleNavigationMenu",
       "ctrl-shift-i": "agent::ToggleOptionsMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
       "ctrl-alt-e": "agent::RemoveAllContext",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-enter": "agent::ContinueThread",
-      "alt-enter": "agent::ContinueWithBurnMode",
-      "ctrl-alt-b": "agent::ToggleBurnMode"
+      "ctrl-shift-e": "project_panel::ToggleFocus"
     }
   },
   {
@@ -276,7 +274,6 @@
     "context": "MessageEditor > Editor",
     "bindings": {
       "enter": "agent::Chat",
-      "ctrl-enter": "agent::ChatWithFollow",
       "ctrl-i": "agent::ToggleProfileSelector",
       "shift-ctrl-r": "agent::OpenAgentDiff"
     }
@@ -516,8 +513,6 @@
       "alt-ctrl-o": "projects::OpenRecent",
       "alt-shift-open": "projects::OpenRemote",
       "alt-ctrl-shift-o": "projects::OpenRemote",
-      // Change to open path modal for existing remote connection by setting the parameter
-      // "alt-ctrl-shift-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
       "alt-ctrl-shift-b": "branches::OpenRecent",
       "alt-shift-enter": "toast::RunAction",
       "ctrl-~": "workspace::NewTerminal",
@@ -562,7 +557,6 @@
       "ctrl-shift-e": "project_panel::ToggleFocus",
       "ctrl-shift-b": "outline_panel::ToggleFocus",
       "ctrl-shift-g": "git_panel::ToggleFocus",
-      "ctrl-shift-d": "debug_panel::ToggleFocus",
       "ctrl-?": "agent::ToggleFocus",
       "alt-save": "workspace::SaveAll",
       "ctrl-alt-s": "workspace::SaveAll",
@@ -581,24 +575,11 @@
       "ctrl-alt-r": "task::Rerun",
       "alt-t": "task::Rerun",
       "alt-shift-t": "task::Spawn",
-      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }],
+      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
       // also possible to spawn tasks by name:
       // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
       // or by tag:
       // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
-      "f5": "debugger::RerunLastSession"
-    }
-  },
-  {
-    "context": "Workspace && debugger_running",
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "bindings": {
-      "f5": "debugger::Continue"
     }
   },
   {
@@ -613,6 +594,7 @@
   {
     "context": "Editor",
     "bindings": {
+      "ctrl-shift-d": "editor::DuplicateLineDown",
       "ctrl-shift-j": "editor::JoinLines",
       "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
       "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
@@ -691,8 +673,7 @@
   {
     "bindings": {
       "ctrl-alt-shift-f": "workspace::FollowNextCollaborator",
-      // Only available in debug builds: opens an element inspector for development.
-      "ctrl-alt-i": "dev::ToggleInspector"
+      "ctrl-alt-i": "zed::DebugElements"
     }
   },
   {
@@ -786,7 +767,7 @@
       "alt-ctrl-r": "project_panel::RevealInFileManager",
       "ctrl-shift-enter": "project_panel::OpenWithSystem",
       "shift-find": "project_panel::NewSearchInDirectory",
-      "ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
+      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
       "shift-down": "menu::SelectNext",
       "shift-up": "menu::SelectPrevious",
       "escape": "menu::Cancel"
@@ -880,31 +861,6 @@
       "alt-l": "git::GenerateCommitMessage"
     }
   },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
-    }
-  },
-  {
-    "context": "VariableList",
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry",
-      "enter": "variable_list::EditVariable",
-      "ctrl-c": "variable_list::CopyVariableValue",
-      "ctrl-alt-c": "variable_list::CopyVariableName"
-    }
-  },
-  {
-    "context": "BreakpointList",
-    "bindings": {
-      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint"
-    }
-  },
   {
     "context": "CollabPanel && not_editing",
     "bindings": {
@@ -940,13 +896,6 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
-  {
-    "context": "FileFinder",
-    "bindings": {
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "bindings": {
@@ -980,14 +929,12 @@
       "alt-b": ["terminal::SendText", "\u001bb"],
       "alt-f": ["terminal::SendText", "\u001bf"],
       "alt-.": ["terminal::SendText", "\u001b."],
-      "ctrl-delete": ["terminal::SendText", "\u001bd"],
       // Overrides for conflicting keybindings
       "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
       "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
       "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
       "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
       "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
       "ctrl-shift-a": "editor::SelectAll",
       "find": "buffer_search::Deploy",
       "ctrl-shift-f": "buffer_search::Deploy",
@@ -1005,10 +952,7 @@
       "shift-down": "terminal::ScrollLineDown",
       "shift-home": "terminal::ScrollToTop",
       "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-shift-r": "terminal::RerunTask",
-      "ctrl-alt-r": "terminal::RerunTask",
-      "alt-t": "terminal::RerunTask"
+      "ctrl-shift-space": "terminal::ToggleViMode"
     }
   },
   {
@@ -1031,19 +975,5 @@
     "bindings": {
       "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
     }
-  },
-  {
-    "context": "DebugConsole > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "RunModal",
-    "bindings": {
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePreviousItem"
-    }
   }
 ]

assets/keymaps/default-macos.json

@@ -1,11 +1,22 @@
 [
+  // Moved before Standard macOS bindings so that `cmd-w` is not the last binding for
+  // `workspace::CloseWindow` and displayed/intercepted by macOS
+  {
+    "context": "PromptLibrary",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-n": "rules_library::NewRule",
+      "cmd-shift-s": "rules_library::ToggleDefaultRule",
+      "cmd-w": "workspace::CloseWindow"
+    }
+  },
   // Standard macOS bindings
   {
     "use_key_equivalents": true,
     "bindings": {
       "f4": "debugger::Start",
+      "f5": "debugger::Continue",
       "shift-f5": "debugger::Stop",
-      "shift-cmd-f5": "debugger::Restart",
       "f6": "debugger::Pause",
       "f7": "debugger::StepOver",
       "f11": "debugger::StepInto",
@@ -252,6 +263,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-enter": "assistant::Assist",
+      "cmd-shift-enter": "assistant::Edit",
       "cmd-s": "workspace::Save",
       "cmd->": "assistant::QuoteSelection",
       "cmd-<": "assistant::InsertIntoEditor",
@@ -277,14 +289,11 @@
       "cmd-i": "agent::ToggleProfileSelector",
       "cmd-alt-/": "agent::ToggleModelSelector",
       "cmd-shift-a": "agent::ToggleContextPicker",
-      "cmd-shift-j": "agent::ToggleNavigationMenu",
+      "cmd-shift-o": "agent::ToggleNavigationMenu",
       "cmd-shift-i": "agent::ToggleOptionsMenu",
       "shift-alt-escape": "agent::ExpandMessageEditor",
       "cmd-alt-e": "agent::RemoveAllContext",
-      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-shift-enter": "agent::ContinueThread",
-      "alt-enter": "agent::ContinueWithBurnMode",
-      "cmd-alt-b": "agent::ToggleBurnMode"
+      "cmd-shift-e": "project_panel::ToggleFocus"
     }
   },
   {
@@ -313,7 +322,6 @@
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
-      "cmd-enter": "agent::ChatWithFollow",
       "cmd-i": "agent::ToggleProfileSelector",
       "shift-ctrl-r": "agent::OpenAgentDiff"
     }
@@ -361,18 +369,15 @@
     }
   },
   {
-    "context": "ThreadHistory > Editor",
+    "context": "ThreadHistory",
     "bindings": {
-      "shift-backspace": "agent::RemoveSelectedThread"
+      "ctrl--": "pane::GoBack"
     }
   },
   {
-    "context": "PromptLibrary",
-    "use_key_equivalents": true,
+    "context": "ThreadHistory > Editor",
     "bindings": {
-      "cmd-n": "rules_library::NewRule",
-      "cmd-shift-s": "rules_library::ToggleDefaultRule",
-      "cmd-w": "workspace::CloseWindow"
+      "shift-backspace": "agent::RemoveSelectedThread"
     }
   },
   {
@@ -544,7 +549,9 @@
       "cmd-\\": "pane::SplitRight",
       "cmd-k v": "markdown::OpenPreviewToTheSide",
       "cmd-shift-v": "markdown::OpenPreview",
-      "ctrl-cmd-c": "editor::DisplayCursorNames"
+      "ctrl-cmd-c": "editor::DisplayCursorNames",
+      "cmd-shift-backspace": "editor::GoToPreviousChange",
+      "cmd-shift-alt-backspace": "editor::GoToNextChange"
     }
   },
   {
@@ -552,9 +559,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-o": "outline::Toggle",
-      "ctrl-g": "go_to_line::Toggle",
-      "cmd-shift-backspace": "editor::GoToPreviousChange",
-      "cmd-shift-alt-backspace": "editor::GoToNextChange"
+      "ctrl-g": "go_to_line::Toggle"
     }
   },
   {
@@ -584,7 +589,6 @@
       // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
       "alt-cmd-o": "projects::OpenRecent",
       "ctrl-cmd-o": "projects::OpenRemote",
-      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true }],
       "alt-cmd-b": "branches::OpenRecent",
       "ctrl-~": "workspace::NewTerminal",
       "cmd-s": "workspace::Save",
@@ -620,7 +624,6 @@
       "cmd-shift-e": "project_panel::ToggleFocus",
       "cmd-shift-b": "outline_panel::ToggleFocus",
       "ctrl-shift-g": "git_panel::ToggleFocus",
-      "cmd-shift-d": "debug_panel::ToggleFocus",
       "cmd-?": "agent::ToggleFocus",
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
@@ -633,8 +636,7 @@
       "cmd-k shift-right": "workspace::SwapPaneRight",
       "cmd-k shift-up": "workspace::SwapPaneUp",
       "cmd-k shift-down": "workspace::SwapPaneDown",
-      "cmd-shift-x": "zed::Extensions",
-      "f5": "debugger::RerunLastSession"
+      "cmd-shift-x": "zed::Extensions"
     }
   },
   {
@@ -651,20 +653,6 @@
       // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
     }
   },
-  {
-    "context": "Workspace && debugger_running",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "debugger::Continue"
-    }
-  },
   // Bindings from Sublime Text
   {
     "context": "Editor",
@@ -753,8 +741,7 @@
       "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
       // TODO: Move this to a dock open action
       "cmd-shift-c": "collab_panel::ToggleFocus",
-      // Only available in debug builds: opens an element inspector for development.
-      "cmd-alt-i": "dev::ToggleInspector"
+      "cmd-alt-i": "zed::DebugElements"
     }
   },
   {
@@ -839,7 +826,7 @@
       "alt-cmd-r": "project_panel::RevealInFileManager",
       "ctrl-shift-enter": "project_panel::OpenWithSystem",
       "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
+      "cmd-shift-f": "project_panel::NewSearchInDirectory",
       "shift-down": "menu::SelectNext",
       "shift-up": "menu::SelectPrevious",
       "escape": "menu::Cancel"
@@ -857,10 +844,7 @@
     "use_key_equivalents": true,
     "bindings": {
       "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry",
-      "enter": "variable_list::EditVariable",
-      "cmd-c": "variable_list::CopyVariableValue",
-      "cmd-alt-c": "variable_list::CopyVariableName"
+      "right": "variable_list::ExpandSelectedEntry"
     }
   },
   {
@@ -945,21 +929,6 @@
       "alt-tab": "git::GenerateCommitMessage"
     }
   },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "cmd-t": "debugger::ToggleThreadPicker",
-      "cmd-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
-    }
-  },
-  {
-    "context": "BreakpointList",
-    "bindings": {
-      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint"
-    }
-  },
   {
     "context": "CollabPanel && not_editing",
     "use_key_equivalents": true,
@@ -1001,14 +970,6 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
-  {
-    "context": "FileFinder",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-a": "file_finder::ToggleSplitMenu",
-      "cmd-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "use_key_equivalents": true,
@@ -1051,7 +1012,7 @@
       "alt-right": ["terminal::SendText", "\u001bf"],
       "alt-b": ["terminal::SendText", "\u001bb"],
       "alt-f": ["terminal::SendText", "\u001bf"],
-      "ctrl-delete": ["terminal::SendText", "\u001bd"],
+      "alt-.": ["terminal::SendText", "\u001b."],
       // There are conflicting bindings for these keys in the global context.
       // these bindings override them, remove at your own risk:
       "up": ["terminal::SendKeystroke", "up"],
@@ -1061,7 +1022,6 @@
       "escape": ["terminal::SendKeystroke", "escape"],
       "enter": ["terminal::SendKeystroke", "enter"],
       "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
       "shift-pageup": "terminal::ScrollPageUp",
       "cmd-up": "terminal::ScrollPageUp",
       "shift-pagedown": "terminal::ScrollPageDown",
@@ -1078,8 +1038,7 @@
       "ctrl-alt-up": "pane::SplitUp",
       "ctrl-alt-down": "pane::SplitDown",
       "ctrl-alt-left": "pane::SplitLeft",
-      "ctrl-alt-right": "pane::SplitRight",
-      "cmd-alt-r": "terminal::RerunTask"
+      "ctrl-alt-right": "pane::SplitRight"
     }
   },
   {
@@ -1124,20 +1083,5 @@
     "bindings": {
       "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
     }
-  },
-  {
-    "context": "DebugConsole > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "RunModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePreviousItem"
-    }
   }
 ]

assets/keymaps/linux/cursor.json

@@ -1,85 +0,0 @@
-[
-  // Cursor for MacOS. See: https://docs.cursor.com/kbd
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "agent::ToggleFocus",
-      "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-l": "agent::ToggleFocus",
-      "ctrl-shift-l": "agent::ToggleFocus",
-      "ctrl-alt-b": "agent::ToggleFocus",
-      "ctrl-shift-j": "agent::OpenConfiguration"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "agent::ToggleFocus",
-      "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "ctrl-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
-      "ctrl-k": "assistant::InlineAssist",
-      "ctrl-shift-k": "assistant::InsertIntoEditor"
-    }
-  },
-  {
-    "context": "InlineAssistEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "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)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "workspace::ToggleRightDock",
-      "ctrl-shift-i": "workspace::ToggleRightDock",
-      "ctrl-l": "workspace::ToggleRightDock",
-      "ctrl-shift-l": "workspace::ToggleRightDock",
-      "ctrl-alt-b": "workspace::ToggleRightDock",
-      "ctrl-w": "workspace::ToggleRightDock", // technically should close chat
-      "ctrl-.": "agent::ToggleProfileSelector",
-      "ctrl-/": "agent::ToggleModelSelector",
-      "ctrl-shift-backspace": "editor::Cancel",
-      "ctrl-r": "agent::NewThread",
-      "ctrl-shift-v": "editor::Paste",
-      "ctrl-shift-k": "assistant::InsertIntoEditor"
-      // "escape": "agent::ToggleFocus"
-      ///// Enable when Zed supports multiple thread tabs
-      // "ctrl-t": // new thread tab
-      // "ctrl-[": // next thread tab
-      // "ctrl-]": // next thread tab
-      ///// 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"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k": "assistant::InlineAssist"
-    }
-  }
-]

assets/keymaps/linux/emacs.json

@@ -72,9 +72,7 @@
       "alt-left": "editor::SelectToPreviousWordStart",
       "alt-right": "editor::SelectToNextWordEnd",
       "pagedown": "editor::SelectPageDown",
-      "ctrl-v": "editor::SelectPageDown",
       "pageup": "editor::SelectPageUp",
-      "alt-v": "editor::SelectPageUp",
       "ctrl-f": "editor::SelectRight",
       "ctrl-b": "editor::SelectLeft",
       "ctrl-n": "editor::SelectDown",

assets/keymaps/linux/sublime_text.json

@@ -52,10 +52,8 @@
       "shift-alt-m": "markdown::OpenPreviewToTheSide",
       "ctrl-backspace": "editor::DeleteToPreviousWordStart",
       "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "alt-right": "editor::MoveToNextSubwordEnd",
-      "alt-left": "editor::MoveToPreviousSubwordStart",
-      "alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
+      "f3": "editor::FindNextMatch",
+      "shift-f3": "editor::FindPreviousMatch"
     }
   },
   {

assets/keymaps/macos/cursor.json

@@ -1,85 +0,0 @@
-[
-  // Cursor for MacOS. See: https://docs.cursor.com/kbd
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "agent::ToggleFocus",
-      "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-l": "agent::ToggleFocus",
-      "cmd-shift-l": "agent::ToggleFocus",
-      "cmd-alt-b": "agent::ToggleFocus",
-      "cmd-shift-j": "agent::OpenConfiguration"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "agent::ToggleFocus",
-      "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-shift-l": "assistant::QuoteSelection", // In cursor uses "Ask" mode
-      "cmd-l": "assistant::QuoteSelection", // In cursor uses "Agent" mode
-      "cmd-k": "assistant::InlineAssist",
-      "cmd-shift-k": "assistant::InsertIntoEditor"
-    }
-  },
-  {
-    "context": "InlineAssistEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-backspace": "editor::Cancel"
-      // "alt-enter": // Quick Question
-      // "cmd-shift-enter": // Full File Context
-      // "cmd-shift-k": // Toggle input focus (editor <> inline assist)
-    }
-  },
-  {
-    "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "workspace::ToggleRightDock",
-      "cmd-shift-i": "workspace::ToggleRightDock",
-      "cmd-l": "workspace::ToggleRightDock",
-      "cmd-shift-l": "workspace::ToggleRightDock",
-      "cmd-alt-b": "workspace::ToggleRightDock",
-      "cmd-w": "workspace::ToggleRightDock", // technically should close chat
-      "cmd-.": "agent::ToggleProfileSelector",
-      "cmd-/": "agent::ToggleModelSelector",
-      "cmd-shift-backspace": "editor::Cancel",
-      "cmd-r": "agent::NewThread",
-      "cmd-shift-v": "editor::Paste",
-      "cmd-shift-k": "assistant::InsertIntoEditor"
-      // "escape": "agent::ToggleFocus"
-      ///// Enable when Zed supports multiple thread tabs
-      // "cmd-t": // new thread tab
-      // "cmd-[": // next thread tab
-      // "cmd-]": // next thread tab
-      ///// 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"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k": "assistant::InlineAssist"
-    }
-  }
-]

assets/keymaps/macos/emacs.json

@@ -72,9 +72,7 @@
       "alt-left": "editor::SelectToPreviousWordStart",
       "alt-right": "editor::SelectToNextWordEnd",
       "pagedown": "editor::SelectPageDown",
-      "ctrl-v": "editor::SelectPageDown",
       "pageup": "editor::SelectPageUp",
-      "alt-v": "editor::SelectPageUp",
       "ctrl-f": "editor::SelectRight",
       "ctrl-b": "editor::SelectLeft",
       "ctrl-n": "editor::SelectDown",

assets/keymaps/macos/sublime_text.json

@@ -54,10 +54,8 @@
       "shift-alt-m": "markdown::OpenPreviewToTheSide",
       "ctrl-backspace": "editor::DeleteToPreviousWordStart",
       "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "ctrl-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
+      "cmd-g": "editor::FindNextMatch",
+      "cmd-shift-g": "editor::FindPreviousMatch"
     }
   },
   {

assets/keymaps/vim.json

@@ -152,7 +152,6 @@
       "g end": ["vim::EndOfLine", { "display_lines": true }],
       "g 0": ["vim::StartOfLine", { "display_lines": true }],
       "g home": ["vim::StartOfLine", { "display_lines": true }],
-      "g shift-m": ["vim::MiddleOfLine", { "display_lines": true }],
       "g ^": ["vim::FirstNonWhitespace", { "display_lines": true }],
       "g v": "vim::RestoreVisualSelection",
       "g ]": "editor::GoToDiagnostic",
@@ -838,19 +837,6 @@
       "tab": "editor::AcceptEditPrediction"
     }
   },
-  {
-    "context": "MessageEditor > Editor && VimControl",
-    "bindings": {
-      "enter": "agent::Chat",
-      // TODO: Implement search
-      "/": null,
-      "?": null,
-      "#": null,
-      "*": null,
-      "n": null,
-      "shift-n": null
-    }
-  },
   {
     "context": "os != macos && Editor && edit_prediction_conflict",
     "bindings": {
@@ -859,5 +845,13 @@
       // and Windows.
       "alt-l": "editor::AcceptEditPrediction"
     }
+  },
+  {
+    // Fixes https://github.com/zed-industries/zed/issues/29095 by ensuring that
+    // the last binding for editor::ToggleComments is not ctrl-c.
+    "context": "hack_to_fix_ctrl-c",
+    "bindings": {
+      "g c": "editor::ToggleComments"
+    }
   }
 ]

assets/prompts/content_prompt.hbs

@@ -49,9 +49,10 @@ And here's the section to rewrite based on that prompt again for reference:
 </rewrite_this>
 
 {{#if diagnostic_errors}}
+{{#each 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>

assets/prompts/suggest_edits.hbs

@@ -0,0 +1,206 @@
+<task_description>
+
+The user of a code editor wants to make a change to their codebase.
+You must describe the change using the following XML structure:
+
+- <patch> - A group of related code changes.
+  Child tags:
+    - <title> (required) - A high-level description of the changes. This should be as short
+      as possible, possibly using common abbreviations.
+    - <edit> (1 or more) - An edit to make at a particular range within a file.
+      Includes the following child tags:
+        - <path> (required) - The path to the file that will be changed.
+        - <description> (optional) - An arbitrarily-long comment that describes the purpose
+          of this edit.
+        - <old_text> (optional) - An excerpt from the file's current contents that uniquely
+          identifies a range within the file where the edit should occur. Required for all operations
+          except `create`.
+        - <new_text> (required) - The new text to insert into the file.
+        - <operation> (required) - The type of change that should occur at the given range
+          of the file. Must be one of the following values:
+            - `update`: Replaces the entire range with the new text.
+            - `insert_before`: Inserts the new text before the range.
+            - `insert_after`: Inserts new text after the range.
+            - `create`: Creates or overwrites a file with the given path and the new text.
+            - `delete`: Deletes the specified range from the file.
+
+<guidelines>
+- Never provide multiple edits whose ranges intersect each other. Instead, merge them into one edit.
+- Prefer multiple edits to smaller, disjoint ranges, rather than one edit to a larger range.
+- There's no need to escape angle brackets within XML tags.
+- Always ensure imports are added if you're referencing symbols that are not in scope.
+</guidelines>
+
+Here are some concrete examples.
+
+<example>
+<message role="user">
+
+```rs src/shapes.rs
+pub mod rectangle;
+pub mod circle;
+```
+
+```rs src/shapes/rectangle.rs
+pub struct Rectangle {
+    width: f64,
+    height: f64,
+}
+
+impl Rectangle {
+    pub fn new(width: f64, height: f64) -> Self {
+        Rectangle { width, height }
+    }
+}
+```
+
+```rs src/shapes/circle.rs
+pub struct Circle {
+    radius: f64,
+}
+
+impl Circle {
+    pub fn new(radius: f64) -> Self {
+        Circle { radius }
+    }
+}
+```
+
+Update all shapes to store their origin as an (x, y) tuple and implement Display.
+</message>
+
+<message role="assistant">
+We'll need to update both the rectangle and circle modules.
+
+<patch>
+<title>Add origins and display impls to shapes</title>
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<description>Add the origin field to Rectangle struct</description>
+<operation>insert_after</operation>
+<old_text>
+pub struct Rectangle {
+</old_text>
+<new_text>
+origin: (f64, f64),
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>update</operation>
+<old_text>
+fn new(width: f64, height: f64) -> Self {
+    Rectangle { width, height }
+}
+</old_text>
+<new_text>
+fn new(origin: (f64, f64), width: f64, height: f64) -> Self {
+    Rectangle { origin, width, height }
+}
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<description>Add the origin field to Circle struct</description>
+<operation>insert_after</operation>
+<old_text>
+pub struct Circle {
+    radius: f64,
+</old_text>
+<new_text>
+    origin: (f64, f64),
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>update</operation>
+<old_text>
+fn new(radius: f64) -> Self {
+    Circle { radius }
+}
+</old_text>
+<new_text>
+fn new(origin: (f64, f64), radius: f64) -> Self {
+    Circle { origin, radius }
+}
+</new_text>
+</edit>
+</step>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>insert_before</operation>
+<old_text>
+struct Rectangle {
+</old_text>
+<new_text>
+use std::fmt;
+
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<description>
+Add a manual Display implementation for Rectangle.
+Currently, this is the same as a derived Display implementation.
+</description>
+<operation>insert_after</operation>
+<old_text>
+        Rectangle { width, height }
+    }
+}
+</old_text>
+<new_text>
+impl fmt::Display for Rectangle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.format_struct(f, "Rectangle")
+            .field("origin", &self.origin)
+            .field("width", &self.width)
+            .field("height", &self.height)
+            .finish()
+    }
+}
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_before</operation>
+<old_text>
+struct Circle {
+</old_text>
+<new_text>
+use std::fmt;
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_after</operation>
+<old_text>
+        Circle { radius }
+    }
+}
+</old_text>
+<new_text>
+impl fmt::Display for Rectangle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.format_struct(f, "Rectangle")
+            .field("origin", &self.origin)
+            .field("width", &self.width)
+            .field("height", &self.height)
+            .finish()
+    }
+}
+</new_text>
+</edit>
+</patch>
+
+</message>
+</example>
+
+</task_description>

assets/settings/default.json

@@ -113,8 +113,8 @@
   // Whether to show the informational hover box when moving the mouse
   // over symbols in the editor.
   "hover_popover_enabled": true,
-  // Time to wait in milliseconds before showing the informational hover box.
-  "hover_popover_delay": 300,
+  // Time to wait before showing the informational hover box
+  "hover_popover_delay": 350,
   // Whether to confirm before quitting Zed.
   "confirm_quit": false,
   // Whether to restore last closed project when fresh Zed instance is opened.
@@ -128,8 +128,6 @@
   //
   // Default: true
   "restore_on_file_reopen": true,
-  // Whether to automatically close files that have been deleted on disk.
-  "close_on_file_delete": false,
   // Size of the drop target in the editor.
   "drop_target_size": 0.2,
   // Whether the window should be closed when using 'close active item' on a window with no tabs.
@@ -215,30 +213,11 @@
   // Whether to show the signature help after completion or a bracket pair inserted.
   // If `auto_signature_help` is enabled, this setting will be treated as enabled also.
   "show_signature_help_after_edits": false,
-  // Whether to show code action button at start of buffer line.
-  "inline_code_actions": true,
   // What to do when go to definition yields no results.
   //
   // 1. Do nothing: `none`
   // 2. Find references for the same symbol: `find_all_references` (default)
   "go_to_definition_fallback": "find_all_references",
-  // Which level to use to filter out diagnostics displayed in the editor.
-  //
-  // Affects the editor rendering only, and does not interrupt
-  // the functionality of diagnostics fetching and project diagnostics editor.
-  // Which files containing diagnostic errors/warnings to mark in the tabs.
-  // Diagnostics are only shown when file icons are also active.
-  // This setting only works when can take the following three values:
-  //
-  // Which diagnostic indicators to show in the scrollbar, their level should be more or equal to the specified severity level.
-  // Possible values:
-  //  - "off" — no diagnostics are allowed
-  //  - "error"
-  //  - "warning"
-  //  - "info"
-  //  - "hint"
-  //  - null — allow all diagnostics (default)
-  "diagnostics_max_severity": null,
   // Whether to show wrap guides (vertical rulers) in the editor.
   // Setting this to true will show a guide at the 'preferred_line_length' value
   // if 'soft_wrap' is set to 'preferred_line_length', and will show any
@@ -326,24 +305,16 @@
     // Whether to show the Selections menu in the editor toolbar.
     "selections_menu": true,
     // Whether to show agent review buttons in the editor toolbar.
-    "agent_review": true,
-    // Whether to show code action buttons in the editor toolbar.
-    "code_actions": false
+    "agent_review": true
   },
   // Titlebar related settings
   "title_bar": {
     // Whether to show the branch icon beside branch switcher in the titlebar.
     "show_branch_icon": false,
-    // Whether to show the branch name button in the titlebar.
-    "show_branch_name": true,
-    // Whether to show the project host and name in the titlebar.
-    "show_project_items": true,
     // Whether to show onboarding banners in the titlebar.
     "show_onboarding_banner": true,
     // Whether to show user picture in the titlebar.
-    "show_user_picture": true,
-    // Whether to show the sign in button in the titlebar.
-    "show_sign_in": true
+    "show_user_picture": true
   },
   // Scrollbar related settings
   "scrollbar": {
@@ -385,45 +356,6 @@
       "vertical": true
     }
   },
-  // Minimap related settings
-  "minimap": {
-    // When to show the minimap in the editor.
-    // This setting can take three values:
-    // 1. Show the minimap if the editor's scrollbar is visible:
-    //    "auto"
-    // 2. Always show the minimap:
-    //    "always"
-    // 3. Never show the minimap:
-    //    "never" (default)
-    "show": "never",
-    // When to show the minimap thumb.
-    // This setting can take two values:
-    // 1. Show the minimap thumb if the mouse is over the minimap:
-    //    "hover"
-    // 2. Always show the minimap thumb:
-    //    "always" (default)
-    "thumb": "always",
-    // How the minimap thumb border should look.
-    // This setting can take five values:
-    // 1. Display a border on all sides of the thumb:
-    //    "thumb_border": "full"
-    // 2. Display a border on all sides except the left side of the thumb:
-    //    "thumb_border": "left_open" (default)
-    // 3. Display a border on all sides except the right side of the thumb:
-    //    "thumb_border": "right_open"
-    // 4. Display a border only on the left side of the thumb:
-    //    "thumb_border": "left_only"
-    // 5. Display the thumb without any border:
-    //    "thumb_border": "none"
-    "thumb_border": "left_open",
-    // How to highlight the current line in the minimap.
-    // This setting can take the following values:
-    //
-    // 1. `null` to inherit the editor `current_line_highlight` setting (default)
-    // 2. "line" or "all" to highlight the current line in the minimap.
-    // 3. "gutter" or "none" to not highlight the current line in the minimap.
-    "current_line_highlight": null
-  },
   // Enable middle-click paste on Linux.
   "middle_click_paste": true,
   // What to do when multibuffer is double clicked in some of its excerpts
@@ -438,6 +370,8 @@
   "gutter": {
     // Whether to show line numbers in the gutter.
     "line_numbers": true,
+    // Whether to show code action buttons in the gutter.
+    "code_actions": true,
     // Whether to show runnables buttons in the gutter.
     "runnables": true,
     // Whether to show breakpoints in the gutter.
@@ -477,17 +411,11 @@
   // Scroll sensitivity multiplier. This multiplier is applied
   // to both the horizontal and vertical delta values while scrolling.
   "scroll_sensitivity": 1.0,
-  // Scroll sensitivity multiplier for fast scrolling. This multiplier is applied
-  // to both the horizontal and vertical delta values while scrolling. Fast scrolling
-  // happens when a user holds the alt or option key while scrolling.
-  "fast_scroll_sensitivity": 4.0,
   "relative_line_numbers": false,
   // If 'search_wrap' is disabled, search result do not wrap around the end of the file.
   "search_wrap": true,
   // Search options to enable by default when opening new project and buffer searches.
   "search": {
-    // Whether to show the project search button in the status bar.
-    "button": true,
     "whole_word": false,
     "case_sensitive": false,
     "include_ignored": false,
@@ -716,7 +644,7 @@
     "version": "2",
     // Whether the agent is enabled.
     "enabled": true,
-    /// What completion mode to start new threads in, if available. Can be 'normal' or 'burn'.
+    /// What completion mode to start new threads in, if available. Can be 'normal' or 'max'.
     "preferred_completion_mode": "normal",
     // Whether to show the agent panel button in the status bar.
     "button": true,
@@ -731,7 +659,14 @@
       // The provider to use.
       "provider": "zed.dev",
       // The model to use.
-      "model": "claude-sonnet-4"
+      "model": "claude-3-7-sonnet-latest"
+    },
+    // The model to use when applying edits from the agent.
+    "editor_model": {
+      // The provider to use.
+      "provider": "zed.dev",
+      // The model to use.
+      "model": "claude-3-7-sonnet-latest"
     },
     // Additional parameters for language model requests. When making a request to a model, parameters will be taken
     // from the last entry in this list that matches the model's provider and name. In each entry, both provider
@@ -751,7 +686,7 @@
       // To set parameters for a specific provider and model:
       // {
       //   "provider": "zed.dev",
-      //   "model": "claude-sonnet-4",
+      //   "model": "claude-3-7-sonnet-latest",
       //   "temperature": 1.0
       // }
     ],
@@ -761,8 +696,6 @@
     "stream_edits": false,
     // When enabled, agent edits will be displayed in single-file editors for review
     "single_file_review": true,
-    // When enabled, show voting thumbs for feedback on agent edits.
-    "enable_feedback": true,
     "default_profile": "write",
     "profiles": {
       "write": {
@@ -817,12 +750,7 @@
     // "primary_screen" - Show the notification only on your primary screen (default)
     // "all_screens" - Show these notifications on all screens
     // "never" - Never show these notifications
-    "notify_when_agent_waiting": "primary_screen",
-    // Whether to play a sound when the agent has either completed
-    // its response, or needs user input.
-
-    // Default: false
-    "play_sound_when_agent_done": false
+    "notify_when_agent_waiting": "primary_screen"
   },
   // The settings for slash commands.
   "slash_commands": {
@@ -954,17 +882,7 @@
     //    "skip_focus_for_active_in_search": false
     //
     // Default: true
-    "skip_focus_for_active_in_search": true,
-    // Whether to show the git status in the file finder.
-    "git_status": true,
-    // Whether to use gitignored files when searching.
-    // Only the file Zed had indexed will be used, not necessary all the gitignored files.
-    //
-    // Can accept 3 values:
-    //   * `true`: Use all gitignored files
-    //   * `false`: Use only the files Zed had indexed
-    //   * `null`: Be smart and search for ignored when called from a gitignored worktree
-    "include_ignored": null
+    "skip_focus_for_active_in_search": true
   },
   // Whether or not to remove any trailing whitespace from lines of a buffer
   // before saving it.
@@ -1030,8 +948,6 @@
   "auto_update": true,
   // Diagnostics configuration.
   "diagnostics": {
-    // Whether to show the project diagnostics button in the status bar.
-    "button": true,
     // Whether to show warnings or not by default.
     "include_warnings": true,
     // Settings for inline diagnostics
@@ -1049,7 +965,7 @@
       // longer than this value will still push diagnostics further to the right.
       "min_column": 0,
       // The minimum severity of the diagnostics to show inline.
-      // Inherits editor's diagnostics' max severity settings when `null`.
+      // Shows all diagnostics when not specified.
       "max_severity": null
     },
     "cargo": {
@@ -1309,17 +1225,7 @@
   // Settings related to running tasks.
   "tasks": {
     "variables": {},
-    "enabled": true,
-    // Use LSP tasks over Zed language extension ones.
-    // If no LSP tasks are returned due to error/timeout or regular execution,
-    // Zed language extension tasks will be used instead.
-    //
-    // Other Zed tasks will still be shown:
-    // * Zed task from either of the task config file
-    // * Zed task from history (e.g. one-off task was spawned before)
-    //
-    // Default: true
-    "prefer_lsp": true
+    "enabled": true
   },
   // An object whose keys are language names, and whose values
   // are arrays of filenames or extensions of files that should
@@ -1743,8 +1649,6 @@
   //   }
   // ]
   "ssh_connections": [],
-  // Whether to read ~/.ssh/config for ssh connection sources.
-  "read_ssh_config": true,
   // Configures context servers for use by the agent.
   "context_servers": {},
   "debugger": {

assets/settings/initial_debug_tasks.json

@@ -1,34 +1,32 @@
-// Some example tasks for common languages.
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
 [
   {
     "label": "Debug active PHP file",
-    "adapter": "PHP",
+    "adapter": "php",
     "program": "$ZED_FILE",
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT"
   },
   {
     "label": "Debug active Python file",
-    "adapter": "Debugpy",
+    "adapter": "python",
     "program": "$ZED_FILE",
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT"
   },
   {
     "label": "Debug active JavaScript file",
-    "adapter": "JavaScript",
+    "adapter": "javascript",
     "program": "$ZED_FILE",
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT"
   },
   {
     "label": "JavaScript debug terminal",
-    "adapter": "JavaScript",
+    "adapter": "javascript",
     "request": "launch",
     "cwd": "$ZED_WORKTREE_ROOT",
-    "console": "integratedTerminal"
+    "initialize_args": {
+      "console": "integratedTerminal"
+    }
   }
 ]

assets/settings/initial_local_debug_tasks.json

@@ -1,5 +0,0 @@
-// Project-local debug tasks
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
-[]

crates/activity_indicator/Cargo.toml

@@ -24,9 +24,8 @@ project.workspace = true
 smallvec.workspace = true
 ui.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true

crates/activity_indicator/src/activity_indicator.rs

@@ -1,4 +1,4 @@
-use auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage, VersionCheckType};
+use auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage};
 use editor::Editor;
 use extension_host::ExtensionStore;
 use futures::StreamExt;
@@ -60,7 +60,6 @@ struct Content {
     message: String,
     on_click:
         Option<Arc<dyn Fn(&mut ActivityIndicator, &mut Window, &mut Context<ActivityIndicator>)>>,
-    tooltip_message: Option<String>,
 }
 
 impl ActivityIndicator {
@@ -263,7 +262,6 @@ impl ActivityIndicator {
                     });
                     window.dispatch_action(Box::new(workspace::OpenLog), cx);
                 })),
-                tooltip_message: None,
             });
         }
         // Show any language server has pending activity.
@@ -307,32 +305,6 @@ impl ActivityIndicator {
                 ),
                 message,
                 on_click: Some(Arc::new(Self::toggle_language_server_work_context_menu)),
-                tooltip_message: None,
-            });
-        }
-
-        if let Some(session) = self
-            .project
-            .read(cx)
-            .dap_store()
-            .read(cx)
-            .sessions()
-            .find(|s| !s.read(cx).is_started())
-        {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::Small)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        )
-                        .into_any_element(),
-                ),
-                message: format!("Debug: {}", session.read(cx).adapter()),
-                tooltip_message: Some(session.read(cx).label().to_string()),
-                on_click: None,
             });
         }
 
@@ -360,7 +332,6 @@ impl ActivityIndicator {
                     ),
                     message: job_info.message.into(),
                     on_click: None,
-                    tooltip_message: None,
                 });
             }
         }
@@ -403,7 +374,6 @@ impl ActivityIndicator {
                         .retain(|status| !downloading.contains(&status.name));
                     this.dismiss_error_message(&DismissErrorMessage, window, cx)
                 })),
-                tooltip_message: None,
             });
         }
 
@@ -432,7 +402,6 @@ impl ActivityIndicator {
                         .retain(|status| !checking_for_update.contains(&status.name));
                     this.dismiss_error_message(&DismissErrorMessage, window, cx)
                 })),
-                tooltip_message: None,
             });
         }
 
@@ -459,7 +428,6 @@ impl ActivityIndicator {
                 on_click: Some(Arc::new(|this, window, cx| {
                     this.show_error_message(&Default::default(), window, cx)
                 })),
-                tooltip_message: None,
             });
         }
 
@@ -478,7 +446,6 @@ impl ActivityIndicator {
                     });
                     window.dispatch_action(Box::new(workspace::OpenLog), cx);
                 })),
-                tooltip_message: None,
             });
         }
 
@@ -495,9 +462,8 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: None,
                 }),
-                AutoUpdateStatus::Downloading { version } => Some(Content {
+                AutoUpdateStatus::Downloading => Some(Content {
                     icon: Some(
                         Icon::new(IconName::Download)
                             .size(IconSize::Small)
@@ -507,9 +473,8 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
                 }),
-                AutoUpdateStatus::Installing { version } => Some(Content {
+                AutoUpdateStatus::Installing => Some(Content {
                     icon: Some(
                         Icon::new(IconName::Download)
                             .size(IconSize::Small)
@@ -519,12 +484,8 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
                 }),
-                AutoUpdateStatus::Updated {
-                    binary_path,
-                    version,
-                } => Some(Content {
+                AutoUpdateStatus::Updated { binary_path } => Some(Content {
                     icon: None,
                     message: "Click to restart and update Zed".to_string(),
                     on_click: Some(Arc::new({
@@ -533,7 +494,6 @@ impl ActivityIndicator {
                         };
                         move |_, _, cx| workspace::reload(&reload, cx)
                     })),
-                    tooltip_message: Some(Self::version_tooltip_message(&version)),
                 }),
                 AutoUpdateStatus::Errored => Some(Content {
                     icon: Some(
@@ -545,7 +505,6 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: None,
                 }),
                 AutoUpdateStatus::Idle => None,
             };
@@ -565,7 +524,6 @@ impl ActivityIndicator {
                     on_click: Some(Arc::new(|this, window, cx| {
                         this.dismiss_error_message(&DismissErrorMessage, window, cx)
                     })),
-                    tooltip_message: None,
                 });
             }
         }
@@ -573,17 +531,6 @@ impl ActivityIndicator {
         None
     }
 
-    fn version_tooltip_message(version: &VersionCheckType) -> String {
-        format!("Version: {}", {
-            match version {
-                auto_update::VersionCheckType::Sha(sha) => format!("{}…", sha.short()),
-                auto_update::VersionCheckType::Semantic(semantic_version) => {
-                    semantic_version.to_string()
-                }
-            }
-        })
-    }
-
     fn toggle_language_server_work_context_menu(
         &mut self,
         window: &mut Window,
@@ -628,14 +575,7 @@ impl Render for ActivityIndicator {
                                         )
                                         .tooltip(Tooltip::text(content.message))
                                 } else {
-                                    button
-                                        .child(Label::new(content.message).size(LabelSize::Small))
-                                        .when_some(
-                                            content.tooltip_message,
-                                            |this, tooltip_message| {
-                                                this.tooltip(Tooltip::text(tooltip_message))
-                                            },
-                                        )
+                                    button.child(Label::new(content.message).size(LabelSize::Small))
                                 }
                             })
                             .when_some(content.on_click, |this, handler| {
@@ -715,26 +655,3 @@ impl StatusItemView for ActivityIndicator {
     ) {
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use gpui::SemanticVersion;
-    use release_channel::AppCommitSha;
-
-    use super::*;
-
-    #[test]
-    fn test_version_tooltip_message() {
-        let message = ActivityIndicator::version_tooltip_message(&VersionCheckType::Semantic(
-            SemanticVersion::new(1, 0, 0),
-        ));
-
-        assert_eq!(message, "Version: 1.0.0");
-
-        let message = ActivityIndicator::version_tooltip_message(&VersionCheckType::Sha(
-            AppCommitSha::new("14d9a4189f058d8736339b06ff2340101eaea5af".to_string()),
-        ));
-
-        assert_eq!(message, "Version: 14d9a41…");
-    }
-}

crates/agent/Cargo.toml

@@ -19,14 +19,13 @@ test-support = [
 ]
 
 [dependencies]
-agent_settings.workspace = true
 anyhow.workspace = true
 assistant_context_editor.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
-audio.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 client.workspace = true
@@ -46,14 +45,14 @@ git.workspace = true
 gpui.workspace = true
 heed.workspace = true
 html_to_markdown.workspace = true
-indoc.workspace = true
 http_client.workspace = true
 indexed_docs.workspace = true
-inventory.workspace = true
 itertools.workspace = true
 jsonschema.workspace = true
 language.workspace = true
 language_model.workspace = true
+language_model_selector.workspace = true
+linkme.workspace = true
 log.workspace = true
 lsp.workspace = true
 markdown.workspace = true
@@ -78,8 +77,8 @@ serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
+smallvec.workspace = true
 smol.workspace = true
-sqlez.workspace = true
 streaming_diff.workspace = true
 telemetry.workspace = true
 telemetry_events.workspace = true
@@ -99,7 +98,6 @@ workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 zed_llm_client.workspace = true
-zstd.workspace = true
 
 [dev-dependencies]
 buffer_diff = { workspace = true, features = ["test-support"] }

crates/agent/src/agent.rs

@@ -28,7 +28,7 @@ mod ui;
 
 use std::sync::Arc;
 
-use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
+use assistant_settings::{AgentProfileId, AssistantSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use feature_flags::FeatureFlagAppExt as _;
@@ -49,7 +49,7 @@ pub use crate::context::{ContextLoadResult, LoadedContext};
 pub use crate::inline_assistant::InlineAssistant;
 use crate::slash_command_settings::SlashCommandSettings;
 pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
-pub use crate::thread_store::{SerializedThread, TextThreadStore, ThreadStore};
+pub use crate::thread_store::{TextThreadStore, ThreadStore};
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
 pub use context_store::ContextStore;
 pub use ui::preview::{all_agent_previews, get_agent_preview};
@@ -69,7 +69,6 @@ actions!(
         AddContextServer,
         RemoveSelectedThread,
         Chat,
-        ChatWithFollow,
         CycleNextInlineAssist,
         CyclePreviousInlineAssist,
         FocusUp,
@@ -86,10 +85,6 @@ actions!(
         KeepAll,
         Follow,
         ResetTrialUpsell,
-        ResetTrialEndUpsell,
-        ContinueThread,
-        ContinueWithBurnMode,
-        ToggleBurnMode,
     ]
 );
 
@@ -121,19 +116,14 @@ pub fn init(
     client: Arc<Client>,
     prompt_builder: Arc<PromptBuilder>,
     language_registry: Arc<LanguageRegistry>,
-    is_eval: bool,
     cx: &mut App,
 ) {
-    AgentSettings::register(cx);
+    AssistantSettings::register(cx);
     SlashCommandSettings::register(cx);
 
     assistant_context_editor::init(client.clone(), cx);
     rules_library::init(cx);
-    if !is_eval {
-        // Initializing the language model from the user settings messes with the eval, so we only initialize them when
-        // we're not running inside of the eval.
-        init_language_model_settings(cx);
-    }
+    init_language_model_settings(cx);
     assistant_slash_command::init(cx);
     thread_store::init(cx);
     agent_panel::init(cx);
@@ -177,7 +167,7 @@ fn init_language_model_settings(cx: &mut App) {
 }
 
 fn update_active_language_model_from_settings(cx: &mut App) {
-    let settings = AgentSettings::get_global(cx);
+    let settings = AssistantSettings::get_global(cx);
 
     fn to_selected_model(selection: &LanguageModelSelection) -> language_model::SelectedModel {
         language_model::SelectedModel {
@@ -226,6 +216,7 @@ fn register_slash_commands(cx: &mut App) {
     slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
+    slash_command_registry.register_command(assistant_slash_commands::TerminalSlashCommand, true);
     slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
     slash_command_registry
         .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);

crates/agent/src/agent_configuration.rs

@@ -5,7 +5,7 @@ mod tool_picker;
 
 use std::{sync::Arc, time::Duration};
 
-use agent_settings::AgentSettings;
+use assistant_settings::AssistantSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use collections::HashMap;
 use context_server::ContextServerId;
@@ -18,8 +18,8 @@ use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageMod
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use settings::{Settings, update_settings_file};
 use ui::{
-    Disclosure, ElevationIndex, Indicator, Scrollbar, ScrollbarState, Switch, SwitchColor, Tooltip,
-    prelude::*,
+    Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Scrollbar, ScrollbarState,
+    Switch, SwitchColor, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use zed_actions::ExtensionCategoryFilter;
@@ -142,7 +142,7 @@ impl AgentConfiguration {
             .expanded_provider_configurations
             .get(&provider.id())
             .copied()
-            .unwrap_or(false);
+            .unwrap_or(true);
 
         v_flex()
             .pt_3()
@@ -201,12 +201,12 @@ impl AgentConfiguration {
                                 .on_click(cx.listener({
                                     let provider_id = provider.id().clone();
                                     move |this, _event, _window, _cx| {
-                                        let is_expanded = this
+                                        let is_open = this
                                             .expanded_provider_configurations
                                             .entry(provider_id.clone())
-                                            .or_insert(false);
+                                            .or_insert(true);
 
-                                        *is_expanded = !*is_expanded;
+                                        *is_open = !*is_open;
                                     }
                                 })),
                             ),
@@ -214,9 +214,9 @@ impl AgentConfiguration {
             )
             .when(is_expanded, |parent| match configuration_view {
                 Some(configuration_view) => parent.child(configuration_view),
-                None => parent.child(Label::new(format!(
+                None => parent.child(div().child(Label::new(format!(
                     "No configuration view for {provider_name}",
-                ))),
+                )))),
             })
     }
 
@@ -230,8 +230,7 @@ impl AgentConfiguration {
             .p(DynamicSpacing::Base16.rems(cx))
             .pr(DynamicSpacing::Base20.rems(cx))
             .gap_4()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
+            .flex_1()
             .child(
                 v_flex()
                     .gap_0p5()
@@ -249,7 +248,7 @@ impl AgentConfiguration {
     }
 
     fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let always_allow_tool_actions = AgentSettings::get_global(cx).always_allow_tool_actions;
+        let always_allow_tool_actions = AssistantSettings::get_global(cx).always_allow_tool_actions;
 
         h_flex()
             .gap_4()
@@ -277,7 +276,7 @@ impl AgentConfiguration {
                     let fs = self.fs.clone();
                     move |state, _window, cx| {
                         let allow = state == &ToggleState::Selected;
-                        update_settings_file::<AgentSettings>(
+                        update_settings_file::<AssistantSettings>(
                             fs.clone(),
                             cx,
                             move |settings, _| {
@@ -290,7 +289,7 @@ impl AgentConfiguration {
     }
 
     fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let single_file_review = AgentSettings::get_global(cx).single_file_review;
+        let single_file_review = AssistantSettings::get_global(cx).single_file_review;
 
         h_flex()
             .gap_4()
@@ -315,7 +314,7 @@ impl AgentConfiguration {
                         let fs = self.fs.clone();
                         move |state, _window, cx| {
                             let allow = state == &ToggleState::Selected;
-                            update_settings_file::<AgentSettings>(
+                            update_settings_file::<AssistantSettings>(
                                 fs.clone(),
                                 cx,
                                 move |settings, _| {
@@ -327,55 +326,15 @@ impl AgentConfiguration {
             )
     }
 
-    fn render_sound_notification(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let play_sound_when_agent_done = AgentSettings::get_global(cx).play_sound_when_agent_done;
-
-        h_flex()
-            .gap_4()
-            .justify_between()
-            .flex_wrap()
-            .child(
-                v_flex()
-                    .gap_0p5()
-                    .max_w_5_6()
-                    .child(Label::new("Play sound when finished generating"))
-                    .child(
-                        Label::new(
-                            "Hear a notification sound when the agent is done generating changes or needs your input.",
-                        )
-                        .color(Color::Muted),
-                    ),
-            )
-            .child(
-                Switch::new("play-sound-notification-switch", play_sound_when_agent_done.into())
-                    .color(SwitchColor::Accent)
-                    .on_click({
-                        let fs = self.fs.clone();
-                        move |state, _window, cx| {
-                            let allow = state == &ToggleState::Selected;
-                            update_settings_file::<AgentSettings>(
-                                fs.clone(),
-                                cx,
-                                move |settings, _| {
-                                    settings.set_play_sound_when_agent_done(allow);
-                                },
-                            );
-                        }
-                    }),
-            )
-    }
-
     fn render_general_settings_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .p(DynamicSpacing::Base16.rems(cx))
             .pr(DynamicSpacing::Base20.rems(cx))
             .gap_2p5()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
+            .flex_1()
             .child(Headline::new("General Settings"))
             .child(self.render_command_permission(cx))
             .child(self.render_single_file_review(cx))
-            .child(self.render_sound_notification(cx))
     }
 
     fn render_context_servers_section(
@@ -385,17 +344,18 @@ impl AgentConfiguration {
     ) -> impl IntoElement {
         let context_server_ids = self.context_server_store.read(cx).all_server_ids().clone();
 
+        const SUBHEADING: &str = "Connect to context servers via the Model Context Protocol either via Zed extensions or directly.";
+
         v_flex()
             .p(DynamicSpacing::Base16.rems(cx))
             .pr(DynamicSpacing::Base20.rems(cx))
             .gap_2()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
+            .flex_1()
             .child(
                 v_flex()
                     .gap_0p5()
                     .child(Headline::new("Model Context Protocol (MCP) Servers"))
-                    .child(Label::new("Connect to context servers via the Model Context Protocol either via Zed extensions or directly.").color(Color::Muted)),
+                    .child(Label::new(SUBHEADING).color(Color::Muted)),
             )
             .children(
                 context_server_ids.into_iter().map(|context_server_id| {
@@ -462,7 +422,6 @@ impl AgentConfiguration {
             .unwrap_or(ContextServerStatus::Stopped);
 
         let is_running = matches!(server_status, ContextServerStatus::Running);
-        let item_id = SharedString::from(context_server_id.0.clone());
 
         let error = if let ContextServerStatus::Error(error) = server_status.clone() {
             Some(error)
@@ -484,38 +443,9 @@ impl AgentConfiguration {
         let tool_count = tools.len();
 
         let border_color = cx.theme().colors().border.opacity(0.6);
-        let success_color = Color::Success.color(cx);
-
-        let (status_indicator, tooltip_text) = match server_status {
-            ContextServerStatus::Starting => (
-                Indicator::dot()
-                    .color(Color::Success)
-                    .with_animation(
-                        SharedString::from(format!("{}-starting", context_server_id.0.clone(),)),
-                        Animation::new(Duration::from_secs(2))
-                            .repeat()
-                            .with_easing(pulsating_between(0.4, 1.)),
-                        move |this, delta| this.color(success_color.alpha(delta).into()),
-                    )
-                    .into_any_element(),
-                "Server is starting.",
-            ),
-            ContextServerStatus::Running => (
-                Indicator::dot().color(Color::Success).into_any_element(),
-                "Server is running.",
-            ),
-            ContextServerStatus::Error(_) => (
-                Indicator::dot().color(Color::Error).into_any_element(),
-                "Server has an error.",
-            ),
-            ContextServerStatus::Stopped => (
-                Indicator::dot().color(Color::Muted).into_any_element(),
-                "Server is stopped.",
-            ),
-        };
 
         v_flex()
-            .id(item_id.clone())
+            .id(SharedString::from(context_server_id.0.clone()))
             .border_1()
             .rounded_md()
             .border_color(border_color)
@@ -550,12 +480,35 @@ impl AgentConfiguration {
                                     }
                                 })),
                             )
-                            .child(
-                                div()
-                                    .id(item_id.clone())
-                                    .tooltip(Tooltip::text(tooltip_text))
-                                    .child(status_indicator),
-                            )
+                            .child(match server_status {
+                                ContextServerStatus::Starting => {
+                                    let color = Color::Success.color(cx);
+                                    Indicator::dot()
+                                        .color(Color::Success)
+                                        .with_animation(
+                                            SharedString::from(format!(
+                                                "{}-starting",
+                                                context_server_id.0.clone(),
+                                            )),
+                                            Animation::new(Duration::from_secs(2))
+                                                .repeat()
+                                                .with_easing(pulsating_between(0.4, 1.)),
+                                            move |this, delta| {
+                                                this.color(color.alpha(delta).into())
+                                            },
+                                        )
+                                        .into_any_element()
+                                }
+                                ContextServerStatus::Running => {
+                                    Indicator::dot().color(Color::Success).into_any_element()
+                                }
+                                ContextServerStatus::Error(_) => {
+                                    Indicator::dot().color(Color::Error).into_any_element()
+                                }
+                                ContextServerStatus::Stopped => {
+                                    Indicator::dot().color(Color::Muted).into_any_element()
+                                }
+                            })
                             .child(Label::new(context_server_id.0.clone()).ml_0p5())
                             .when(is_running, |this| {
                                 this.child(
@@ -670,7 +623,9 @@ impl Render for AgentConfiguration {
                     .size_full()
                     .overflow_y_scroll()
                     .child(self.render_general_settings_section(cx))
+                    .child(Divider::horizontal().color(DividerColor::Border))
                     .child(self.render_context_servers_section(window, cx))
+                    .child(Divider::horizontal().color(DividerColor::Border))
                     .child(self.render_provider_configuration_section(cx)),
             )
             .child(

crates/agent/src/agent_configuration/configure_context_server_modal.rs

@@ -30,6 +30,7 @@ pub(crate) struct ConfigureContextServerModal {
     context_server_store: Entity<ContextServerStore>,
 }
 
+#[allow(clippy::large_enum_variant)]
 enum Configuration {
     NotAvailable,
     Required(ConfigurationRequiredState),

crates/agent/src/agent_configuration/manage_profiles_modal.rs

@@ -2,7 +2,7 @@ mod profile_modal_header;
 
 use std::sync::Arc;
 
-use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, builtin_profiles};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, builtin_profiles};
 use assistant_tool::ToolWorkingSet;
 use convert_case::{Case, Casing as _};
 use editor::Editor;
@@ -42,7 +42,7 @@ enum Mode {
 
 impl Mode {
     pub fn choose_profile(_window: &mut Window, cx: &mut Context<ManageProfilesModal>) -> Self {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
 
         let mut builtin_profiles = Vec::new();
         let mut custom_profiles = Vec::new();
@@ -196,7 +196,7 @@ impl ManageProfilesModal {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
         let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
             return;
         };
@@ -234,7 +234,7 @@ impl ManageProfilesModal {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
         let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
             return;
         };
@@ -270,7 +270,7 @@ impl ManageProfilesModal {
         match &self.mode {
             Mode::ChooseProfile { .. } => {}
             Mode::NewProfile(mode) => {
-                let settings = AgentSettings::get_global(cx);
+                let settings = AssistantSettings::get_global(cx);
 
                 let base_profile = mode
                     .base_profile_id
@@ -332,7 +332,7 @@ impl ManageProfilesModal {
         profile: AgentProfile,
         cx: &mut Context<Self>,
     ) {
-        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
+        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
             move |settings, _cx| {
                 settings.create_profile(profile_id, profile).log_err();
             }
@@ -485,7 +485,7 @@ impl ManageProfilesModal {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
 
         let base_profile_name = mode.base_profile_id.as_ref().map(|base_profile_id| {
             settings
@@ -518,7 +518,7 @@ impl ManageProfilesModal {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
 
         let profile_id = &settings.default_profile;
         let profile_name = settings
@@ -712,7 +712,7 @@ impl ManageProfilesModal {
 
 impl Render for ManageProfilesModal {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
 
         let go_back_item = div()
             .id("cancel-item")

crates/agent/src/agent_configuration/tool_picker.rs

@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, sync::Arc};
 
-use agent_settings::{
-    AgentProfile, AgentProfileContent, AgentProfileId, AgentSettings, AgentSettingsContent,
+use assistant_settings::{
+    AgentProfile, AgentProfileContent, AgentProfileId, AssistantSettings, AssistantSettingsContent,
     ContextServerPresetContent,
 };
 use assistant_tool::{ToolSource, ToolWorkingSet};
@@ -259,7 +259,7 @@ impl PickerDelegate for ToolPickerDelegate {
             is_enabled
         };
 
-        let active_profile_id = &AgentSettings::get_global(cx).default_profile;
+        let active_profile_id = &AssistantSettings::get_global(cx).default_profile;
         if active_profile_id == &self.profile_id {
             self.thread_store
                 .update(cx, |this, cx| {
@@ -268,12 +268,12 @@ impl PickerDelegate for ToolPickerDelegate {
                 .log_err();
         }
 
-        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
+        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
             let profile_id = self.profile_id.clone();
             let default_profile = self.profile.clone();
             let server_id = server_id.clone();
             let tool_name = tool_name.clone();
-            move |settings: &mut AgentSettingsContent, _cx| {
+            move |settings: &mut AssistantSettingsContent, _cx| {
                 settings
                     .v2_setting(|v2_settings| {
                         let profiles = v2_settings.profiles.get_or_insert_default();

crates/agent/src/agent_diff.rs

@@ -1,6 +1,6 @@
 use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll, Thread, ThreadEvent};
-use agent_settings::AgentSettings;
 use anyhow::Result;
+use assistant_settings::AssistantSettings;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
@@ -699,7 +699,7 @@ fn render_diff_hunk_controls(
         .rounded_b_md()
         .bg(cx.theme().colors().editor_background)
         .gap_1()
-        .block_mouse_except_scroll()
+        .occlude()
         .shadow_md()
         .children(vec![
             Button::new(("reject", row as u64), "Reject")
@@ -1253,9 +1253,9 @@ impl AgentDiff {
 
         let settings_subscription = cx.observe_global_in::<SettingsStore>(window, {
             let workspace = workspace.clone();
-            let mut was_active = AgentSettings::get_global(cx).single_file_review;
+            let mut was_active = AssistantSettings::get_global(cx).single_file_review;
             move |this, window, cx| {
-                let is_active = AgentSettings::get_global(cx).single_file_review;
+                let is_active = AssistantSettings::get_global(cx).single_file_review;
                 if was_active != is_active {
                     was_active = is_active;
                     this.update_reviewing_editors(&workspace, window, cx);
@@ -1348,7 +1348,6 @@ impl AgentDiff {
             ThreadEvent::NewRequest
             | ThreadEvent::Stopped(Ok(StopReason::EndTurn))
             | ThreadEvent::Stopped(Ok(StopReason::MaxTokens))
-            | ThreadEvent::Stopped(Ok(StopReason::Refusal))
             | ThreadEvent::Stopped(Err(_))
             | ThreadEvent::ShowError(_)
             | ThreadEvent::CompletionCanceled => {
@@ -1372,7 +1371,6 @@ impl AgentDiff {
             | ThreadEvent::ToolFinished { .. }
             | ThreadEvent::CheckpointChanged
             | ThreadEvent::ToolConfirmationNeeded
-            | ThreadEvent::ToolUseLimitReached
             | ThreadEvent::CancelEditing => {}
         }
     }
@@ -1462,13 +1460,10 @@ impl AgentDiff {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if !AgentSettings::get_global(cx).single_file_review {
+        if !AssistantSettings::get_global(cx).single_file_review {
             for (editor, _) in self.reviewing_editors.drain() {
                 editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
+                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
                     .ok();
             }
             return;
@@ -1564,10 +1559,7 @@ impl AgentDiff {
 
             if in_workspace {
                 editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
+                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
                     .ok();
                 self.reviewing_editors.remove(&editor);
             }
@@ -1743,7 +1735,7 @@ impl editor::Addon for EditorAgentDiffAddon {
 mod tests {
     use super::*;
     use crate::{Keep, ThreadStore, thread_store};
-    use agent_settings::AgentSettings;
+    use assistant_settings::AssistantSettings;
     use assistant_tool::ToolWorkingSet;
     use editor::EditorSettings;
     use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
@@ -1762,7 +1754,7 @@ mod tests {
             cx.set_global(settings_store);
             language::init(cx);
             Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
             prompt_store::init(cx);
             thread_store::init(cx);
             workspace::init_settings(cx);
@@ -1918,7 +1910,7 @@ mod tests {
             cx.set_global(settings_store);
             language::init(cx);
             Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
             prompt_store::init(cx);
             thread_store::init(cx);
             workspace::init_settings(cx);

crates/agent/src/agent_model_selector.rs

@@ -1,13 +1,12 @@
-use agent_settings::AgentSettings;
+use assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
-use picker::popover_menu::PickerPopoverMenu;
 
 use crate::Thread;
-use assistant_context_editor::language_model_selector::{
-    LanguageModelSelector, ToggleModelSelector, language_model_selector,
-};
 use language_model::{ConfiguredModel, LanguageModelRegistry};
+use language_model_selector::{
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
+};
 use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{PopoverMenuHandle, Tooltip, prelude::*};
@@ -36,7 +35,7 @@ impl AgentModelSelector {
         Self {
             selector: cx.new(move |cx| {
                 let fs = fs.clone();
-                language_model_selector(
+                LanguageModelSelector::new(
                     {
                         let model_type = model_type.clone();
                         move |cx| match &model_type {
@@ -64,7 +63,7 @@ impl AgentModelSelector {
                                         );
                                     }
                                 });
-                                update_settings_file::<AgentSettings>(
+                                update_settings_file::<AssistantSettings>(
                                     fs.clone(),
                                     cx,
                                     move |settings, _cx| {
@@ -73,7 +72,7 @@ impl AgentModelSelector {
                                 );
                             }
                             ModelType::InlineAssistant => {
-                                update_settings_file::<AgentSettings>(
+                                update_settings_file::<AssistantSettings>(
                                     fs.clone(),
                                     cx,
                                     move |settings, _cx| {
@@ -101,14 +100,15 @@ impl AgentModelSelector {
 }
 
 impl Render for AgentModelSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let focus_handle = self.focus_handle.clone();
 
-        let model = self.selector.read(cx).delegate.active_model(cx);
+        let model = self.selector.read(cx).active_model(cx);
         let model_name = model
             .map(|model| model.model.name().0)
             .unwrap_or_else(|| SharedString::from("No model selected"));
-        PickerPopoverMenu::new(
+
+        LanguageModelSelectorPopoverMenu::new(
             self.selector.clone(),
             Button::new("active-model", model_name)
                 .label_size(LabelSize::Small)
@@ -127,9 +127,7 @@ impl Render for AgentModelSelector {
                 )
             },
             gpui::Corner::BottomRight,
-            cx,
         )
         .with_handle(self.menu_handle.clone())
-        .render(window, cx)
     }
 }

crates/agent/src/buffer_codegen.rs

@@ -1,8 +1,8 @@
 use crate::context::ContextLoadResult;
 use crate::inline_prompt_editor::CodegenStatus;
 use crate::{context::load_context, context_store::ContextStore};
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result};
+use anyhow::Result;
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
@@ -34,7 +34,6 @@ use std::{
 };
 use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use zed_llm_client::CompletionIntent;
 
 pub struct BufferCodegen {
     alternatives: Vec<Entity<CodegenAlternative>>,
@@ -420,16 +419,16 @@ impl CodegenAlternative {
             if start_buffer.remote_id() == end_buffer.remote_id() {
                 (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
             } else {
-                anyhow::bail!("invalid transformation range");
+                return Err(anyhow::anyhow!("invalid transformation range"));
             }
         } else {
-            anyhow::bail!("invalid transformation range");
+            return Err(anyhow::anyhow!("invalid transformation range"));
         };
 
         let prompt = self
             .builder
             .generate_inline_transformation_prompt(user_prompt, language_name, buffer, range)
-            .context("generating content prompt")?;
+            .map_err(|e| anyhow::anyhow!("Failed to generate content prompt: {}", e))?;
 
         let context_task = self.context_store.as_ref().map(|context_store| {
             if let Some(project) = self.project.upgrade() {
@@ -444,7 +443,7 @@ impl CodegenAlternative {
             }
         });
 
-        let temperature = AgentSettings::temperature_for_model(&model, cx);
+        let temperature = AssistantSettings::temperature_for_model(&model, cx);
 
         Ok(cx.spawn(async move |_cx| {
             let mut request_message = LanguageModelRequestMessage {
@@ -465,7 +464,6 @@ impl CodegenAlternative {
             LanguageModelRequest {
                 thread_id: None,
                 prompt_id: None,
-                intent: Some(CompletionIntent::InlineAssist),
                 mode: None,
                 tools: Vec::new(),
                 tool_choice: None,

crates/agent/src/context.rs

@@ -734,7 +734,6 @@ impl Display for RulesContext {
 #[derive(Debug, Clone)]
 pub struct ImageContext {
     pub project_path: Option<ProjectPath>,
-    pub full_path: Option<Arc<Path>>,
     pub original_image: Arc<gpui::Image>,
     // TODO: handle this elsewhere and remove `ignore-interior-mutability` opt-out in clippy.toml
     // needed due to a false positive of `clippy::mutable_key_type`.
@@ -750,11 +749,11 @@ pub enum ImageStatus {
 
 impl ImageContext {
     pub fn eq_for_key(&self, other: &Self) -> bool {
-        self.original_image.id() == other.original_image.id()
+        self.original_image.id == other.original_image.id
     }
 
     pub fn hash_for_key<H: Hasher>(&self, state: &mut H) {
-        self.original_image.id().hash(state);
+        self.original_image.id.hash(state);
     }
 
     pub fn image(&self) -> Option<LanguageModelImage> {

crates/agent/src/context_picker.rs

@@ -766,7 +766,6 @@ pub(crate) fn insert_crease_for_mention(
 
         let ids = editor.insert_creases(vec![crease.clone()], cx);
         editor.fold_creases(vec![crease], false, window, cx);
-
         Some(ids[0])
     })
 }
@@ -943,8 +942,8 @@ impl MentionLink {
                 format!("[@{}]({}:{})", title, Self::THREAD, id)
             }
             ThreadContextEntry::Context { path, title } => {
-                let filename = path.file_name().unwrap_or_default().to_string_lossy();
-                let escaped_filename = urlencoding::encode(&filename);
+                let filename = path.file_name().unwrap_or_default();
+                let escaped_filename = urlencoding::encode(&filename.to_string_lossy()).to_string();
                 format!(
                     "[@{}]({}:{}{})",
                     title,

crates/agent/src/context_picker/completion_provider.rs

@@ -14,7 +14,7 @@ use http_client::HttpClientWithUrl;
 use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::{Completion, CompletionIntent, CompletionResponse, ProjectPath, Symbol, WorktreeId};
+use project::{Completion, CompletionIntent, ProjectPath, Symbol, WorktreeId};
 use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
@@ -322,10 +322,7 @@ impl ContextPickerCompletionProvider {
                             })
                             .collect::<Vec<_>>();
 
-                        let new_text = format!(
-                            "{} ",
-                            selection_infos.iter().map(|(_, link, _)| link).join(" ")
-                        );
+                        let new_text = selection_infos.iter().map(|(_, link, _)| link).join(" ");
 
                         let callback = Arc::new({
                             let context_store = context_store.clone();
@@ -423,7 +420,7 @@ impl ContextPickerCompletionProvider {
         } else {
             IconName::MessageBubbles
         };
-        let new_text = format!("{} ", MentionLink::for_thread(&thread_entry));
+        let new_text = MentionLink::for_thread(&thread_entry);
         let new_text_len = new_text.len();
         Completion {
             replace_range: source_range.clone(),
@@ -438,7 +435,7 @@ impl ContextPickerCompletionProvider {
                 thread_entry.title().clone(),
                 excerpt_id,
                 source_range.start,
-                new_text_len - 1,
+                new_text_len,
                 editor.clone(),
                 context_store.clone(),
                 move |window, cx| match &thread_entry {
@@ -492,7 +489,7 @@ impl ContextPickerCompletionProvider {
         editor: Entity<Editor>,
         context_store: Entity<ContextStore>,
     ) -> Completion {
-        let new_text = format!("{} ", MentionLink::for_rule(&rules));
+        let new_text = MentionLink::for_rule(&rules);
         let new_text_len = new_text.len();
         Completion {
             replace_range: source_range.clone(),
@@ -507,7 +504,7 @@ impl ContextPickerCompletionProvider {
                 rules.title.clone(),
                 excerpt_id,
                 source_range.start,
-                new_text_len - 1,
+                new_text_len,
                 editor.clone(),
                 context_store.clone(),
                 move |_, cx| {
@@ -529,7 +526,7 @@ impl ContextPickerCompletionProvider {
         context_store: Entity<ContextStore>,
         http_client: Arc<HttpClientWithUrl>,
     ) -> Completion {
-        let new_text = format!("{} ", MentionLink::for_fetch(&url_to_fetch));
+        let new_text = MentionLink::for_fetch(&url_to_fetch);
         let new_text_len = new_text.len();
         Completion {
             replace_range: source_range.clone(),
@@ -544,7 +541,7 @@ impl ContextPickerCompletionProvider {
                 url_to_fetch.clone(),
                 excerpt_id,
                 source_range.start,
-                new_text_len - 1,
+                new_text_len,
                 editor.clone(),
                 context_store.clone(),
                 move |_, cx| {
@@ -553,7 +550,7 @@ impl ContextPickerCompletionProvider {
                     let url_to_fetch = url_to_fetch.clone();
                     cx.spawn(async move |cx| {
                         if let Some(context) = context_store
-                            .read_with(cx, |context_store, _| {
+                            .update(cx, |context_store, _| {
                                 context_store.get_url_context(url_to_fetch.clone())
                             })
                             .ok()?
@@ -614,7 +611,7 @@ impl ContextPickerCompletionProvider {
             crease_icon_path.clone()
         };
 
-        let new_text = format!("{} ", MentionLink::for_file(&file_name, &full_path));
+        let new_text = MentionLink::for_file(&file_name, &full_path);
         let new_text_len = new_text.len();
         Completion {
             replace_range: source_range.clone(),
@@ -629,7 +626,7 @@ impl ContextPickerCompletionProvider {
                 file_name,
                 excerpt_id,
                 source_range.start,
-                new_text_len - 1,
+                new_text_len,
                 editor,
                 context_store.clone(),
                 move |_, cx| {
@@ -685,7 +682,7 @@ impl ContextPickerCompletionProvider {
         label.push_str(" ", None);
         label.push_str(&file_name, comment_id);
 
-        let new_text = format!("{} ", MentionLink::for_symbol(&symbol.name, &full_path));
+        let new_text = MentionLink::for_symbol(&symbol.name, &full_path);
         let new_text_len = new_text.len();
         Some(Completion {
             replace_range: source_range.clone(),
@@ -700,7 +697,7 @@ impl ContextPickerCompletionProvider {
                 symbol.name.clone().into(),
                 excerpt_id,
                 source_range.start,
-                new_text_len - 1,
+                new_text_len,
                 editor.clone(),
                 context_store.clone(),
                 move |_, cx| {
@@ -746,7 +743,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         _trigger: CompletionContext,
         _window: &mut Window,
         cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<Completion>>>> {
         let state = buffer.update(cx, |buffer, _cx| {
             let position = buffer_position.to_point(buffer);
             let line_start = Point::new(position.row, 0);
@@ -756,13 +753,13 @@ impl CompletionProvider for ContextPickerCompletionProvider {
             MentionCompletion::try_parse(line, offset_to_line)
         });
         let Some(state) = state else {
-            return Task::ready(Ok(Vec::new()));
+            return Task::ready(Ok(None));
         };
 
         let Some((workspace, context_store)) =
             self.workspace.upgrade().zip(self.context_store.upgrade())
         else {
-            return Task::ready(Ok(Vec::new()));
+            return Task::ready(Ok(None));
         };
 
         let snapshot = buffer.read(cx).snapshot();
@@ -815,10 +812,10 @@ impl CompletionProvider for ContextPickerCompletionProvider {
         cx.spawn(async move |_, cx| {
             let matches = search_task.await;
             let Some(editor) = editor.upgrade() else {
-                return Ok(Vec::new());
+                return Ok(None);
             };
 
-            let completions = cx.update(|cx| {
+            Ok(Some(cx.update(|cx| {
                 matches
                     .into_iter()
                     .filter_map(|mat| match mat {
@@ -901,14 +898,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                         ),
                     })
                     .collect()
-            })?;
-
-            Ok(vec![CompletionResponse {
-                completions,
-                // Since this does its own filtering (see `filter_completions()` returns false),
-                // there is no benefit to computing whether this set of completions is incomplete.
-                is_incomplete: true,
-            }])
+            })?))
         })
     }
 
@@ -1223,7 +1213,7 @@ mod tests {
             assert_eq!(worktrees.len(), 1);
             worktrees.pop().unwrap()
         });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
+        let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
 
         let mut cx = VisualTestContext::from_window(*window.deref(), cx);
 
@@ -1296,7 +1286,7 @@ mod tests {
                     .map(Entity::downgrade)
             });
             window.focus(&editor.focus_handle(cx));
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
+            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
                 workspace.downgrade(),
                 context_store.downgrade(),
                 None,
@@ -1363,7 +1353,7 @@ mod tests {
         });
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt) ");
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt)",);
             assert!(!editor.has_visible_completions_menu());
             assert_eq!(
                 fold_ranges(editor, cx),
@@ -1374,7 +1364,7 @@ mod tests {
         cx.simulate_input(" ");
 
         editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt)  ");
+            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt) ",);
             assert!(!editor.has_visible_completions_menu());
             assert_eq!(
                 fold_ranges(editor, cx),
@@ -1387,7 +1377,7 @@ mod tests {
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
                 editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum ",
+                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum ",
             );
             assert!(!editor.has_visible_completions_menu());
             assert_eq!(
@@ -1401,7 +1391,7 @@ mod tests {
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
                 editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum @file ",
+                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum @file ",
             );
             assert!(editor.has_visible_completions_menu());
             assert_eq!(
@@ -1419,14 +1409,14 @@ mod tests {
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
                 editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) "
+                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@seven.txt](@file:dir/b/seven.txt)"
             );
             assert!(!editor.has_visible_completions_menu());
             assert_eq!(
                 fold_ranges(editor, cx),
                 vec![
                     Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 45)..Point::new(0, 80)
+                    Point::new(0, 44)..Point::new(0, 79)
                 ]
             );
         });
@@ -1436,14 +1426,14 @@ mod tests {
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
                 editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) \n@"
+                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@seven.txt](@file:dir/b/seven.txt)\n@"
             );
             assert!(editor.has_visible_completions_menu());
             assert_eq!(
                 fold_ranges(editor, cx),
                 vec![
                     Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 45)..Point::new(0, 80)
+                    Point::new(0, 44)..Point::new(0, 79)
                 ]
             );
         });
@@ -1457,14 +1447,14 @@ mod tests {
         editor.update(&mut cx, |editor, cx| {
             assert_eq!(
                 editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt)  Ipsum [@seven.txt](@file:dir/b/seven.txt) \n[@six.txt](@file:dir/b/six.txt) "
+                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@seven.txt](@file:dir/b/seven.txt)\n[@six.txt](@file:dir/b/six.txt)"
             );
             assert!(!editor.has_visible_completions_menu());
             assert_eq!(
                 fold_ranges(editor, cx),
                 vec![
                     Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 45)..Point::new(0, 80),
+                    Point::new(0, 44)..Point::new(0, 79),
                     Point::new(1, 0)..Point::new(1, 31)
                 ]
             );

crates/agent/src/context_store.rs

@@ -2,12 +2,12 @@ use std::ops::Range;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_context_editor::AssistantContext;
 use collections::{HashSet, IndexSet};
 use futures::{self, FutureExt};
 use gpui::{App, Context, Entity, EventEmitter, Image, SharedString, Task, WeakEntity};
-use language::{Buffer, File as _};
+use language::Buffer;
 use language_model::LanguageModelImage;
 use project::image_store::is_image_file;
 use project::{Project, ProjectItem, ProjectPath, Symbol};
@@ -58,10 +58,9 @@ impl ContextStore {
         self.context_set.iter().map(|entry| entry.as_ref())
     }
 
-    pub fn clear(&mut self, cx: &mut Context<Self>) {
+    pub fn clear(&mut self) {
         self.context_set.clear();
         self.context_thread_ids.clear();
-        cx.notify();
     }
 
     pub fn new_context_for_thread(
@@ -143,12 +142,17 @@ impl ContextStore {
         remove_if_exists: bool,
         cx: &mut Context<Self>,
     ) -> Result<Option<AgentContextHandle>> {
-        let project = self.project.upgrade().context("failed to read project")?;
-        let entry_id = project
+        let Some(project) = self.project.upgrade() else {
+            return Err(anyhow!("failed to read project"));
+        };
+
+        let Some(entry_id) = project
             .read(cx)
             .entry_for_path(project_path, cx)
             .map(|entry| entry.id)
-            .context("no entry found for directory context")?;
+        else {
+            return Err(anyhow!("no entry found for directory context"));
+        };
 
         let context_id = self.next_context_id.post_inc();
         let context = AgentContextHandle::Directory(DirectoryContextHandle {
@@ -304,13 +308,11 @@ impl ContextStore {
                 project.open_image(project_path.clone(), cx)
             })?;
             let image_item = open_image_task.await?;
-
+            let image = image_item.read_with(cx, |image_item, _| image_item.image.clone())?;
             this.update(cx, |this, cx| {
-                let item = image_item.read(cx);
                 this.insert_image(
-                    Some(item.project_path(cx)),
-                    Some(item.file.full_path(cx).into()),
-                    item.image.clone(),
+                    Some(image_item.read(cx).project_path(cx)),
+                    image,
                     remove_if_exists,
                     cx,
                 )
@@ -319,13 +321,12 @@ impl ContextStore {
     }
 
     pub fn add_image_instance(&mut self, image: Arc<Image>, cx: &mut Context<ContextStore>) {
-        self.insert_image(None, None, image, false, cx);
+        self.insert_image(None, image, false, cx);
     }
 
     fn insert_image(
         &mut self,
         project_path: Option<ProjectPath>,
-        full_path: Option<Arc<Path>>,
         image: Arc<Image>,
         remove_if_exists: bool,
         cx: &mut Context<ContextStore>,
@@ -333,7 +334,6 @@ impl ContextStore {
         let image_task = LanguageModelImage::from_image(image.clone(), cx).shared();
         let context = AgentContextHandle::Image(ImageContext {
             project_path,
-            full_path,
             original_image: image,
             image_task,
             context_id: self.next_context_id.post_inc(),

crates/agent/src/context_strip.rs

@@ -84,12 +84,6 @@ impl ContextStrip {
         }
     }
 
-    /// Whether or not the context strip has items to display
-    pub fn has_context_items(&self, cx: &App) -> bool {
-        self.context_store.read(cx).context().next().is_some()
-            || self.suggested_context(cx).is_some()
-    }
-
     fn added_contexts(&self, cx: &App) -> Vec<AddedContext> {
         if let Some(workspace) = self.workspace.upgrade() {
             let project = workspace.read(cx).project().read(cx);
@@ -110,14 +104,14 @@ impl ContextStrip {
         }
     }
 
-    fn suggested_context(&self, cx: &App) -> Option<SuggestedContext> {
+    fn suggested_context(&self, cx: &Context<Self>) -> Option<SuggestedContext> {
         match self.suggest_context_kind {
             SuggestContextKind::File => self.suggested_file(cx),
             SuggestContextKind::Thread => self.suggested_thread(cx),
         }
     }
 
-    fn suggested_file(&self, cx: &App) -> Option<SuggestedContext> {
+    fn suggested_file(&self, cx: &Context<Self>) -> Option<SuggestedContext> {
         let workspace = self.workspace.upgrade()?;
         let active_item = workspace.read(cx).active_item(cx)?;
 
@@ -144,7 +138,7 @@ impl ContextStrip {
         })
     }
 
-    fn suggested_thread(&self, cx: &App) -> Option<SuggestedContext> {
+    fn suggested_thread(&self, cx: &Context<Self>) -> Option<SuggestedContext> {
         if !self.context_picker.read(cx).allow_threads() {
             return None;
         }

crates/agent/src/debug.rs

@@ -75,7 +75,7 @@ impl Default for DebugAccountState {
         Self {
             enabled: false,
             trial_expired: false,
-            plan: Plan::ZedFree,
+            plan: Plan::Free,
             custom_prompt_usage: RequestUsage {
                 limit: UsageLimit::Unlimited,
                 amount: 0,

crates/agent/src/history_store.rs

@@ -1,6 +1,6 @@
 use std::{collections::VecDeque, path::Path, sync::Arc};
 
-use anyhow::Context as _;
+use anyhow::{Context as _, anyhow};
 use assistant_context_editor::{AssistantContext, SavedContextMetadata};
 use chrono::{DateTime, Utc};
 use futures::future::{TryFutureExt as _, join_all};
@@ -130,10 +130,7 @@ impl HistoryStore {
                                         .boxed()
                                 })
                                 .unwrap_or_else(|_| {
-                                    async {
-                                        anyhow::bail!("no thread store");
-                                    }
-                                    .boxed()
+                                    async { Err(anyhow!("no thread store")) }.boxed()
                                 }),
                             SerializedRecentEntry::Context(id) => context_store
                                 .update(cx, |context_store, cx| {
@@ -143,16 +140,13 @@ impl HistoryStore {
                                         .boxed()
                                 })
                                 .unwrap_or_else(|_| {
-                                    async {
-                                        anyhow::bail!("no context store");
-                                    }
-                                    .boxed()
+                                    async { Err(anyhow!("no context store")) }.boxed()
                                 }),
                         });
                     let entries = join_all(entries)
                         .await
                         .into_iter()
-                        .filter_map(|result| result.log_with_level(log::Level::Debug))
+                        .filter_map(|result| result.log_err())
                         .collect::<VecDeque<_>>();
 
                     this.update(cx, |this, _| {

crates/agent/src/inline_assistant.rs

@@ -4,14 +4,13 @@ use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::display_map::EditorMargins;
 use editor::{
     Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
-    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
+    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
     actions::SelectAll,
     display_map::{
         BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
@@ -134,7 +133,7 @@ impl InlineAssistant {
             let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
                 return;
             };
-            let enabled = AgentSettings::get_global(cx).enabled;
+            let enabled = AssistantSettings::get_global(cx).enabled;
             terminal_panel.update(cx, |terminal_panel, cx| {
                 terminal_panel.set_assistant_enabled(enabled, cx)
             });
@@ -219,7 +218,7 @@ impl InlineAssistant {
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
         if !settings.enabled {
             return;
         }
@@ -338,27 +337,13 @@ impl InlineAssistant {
         window: &mut Window,
         cx: &mut App,
     ) {
-        let (snapshot, initial_selections, newest_selection) = editor.update(cx, |editor, cx| {
-            let selections = editor.selections.all::<Point>(cx);
-            let newest_selection = editor.selections.newest::<Point>(cx);
-            (editor.snapshot(window, cx), selections, newest_selection)
+        let (snapshot, initial_selections) = editor.update(cx, |editor, cx| {
+            (
+                editor.snapshot(window, cx),
+                editor.selections.all::<Point>(cx),
+            )
         });
 
-        // Check if there is already an inline assistant that contains the
-        // newest selection, if there is, focus it
-        if let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) {
-            for assist_id in &editor_assists.assist_ids {
-                let assist = &self.assists[assist_id];
-                let range = assist.range.to_point(&snapshot.buffer_snapshot);
-                if range.start.row <= newest_selection.start.row
-                    && newest_selection.end.row <= range.end.row
-                {
-                    self.focus_assist(*assist_id, window, cx);
-                    return;
-                }
-            }
-        }
-
         let mut selections = Vec::<Selection<Point>>::new();
         let mut newest_selection = None;
         for mut selection in initial_selections {
@@ -472,11 +457,11 @@ impl InlineAssistant {
                 )
             });
 
-            let editor_margins = Arc::new(Mutex::new(EditorMargins::default()));
+            let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
             let prompt_editor = cx.new(|cx| {
                 PromptEditor::new_buffer(
                     assist_id,
-                    editor_margins,
+                    gutter_dimensions.clone(),
                     self.prompt_history.clone(),
                     prompt_buffer.clone(),
                     codegen.clone(),
@@ -591,11 +576,11 @@ impl InlineAssistant {
             )
         });
 
-        let editor_margins = Arc::new(Mutex::new(EditorMargins::default()));
+        let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
         let prompt_editor = cx.new(|cx| {
             PromptEditor::new_buffer(
                 assist_id,
-                editor_margins,
+                gutter_dimensions.clone(),
                 self.prompt_history.clone(),
                 prompt_buffer.clone(),
                 codegen.clone(),
@@ -664,7 +649,6 @@ impl InlineAssistant {
                 height: Some(prompt_editor_height),
                 render: build_assist_editor_renderer(prompt_editor),
                 priority: 0,
-                render_in_minimap: false,
             },
             BlockProperties {
                 style: BlockStyle::Sticky,
@@ -679,7 +663,6 @@ impl InlineAssistant {
                         .into_any_element()
                 }),
                 priority: 0,
-                render_in_minimap: false,
             },
         ];
 
@@ -1421,11 +1404,11 @@ impl InlineAssistant {
 
                     enum DeletedLines {}
                     let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
-                    editor.disable_scrollbars_and_minimap(window, cx);
                     editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
                     editor.set_show_wrap_guides(false, cx);
                     editor.set_show_gutter(false, cx);
                     editor.scroll_manager.set_forbid_vertical_scroll(true);
+                    editor.set_show_scrollbars(false, cx);
                     editor.set_read_only(true);
                     editor.set_show_edit_predictions(Some(false), window, cx);
                     editor.highlight_rows::<DeletedLines>(
@@ -1445,16 +1428,15 @@ impl InlineAssistant {
                     style: BlockStyle::Flex,
                     render: Arc::new(move |cx| {
                         div()
-                            .block_mouse_except_scroll()
+                            .block_mouse_down()
                             .bg(cx.theme().status().deleted_background)
                             .size_full()
                             .h(height as f32 * cx.window.line_height())
-                            .pl(cx.margins.gutter.full_width())
+                            .pl(cx.gutter_dimensions.full_width())
                             .child(deleted_lines_editor.clone())
                             .into_any_element()
                     }),
                     priority: 0,
-                    render_in_minimap: false,
                 });
             }
 
@@ -1612,9 +1594,9 @@ fn build_assist_editor_renderer(editor: &Entity<PromptEditor<BufferCodegen>>) ->
     let editor = editor.clone();
 
     Arc::new(move |cx: &mut BlockContext| {
-        let editor_margins = editor.read(cx).editor_margins();
+        let gutter_dimensions = editor.read(cx).gutter_dimensions();
 
-        *editor_margins.lock() = *cx.margins;
+        *gutter_dimensions.lock() = *cx.gutter_dimensions;
         editor.clone().into_any_element()
     })
 }
@@ -1771,7 +1753,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
         _: &mut Window,
         cx: &mut App,
     ) -> Task<Result<Vec<CodeAction>>> {
-        if !AgentSettings::get_global(cx).enabled {
+        if !AssistantSettings::get_global(cx).enabled {
             return Task::ready(Ok(Vec::new()));
         }
 

crates/agent/src/inline_prompt_editor.rs

@@ -9,13 +9,11 @@ use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
 use crate::{RemoveAllContext, ToggleContextPicker};
-use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use client::ErrorExt;
 use collections::VecDeque;
-use db::kvp::Dismissable;
-use editor::display_map::EditorMargins;
 use editor::{
-    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
+    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle,
+    GutterDimensions, MultiBuffer,
     actions::{MoveDown, MoveUp},
 };
 use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
@@ -25,16 +23,17 @@ use gpui::{
     Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window, anchored, deferred, point,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
+use language_model_selector::ToggleModelSelector;
 use parking_lot::Mutex;
 use settings::Settings;
 use std::cmp;
-use std::rc::Rc;
 use std::sync::Arc;
 use theme::ThemeSettings;
 use ui::utils::WithRemSize;
 use ui::{
     CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip, prelude::*,
 };
+use util::ResultExt;
 use workspace::Workspace;
 
 pub struct PromptEditor<T> {
@@ -62,13 +61,11 @@ impl<T: 'static> Render for PromptEditor<T> {
         let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
         let mut buttons = Vec::new();
 
-        const RIGHT_PADDING: Pixels = px(9.);
-
-        let (left_gutter_width, right_padding) = match &self.mode {
+        let left_gutter_width = match &self.mode {
             PromptEditorMode::Buffer {
                 id: _,
                 codegen,
-                editor_margins,
+                gutter_dimensions,
             } => {
                 let codegen = codegen.read(cx);
 
@@ -76,17 +73,13 @@ impl<T: 'static> Render for PromptEditor<T> {
                     buttons.push(self.render_cycle_controls(&codegen, cx));
                 }
 
-                let editor_margins = editor_margins.lock();
-                let gutter = editor_margins.gutter;
+                let gutter_dimensions = gutter_dimensions.lock();
 
-                let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
-                let right_padding = editor_margins.right + RIGHT_PADDING;
-
-                (left_gutter_width, right_padding)
+                gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0)
             }
             PromptEditorMode::Terminal { .. } => {
                 // Give the equivalent of the same left-padding that we're using on the right
-                (Pixels::from(40.0), Pixels::from(24.))
+                Pixels::from(40.0)
             }
         };
 
@@ -100,14 +93,14 @@ impl<T: 'static> Render for PromptEditor<T> {
         v_flex()
             .key_context("PromptEditor")
             .bg(cx.theme().colors().editor_background)
-            .block_mouse_except_scroll()
+            .block_mouse_down()
             .gap_0p5()
             .border_y_1()
             .border_color(cx.theme().status().info_border)
             .size_full()
             .pt_0p5()
             .pb(bottom_padding)
-            .pr(right_padding)
+            .pr_6()
             .child(
                 h_flex()
                     .items_start()
@@ -327,7 +320,9 @@ impl<T: 'static> PromptEditor<T> {
             EditorEvent::Edited { .. } => {
                 if let Some(workspace) = window.root::<Workspace>().flatten() {
                     workspace.update(cx, |workspace, cx| {
-                        let is_via_ssh = workspace.project().read(cx).is_via_ssh();
+                        let is_via_ssh = workspace
+                            .project()
+                            .update(cx, |project, _| project.is_via_ssh());
 
                         workspace
                             .client()
@@ -372,7 +367,7 @@ impl<T: 'static> PromptEditor<T> {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.context_store.update(cx, |store, cx| store.clear(cx));
+        self.context_store.update(cx, |store, _cx| store.clear());
         cx.notify();
     }
 
@@ -450,7 +445,7 @@ impl<T: 'static> PromptEditor<T> {
                     editor.move_to_end(&Default::default(), window, cx)
                 });
             }
-        } else if self.context_strip.read(cx).has_context_items(cx) {
+        } else {
             self.context_strip.focus_handle(cx).focus(window);
         }
     }
@@ -721,7 +716,7 @@ impl<T: 'static> PromptEditor<T> {
                         .child(CheckboxWithLabel::new(
                             "dont-show-again",
                             Label::new("Don't show again"),
-                            if RateLimitNotice::dismissed() {
+                            if dismissed_rate_limit_notice() {
                                 ui::ToggleState::Selected
                             } else {
                                 ui::ToggleState::Unselected
@@ -733,7 +728,7 @@ impl<T: 'static> PromptEditor<T> {
                                     ui::ToggleState::Selected => true,
                                 };
 
-                                RateLimitNotice::set_dismissed(is_dismissed, cx);
+                                set_rate_limit_notice_dismissed(is_dismissed, cx)
                             },
                         ))
                         .child(
@@ -811,7 +806,7 @@ pub enum PromptEditorMode {
     Buffer {
         id: InlineAssistId,
         codegen: Entity<BufferCodegen>,
-        editor_margins: Arc<Mutex<EditorMargins>>,
+        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
     },
     Terminal {
         id: TerminalInlineAssistId,
@@ -843,7 +838,7 @@ impl InlineAssistId {
 impl PromptEditor<BufferCodegen> {
     pub fn new_buffer(
         id: InlineAssistId,
-        editor_margins: Arc<Mutex<EditorMargins>>,
+        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
         prompt_history: VecDeque<String>,
         prompt_buffer: Entity<MultiBuffer>,
         codegen: Entity<BufferCodegen>,
@@ -860,7 +855,7 @@ impl PromptEditor<BufferCodegen> {
         let mode = PromptEditorMode::Buffer {
             id,
             codegen,
-            editor_margins,
+            gutter_dimensions,
         };
 
         let prompt_editor = cx.new(|cx| {
@@ -891,7 +886,7 @@ impl PromptEditor<BufferCodegen> {
 
         let prompt_editor_entity = prompt_editor.downgrade();
         prompt_editor.update(cx, |editor, _| {
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
+            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
                 workspace.clone(),
                 context_store.downgrade(),
                 thread_store.clone(),
@@ -973,7 +968,7 @@ impl PromptEditor<BufferCodegen> {
             CodegenStatus::Error(error) => {
                 if cx.has_flag::<ZedProFeatureFlag>()
                     && error.error_code() == proto::ErrorCode::RateLimitExceeded
-                    && !RateLimitNotice::dismissed()
+                    && !dismissed_rate_limit_notice()
                 {
                     self.show_rate_limit_notice = true;
                     cx.notify();
@@ -1000,9 +995,11 @@ impl PromptEditor<BufferCodegen> {
         }
     }
 
-    pub fn editor_margins(&self) -> &Arc<Mutex<EditorMargins>> {
+    pub fn gutter_dimensions(&self) -> &Arc<Mutex<GutterDimensions>> {
         match &self.mode {
-            PromptEditorMode::Buffer { editor_margins, .. } => editor_margins,
+            PromptEditorMode::Buffer {
+                gutter_dimensions, ..
+            } => gutter_dimensions,
             PromptEditorMode::Terminal { .. } => unreachable!(),
         }
     }
@@ -1062,7 +1059,7 @@ impl PromptEditor<TerminalCodegen> {
 
         let prompt_editor_entity = prompt_editor.downgrade();
         prompt_editor.update(cx, |editor, _| {
-            editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
+            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
                 workspace.clone(),
                 context_store.downgrade(),
                 thread_store.clone(),
@@ -1179,10 +1176,27 @@ impl PromptEditor<TerminalCodegen> {
     }
 }
 
-struct RateLimitNotice;
+const DISMISSED_RATE_LIMIT_NOTICE_KEY: &str = "dismissed-rate-limit-notice";
 
-impl Dismissable for RateLimitNotice {
-    const KEY: &'static str = "dismissed-rate-limit-notice";
+fn dismissed_rate_limit_notice() -> bool {
+    db::kvp::KEY_VALUE_STORE
+        .read_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY)
+        .log_err()
+        .map_or(false, |s| s.is_some())
+}
+
+fn set_rate_limit_notice_dismissed(is_dismissed: bool, cx: &mut App) {
+    db::write_and_log(cx, move || async move {
+        if is_dismissed {
+            db::kvp::KEY_VALUE_STORE
+                .write_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY.into(), "1".into())
+                .await
+        } else {
+            db::kvp::KEY_VALUE_STORE
+                .delete_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY.into())
+                .await
+        }
+    })
 }
 
 pub enum CodegenStatus {

crates/agent/src/message_editor.rs

@@ -1,5 +1,4 @@
 use std::collections::BTreeMap;
-use std::rc::Rc;
 use std::sync::Arc;
 
 use crate::agent_model_selector::{AgentModelSelector, ModelType};
@@ -9,8 +8,7 @@ use crate::ui::{
     AnimatedLabel, MaxModeTooltip,
     preview::{AgentPreview, UsageCallout},
 };
-use agent_settings::{AgentSettings, CompletionMode};
-use assistant_context_editor::language_model_selector::ToggleModelSelector;
+use assistant_settings::{AssistantSettings, CompletionMode};
 use buffer_diff::BufferDiff;
 use client::UserStore;
 use collections::{HashMap, HashSet};
@@ -32,6 +30,7 @@ use language_model::{
     ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
     ZED_CLOUD_PROVIDER_ID,
 };
+use language_model_selector::ToggleModelSelector;
 use multi_buffer;
 use project::Project;
 use prompt_store::PromptStore;
@@ -42,7 +41,6 @@ use theme::ThemeSettings;
 use ui::{Disclosure, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
 use util::{ResultExt as _, maybe};
 use workspace::{CollaboratorId, Workspace};
-use zed_llm_client::CompletionIntent;
 
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
 use crate::context_store::ContextStore;
@@ -51,9 +49,8 @@ use crate::profile_selector::ProfileSelector;
 use crate::thread::{MessageCrease, Thread, TokenUsageRatio};
 use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::{
-    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, NewThread,
-    OpenAgentDiff, RemoveAllContext, ToggleBurnMode, ToggleContextPicker, ToggleProfileSelector,
-    register_agent_preview,
+    ActiveThread, AgentDiffPane, Chat, ExpandMessageEditor, Follow, NewThread, OpenAgentDiff,
+    RemoveAllContext, ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
 };
 
 #[derive(RegisterComponent)]
@@ -112,7 +109,6 @@ pub(crate) fn create_editor(
         editor.set_placeholder_text("Message the agent – @ to include context", cx);
         editor.set_show_indent_guides(false, cx);
         editor.set_soft_wrap();
-        editor.set_use_modal_editing(true);
         editor.set_context_menu_options(ContextMenuOptions {
             min_entries_visible: 12,
             max_entries_visible: 12,
@@ -124,7 +120,7 @@ pub(crate) fn create_editor(
 
     let editor_entity = editor.downgrade();
     editor.update(cx, |editor, _| {
-        editor.set_completion_provider(Some(Rc::new(ContextPickerCompletionProvider::new(
+        editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
             workspace,
             context_store,
             Some(thread_store),
@@ -282,7 +278,7 @@ impl MessageEditor {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.context_store.update(cx, |store, cx| store.clear(cx));
+        self.context_store.update(cx, |store, _cx| store.clear());
         cx.notify();
     }
 
@@ -306,21 +302,6 @@ impl MessageEditor {
         cx.notify();
     }
 
-    fn chat_with_follow(
-        &mut self,
-        _: &ChatWithFollow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace
-            .update(cx, |this, cx| {
-                this.follow(CollaboratorId::Agent, window, cx)
-            })
-            .log_err();
-
-        self.chat(&Chat, window, cx);
-    }
-
     fn is_editor_empty(&self, cx: &App) -> bool {
         self.editor.read(cx).text(cx).trim().is_empty()
     }
@@ -377,12 +358,7 @@ impl MessageEditor {
             thread
                 .update(cx, |thread, cx| {
                     thread.advance_prompt_id();
-                    thread.send_to_model(
-                        model,
-                        CompletionIntent::UserPrompt,
-                        Some(window_handle),
-                        cx,
-                    );
+                    thread.send_to_model(model, Some(window_handle), cx);
                 })
                 .log_err();
         })
@@ -425,7 +401,7 @@ impl MessageEditor {
     fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
         if self.context_picker_menu_handle.is_deployed() {
             cx.propagate();
-        } else if self.context_strip.read(cx).has_context_items(cx) {
+        } else {
             self.context_strip.focus_handle(cx).focus(window);
         }
     }
@@ -478,22 +454,6 @@ impl MessageEditor {
         }
     }
 
-    pub fn toggle_burn_mode(
-        &mut self,
-        _: &ToggleBurnMode,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.thread.update(cx, |thread, _cx| {
-            let active_completion_mode = thread.completion_mode();
-
-            thread.set_completion_mode(match active_completion_mode {
-                CompletionMode::Burn => CompletionMode::Normal,
-                CompletionMode::Normal => CompletionMode::Burn,
-            });
-        });
-    }
-
     fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
         let thread = self.thread.read(cx);
         let model = thread.configured_model();
@@ -502,24 +462,27 @@ impl MessageEditor {
         }
 
         let active_completion_mode = thread.completion_mode();
-        let burn_mode_enabled = active_completion_mode == CompletionMode::Burn;
-        let icon = if burn_mode_enabled {
-            IconName::ZedBurnModeOn
-        } else {
-            IconName::ZedBurnMode
-        };
+        let max_mode_enabled = active_completion_mode == CompletionMode::Max;
 
         Some(
-            IconButton::new("burn-mode", icon)
+            Button::new("max-mode", "Max Mode")
+                .label_size(LabelSize::Small)
+                .color(Color::Muted)
+                .icon(IconName::ZedMaxMode)
                 .icon_size(IconSize::Small)
                 .icon_color(Color::Muted)
-                .toggle_state(burn_mode_enabled)
-                .selected_icon_color(Color::Error)
-                .on_click(cx.listener(|this, _event, window, cx| {
-                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                .icon_position(IconPosition::Start)
+                .toggle_state(max_mode_enabled)
+                .on_click(cx.listener(move |this, _event, _window, cx| {
+                    this.thread.update(cx, |thread, _cx| {
+                        thread.set_completion_mode(match active_completion_mode {
+                            CompletionMode::Max => CompletionMode::Normal,
+                            CompletionMode::Normal => CompletionMode::Max,
+                        });
+                    });
                 }))
                 .tooltip(move |_window, cx| {
-                    cx.new(|_| MaxModeTooltip::new().selected(burn_mode_enabled))
+                    cx.new(|_| MaxModeTooltip::new().selected(max_mode_enabled))
                         .into()
                 })
                 .into_any_element(),
@@ -599,7 +562,6 @@ impl MessageEditor {
         v_flex()
             .key_context("MessageEditor")
             .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(Self::chat_with_follow))
             .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
                 this.profile_selector
                     .read(cx)
@@ -614,7 +576,6 @@ impl MessageEditor {
             .on_action(cx.listener(Self::remove_all_context))
             .on_action(cx.listener(Self::move_up))
             .on_action(cx.listener(Self::expand_message_editor))
-            .on_action(cx.listener(Self::toggle_burn_mode))
             .capture_action(cx.listener(Self::paste))
             .gap_2()
             .p_2()
@@ -707,6 +668,7 @@ impl MessageEditor {
                             .justify_between()
                             .child(
                                 h_flex()
+                                    .gap_1()
                                     .child(self.render_follow_toggle(cx))
                                     .children(self.render_max_mode_toggle(cx)),
                             )
@@ -880,7 +842,7 @@ impl MessageEditor {
             .border_b_0()
             .border_color(border_color)
             .rounded_t_md()
-            .shadow(vec![gpui::BoxShadow {
+            .shadow(smallvec::smallvec![gpui::BoxShadow {
                 color: gpui::black().opacity(0.15),
                 offset: point(px(1.), px(-1.)),
                 blur_radius: px(3.),
@@ -1123,11 +1085,11 @@ impl MessageEditor {
         let plan = user_store
             .current_plan()
             .map(|plan| match plan {
-                Plan::Free => zed_llm_client::Plan::ZedFree,
+                Plan::Free => zed_llm_client::Plan::Free,
                 Plan::ZedPro => zed_llm_client::Plan::ZedPro,
                 Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
             })
-            .unwrap_or(zed_llm_client::Plan::ZedFree);
+            .unwrap_or(zed_llm_client::Plan::Free);
         let usage = self.thread.read(cx).last_usage().or_else(|| {
             maybe!({
                 let amount = user_store.model_request_usage_amount()?;
@@ -1205,10 +1167,9 @@ impl MessageEditor {
     fn reload_context(&mut self, cx: &mut Context<Self>) -> Task<Option<ContextLoadResult>> {
         let load_task = cx.spawn(async move |this, cx| {
             let Ok(load_task) = this.update(cx, |this, cx| {
-                let new_context = this
-                    .context_store
-                    .read(cx)
-                    .new_context_for_thread(this.thread.read(cx), None);
+                let new_context = this.context_store.read_with(cx, |context_store, cx| {
+                    context_store.new_context_for_thread(this.thread.read(cx), None)
+                });
                 load_context(new_context, &this.project, &this.prompt_store, cx)
             }) else {
                 return;
@@ -1287,13 +1248,12 @@ impl MessageEditor {
                     let request = language_model::LanguageModelRequest {
                         thread_id: None,
                         prompt_id: None,
-                        intent: None,
                         mode: None,
                         messages: vec![request_message],
                         tools: vec![],
                         tool_choice: None,
                         stop: vec![],
-                        temperature: AgentSettings::temperature_for_model(&model.model, cx),
+                        temperature: AssistantSettings::temperature_for_model(&model.model, cx),
                     };
 
                     Some(model.model.count_tokens(request, cx))

crates/agent/src/profile_selector.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use agent_settings::{
-    AgentDockPosition, AgentProfile, AgentProfileId, AgentSettings, GroupedAgentProfiles,
+use assistant_settings::{
+    AgentProfile, AgentProfileId, AssistantDockPosition, AssistantSettings, GroupedAgentProfiles,
     builtin_profiles,
 };
 use fs::Fs;
-use gpui::{Action, Empty, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
+use gpui::{Action, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
 use language_model::LanguageModelRegistry;
 use settings::{Settings as _, SettingsStore, update_settings_file};
 use ui::{
@@ -39,7 +39,7 @@ impl ProfileSelector {
         });
 
         Self {
-            profiles: GroupedAgentProfiles::from_settings(AgentSettings::get_global(cx)),
+            profiles: GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx)),
             fs,
             thread,
             thread_store,
@@ -54,7 +54,7 @@ impl ProfileSelector {
     }
 
     fn refresh_profiles(&mut self, cx: &mut Context<Self>) {
-        self.profiles = GroupedAgentProfiles::from_settings(AgentSettings::get_global(cx));
+        self.profiles = GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx));
     }
 
     fn build_context_menu(
@@ -63,7 +63,7 @@ impl ProfileSelector {
         cx: &mut Context<Self>,
     ) -> Entity<ContextMenu> {
         ContextMenu::build(window, cx, |mut menu, _window, cx| {
-            let settings = AgentSettings::get_global(cx);
+            let settings = AssistantSettings::get_global(cx);
             for (profile_id, profile) in self.profiles.builtin.iter() {
                 menu = menu.item(self.menu_entry_for_profile(
                     profile_id.clone(),
@@ -100,7 +100,7 @@ impl ProfileSelector {
         &self,
         profile_id: AgentProfileId,
         profile: &AgentProfile,
-        settings: &AgentSettings,
+        settings: &AssistantSettings,
         _cx: &App,
     ) -> ContextMenuEntry {
         let documentation = match profile.name.to_lowercase().as_str() {
@@ -126,7 +126,7 @@ impl ProfileSelector {
             let thread_store = self.thread_store.clone();
             let profile_id = profile_id.clone();
             move |_window, cx| {
-                update_settings_file::<AgentSettings>(fs.clone(), cx, {
+                update_settings_file::<AssistantSettings>(fs.clone(), cx, {
                     let profile_id = profile_id.clone();
                     move |settings, _cx| {
                         settings.set_profile(profile_id.clone());
@@ -145,7 +145,7 @@ impl ProfileSelector {
 
 impl Render for ProfileSelector {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
         let profile_id = &settings.default_profile;
         let profile = settings.profiles.get(profile_id);
 
@@ -153,15 +153,17 @@ impl Render for ProfileSelector {
             .map(|profile| profile.name.clone())
             .unwrap_or_else(|| "Unknown".into());
 
-        let configured_model = self.thread.read(cx).configured_model().or_else(|| {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            model_registry.default_model()
-        });
-        let Some(configured_model) = configured_model else {
-            return Empty.into_any_element();
-        };
+        let configured_model = self
+            .thread
+            .read_with(cx, |thread, _cx| thread.configured_model())
+            .or_else(|| {
+                let model_registry = LanguageModelRegistry::read_global(cx);
+                model_registry.default_model()
+            });
+        let supports_tools =
+            configured_model.map_or(false, |default| default.model.supports_tools());
 
-        if configured_model.model.supports_tools() {
+        if supports_tools {
             let this = cx.entity().clone();
             let focus_handle = self.focus_handle.clone();
             let trigger_button = Button::new("profile-selector-model", selected_profile)
@@ -208,10 +210,10 @@ impl Render for ProfileSelector {
     }
 }
 
-fn documentation_side(position: AgentDockPosition) -> DocumentationSide {
+fn documentation_side(position: AssistantDockPosition) -> DocumentationSide {
     match position {
-        AgentDockPosition::Left => DocumentationSide::Right,
-        AgentDockPosition::Bottom => DocumentationSide::Left,
-        AgentDockPosition::Right => DocumentationSide::Left,
+        AssistantDockPosition::Left => DocumentationSide::Right,
+        AssistantDockPosition::Bottom => DocumentationSide::Left,
+        AssistantDockPosition::Right => DocumentationSide::Left,
     }
 }

crates/agent/src/prompts/stale_files_prompt_header.txt

@@ -1 +0,0 @@
-These files changed since last read:

crates/agent/src/prompts/summarize_thread_detailed_prompt.txt

@@ -1,6 +0,0 @@
-Generate a detailed summary of this conversation. Include:
-1. A brief overview of what was discussed
-2. Key facts or information discovered
-3. Outcomes or conclusions reached
-4. Any action items or next steps if any
-Format it in Markdown with headings and bullet points.

crates/agent/src/prompts/summarize_thread_prompt.txt

@@ -1,4 +0,0 @@
-Generate a concise 3-7 word title for this conversation, omitting punctuation.
-Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`.
-If the conversation is about a specific subject, include it in the title.
-Be descriptive. DO NOT speak in the first person.

crates/agent/src/terminal_codegen.rs

@@ -179,21 +179,21 @@ impl TerminalTransaction {
         // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
         let input = Self::sanitize_input(hunk);
         self.terminal
-            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
+            .update(cx, |terminal, _| terminal.input(input));
     }
 
     pub fn undo(&self, cx: &mut App) {
         self.terminal
-            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
+            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
     }
 
     pub fn complete(&self, cx: &mut App) {
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
+        self.terminal.update(cx, |terminal, _| {
+            terminal.input(CARRIAGE_RETURN.to_string())
+        });
     }
 
-    fn sanitize_input(mut input: String) -> String {
-        input.retain(|c| c != '\r' && c != '\n');
-        input
+    fn sanitize_input(input: String) -> String {
+        input.replace(['\r', '\n'], "")
     }
 }

crates/agent/src/terminal_inline_assistant.rs

@@ -5,8 +5,8 @@ use crate::inline_prompt_editor::{
 };
 use crate::terminal_codegen::{CLEAR_INPUT, CodegenEvent, TerminalCodegen};
 use crate::thread_store::{TextThreadStore, ThreadStore};
-use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{MultiBuffer, actions::SelectAll};
@@ -25,7 +25,6 @@ use terminal_view::TerminalView;
 use ui::prelude::*;
 use util::ResultExt;
 use workspace::{Toast, Workspace, notifications::NotificationId};
-use zed_llm_client::CompletionIntent;
 
 pub fn init(
     fs: Arc<dyn Fs>,
@@ -106,7 +105,7 @@ impl TerminalInlineAssistant {
         });
         let prompt_editor_render = prompt_editor.clone();
         let block = terminal_view::BlockProperties {
-            height: 4,
+            height: 2,
             render: Box::new(move |_| prompt_editor_render.clone().into_any_element()),
         };
         terminal_view.update(cx, |terminal_view, cx| {
@@ -192,7 +191,7 @@ impl TerminalInlineAssistant {
         };
 
         self.prompt_history.retain(|prompt| *prompt != user_prompt);
-        self.prompt_history.push_back(user_prompt);
+        self.prompt_history.push_back(user_prompt.clone());
         if self.prompt_history.len() > PROMPT_HISTORY_MAX_LEN {
             self.prompt_history.pop_front();
         }
@@ -202,7 +201,7 @@ impl TerminalInlineAssistant {
             .update(cx, |terminal, cx| {
                 terminal
                     .terminal()
-                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
+                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
             })
             .log_err();
 
@@ -272,7 +271,7 @@ impl TerminalInlineAssistant {
             .inline_assistant_model()
             .context("No inline assistant model")?;
 
-        let temperature = AgentSettings::temperature_for_model(&model, cx);
+        let temperature = AssistantSettings::temperature_for_model(&model, cx);
 
         Ok(cx.background_spawn(async move {
             let mut request_message = LanguageModelRequestMessage {
@@ -292,7 +291,6 @@ impl TerminalInlineAssistant {
                 thread_id: None,
                 prompt_id: None,
                 mode: None,
-                intent: Some(CompletionIntent::TerminalInlineAssist),
                 messages: vec![request_message],
                 tools: Vec::new(),
                 tool_choice: None,

crates/agent/src/thread.rs

@@ -4,8 +4,8 @@ use std::ops::Range;
 use std::sync::Arc;
 use std::time::Instant;
 
-use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::{Result, anyhow};
+use assistant_settings::{AssistantSettings, CompletionMode};
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
@@ -22,7 +22,7 @@ use language_model::{
     ConfiguredModel, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
     LanguageModelId, LanguageModelKnownError, LanguageModelRegistry, LanguageModelRequest,
     LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
-    LanguageModelToolResultContent, LanguageModelToolUseId, MessageContent,
+    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent,
     ModelRequestLimitReachedError, PaymentRequiredError, RequestUsage, Role, SelectedModel,
     StopReason, TokenUsage,
 };
@@ -38,7 +38,7 @@ use thiserror::Error;
 use ui::Window;
 use util::{ResultExt as _, post_inc};
 use uuid::Uuid;
-use zed_llm_client::{CompletionIntent, CompletionRequestStatus};
+use zed_llm_client::CompletionRequestStatus;
 
 use crate::ThreadStore;
 use crate::context::{AgentContext, AgentContextHandle, ContextLoadResult, LoadedContext};
@@ -115,7 +115,6 @@ pub struct Message {
     pub segments: Vec<MessageSegment>,
     pub loaded_context: LoadedContext,
     pub creases: Vec<MessageCrease>,
-    pub is_hidden: bool,
 }
 
 impl Message {
@@ -215,7 +214,7 @@ pub struct GitState {
     pub diff: Option<String>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ThreadCheckpoint {
     message_id: MessageId,
     git_checkpoint: GitStoreCheckpoint,
@@ -330,7 +329,7 @@ pub struct Thread {
     detailed_summary_task: Task<Option<()>>,
     detailed_summary_tx: postage::watch::Sender<DetailedSummaryState>,
     detailed_summary_rx: postage::watch::Receiver<DetailedSummaryState>,
-    completion_mode: agent_settings::CompletionMode,
+    completion_mode: assistant_settings::CompletionMode,
     messages: Vec<Message>,
     next_message_id: MessageId,
     last_prompt_id: PromptId,
@@ -416,7 +415,7 @@ impl Thread {
             detailed_summary_task: Task::ready(None),
             detailed_summary_tx,
             detailed_summary_rx,
-            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
+            completion_mode: AssistantSettings::get_global(cx).preferred_completion_mode,
             messages: Vec::new(),
             next_message_id: MessageId(0),
             last_prompt_id: PromptId::new(),
@@ -459,7 +458,7 @@ impl Thread {
         tools: Entity<ToolWorkingSet>,
         prompt_builder: Arc<PromptBuilder>,
         project_context: SharedProjectContext,
-        window: Option<&mut Window>, // None in headless mode
+        window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
         let next_message_id = MessageId(
@@ -494,7 +493,7 @@ impl Thread {
 
         let completion_mode = serialized
             .completion_mode
-            .unwrap_or_else(|| AgentSettings::get_global(cx).preferred_completion_mode);
+            .unwrap_or_else(|| AssistantSettings::get_global(cx).preferred_completion_mode);
 
         Self {
             id,
@@ -541,7 +540,6 @@ impl Thread {
                             context: None,
                         })
                         .collect(),
-                    is_hidden: message.is_hidden,
                 })
                 .collect(),
             next_message_id,
@@ -562,7 +560,7 @@ impl Thread {
             cumulative_token_usage: serialized.cumulative_token_usage,
             exceeded_window_error: None,
             last_usage: None,
-            tool_use_limit_reached: serialized.tool_use_limit_reached,
+            tool_use_limit_reached: false,
             feedback: None,
             message_feedback: HashMap::default(),
             last_auto_capture_at: None,
@@ -759,14 +757,6 @@ impl Thread {
             return;
         };
 
-        self.finalize_checkpoint(pending_checkpoint, cx);
-    }
-
-    fn finalize_checkpoint(
-        &mut self,
-        pending_checkpoint: ThreadCheckpoint,
-        cx: &mut Context<Self>,
-    ) {
         let git_store = self.project.read(cx).git_store().clone();
         let final_checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
         cx.spawn(async move |this, cx| match final_checkpoint.await {
@@ -851,7 +841,7 @@ impl Thread {
             .get(ix + 1)
             .and_then(|message| {
                 self.message(message.id)
-                    .map(|next_message| next_message.role == Role::User && !next_message.is_hidden)
+                    .map(|next_message| next_message.role == Role::User)
             })
             .unwrap_or(false)
     }
@@ -890,13 +880,7 @@ impl Thread {
     }
 
     pub fn output_for_tool(&self, id: &LanguageModelToolUseId) -> Option<&Arc<str>> {
-        match &self.tool_use.tool_result(id)?.content {
-            LanguageModelToolResultContent::Text(text) => Some(text),
-            LanguageModelToolResultContent::Image(_) => {
-                // TODO: We should display image
-                None
-            }
-        }
+        Some(&self.tool_use.tool_result(id)?.content)
     }
 
     pub fn card_for_tool(&self, id: &LanguageModelToolUseId) -> Option<AnyToolCard> {
@@ -950,7 +934,6 @@ impl Thread {
             vec![MessageSegment::Text(text.into())],
             loaded_context.loaded_context,
             creases,
-            false,
             cx,
         );
 
@@ -966,20 +949,6 @@ impl Thread {
         message_id
     }
 
-    pub fn insert_invisible_continue_message(&mut self, cx: &mut Context<Self>) -> MessageId {
-        let id = self.insert_message(
-            Role::User,
-            vec![MessageSegment::Text("Continue where you left off".into())],
-            LoadedContext::default(),
-            vec![],
-            true,
-            cx,
-        );
-        self.pending_checkpoint = None;
-
-        id
-    }
-
     pub fn insert_assistant_message(
         &mut self,
         segments: Vec<MessageSegment>,
@@ -990,7 +959,6 @@ impl Thread {
             segments,
             LoadedContext::default(),
             Vec::new(),
-            false,
             cx,
         )
     }
@@ -1001,7 +969,6 @@ impl Thread {
         segments: Vec<MessageSegment>,
         loaded_context: LoadedContext,
         creases: Vec<MessageCrease>,
-        is_hidden: bool,
         cx: &mut Context<Self>,
     ) -> MessageId {
         let id = self.next_message_id.post_inc();
@@ -1011,7 +978,6 @@ impl Thread {
             segments,
             loaded_context,
             creases,
-            is_hidden,
         });
         self.touch_updated_at();
         cx.emit(ThreadEvent::MessageAdded(id));
@@ -1024,7 +990,6 @@ impl Thread {
         new_role: Role,
         new_segments: Vec<MessageSegment>,
         loaded_context: Option<LoadedContext>,
-        checkpoint: Option<GitStoreCheckpoint>,
         cx: &mut Context<Self>,
     ) -> bool {
         let Some(message) = self.messages.iter_mut().find(|message| message.id == id) else {
@@ -1035,15 +1000,6 @@ impl Thread {
         if let Some(context) = loaded_context {
             message.loaded_context = context;
         }
-        if let Some(git_checkpoint) = checkpoint {
-            self.checkpoints_by_message.insert(
-                id,
-                ThreadCheckpoint {
-                    message_id: id,
-                    git_checkpoint,
-                },
-            );
-        }
         self.touch_updated_at();
         cx.emit(ThreadEvent::MessageEdited(id));
         true
@@ -1152,7 +1108,6 @@ impl Thread {
                                 label: crease.metadata.label.clone(),
                             })
                             .collect(),
-                        is_hidden: message.is_hidden,
                     })
                     .collect(),
                 initial_project_snapshot,
@@ -1168,7 +1123,6 @@ impl Thread {
                         model: model.model.id().0.to_string(),
                     }),
                 completion_mode: Some(this.completion_mode),
-                tool_use_limit_reached: this.tool_use_limit_reached,
             })
         })
     }
@@ -1184,7 +1138,6 @@ impl Thread {
     pub fn send_to_model(
         &mut self,
         model: Arc<dyn LanguageModel>,
-        intent: CompletionIntent,
         window: Option<AnyWindowHandle>,
         cx: &mut Context<Self>,
     ) {
@@ -1194,7 +1147,7 @@ impl Thread {
 
         self.remaining_turns -= 1;
 
-        let request = self.to_completion_request(model.clone(), intent, cx);
+        let request = self.to_completion_request(model.clone(), cx);
 
         self.stream_completion(request, model, window, cx);
     }
@@ -1214,19 +1167,17 @@ impl Thread {
     pub fn to_completion_request(
         &self,
         model: Arc<dyn LanguageModel>,
-        intent: CompletionIntent,
         cx: &mut Context<Self>,
     ) -> LanguageModelRequest {
         let mut request = LanguageModelRequest {
             thread_id: Some(self.id.to_string()),
             prompt_id: Some(self.last_prompt_id.to_string()),
-            intent: Some(intent),
             mode: None,
             messages: vec![],
             tools: Vec::new(),
             tool_choice: None,
             stop: Vec::new(),
-            temperature: AgentSettings::temperature_for_model(&model, cx),
+            temperature: AssistantSettings::temperature_for_model(&model, cx),
         };
 
         let available_tools = self.available_tools(cx, model.clone());
@@ -1374,20 +1325,18 @@ impl Thread {
     fn to_summarize_request(
         &self,
         model: &Arc<dyn LanguageModel>,
-        intent: CompletionIntent,
         added_user_message: String,
         cx: &App,
     ) -> LanguageModelRequest {
         let mut request = LanguageModelRequest {
             thread_id: None,
             prompt_id: None,
-            intent: Some(intent),
             mode: None,
             messages: vec![],
             tools: Vec::new(),
             tool_choice: None,
             stop: Vec::new(),
-            temperature: AgentSettings::temperature_for_model(model, cx),
+            temperature: AssistantSettings::temperature_for_model(model, cx),
         };
 
         for message in &self.messages {
@@ -1428,7 +1377,7 @@ impl Thread {
         messages: &mut Vec<LanguageModelRequestMessage>,
         cx: &App,
     ) {
-        const STALE_FILES_HEADER: &str = include_str!("./prompts/stale_files_prompt_header.txt");
+        const STALE_FILES_HEADER: &str = "These files changed since last read:";
 
         let mut stale_message = String::new();
 
@@ -1440,7 +1389,7 @@ impl Thread {
             };
 
             if stale_message.is_empty() {
-                write!(&mut stale_message, "{}\n", STALE_FILES_HEADER.trim()).ok();
+                write!(&mut stale_message, "{}\n", STALE_FILES_HEADER).ok();
             }
 
             writeln!(&mut stale_message, "- {}", file.path().display()).ok();
@@ -1662,7 +1611,7 @@ impl Thread {
                                         CompletionRequestStatus::Failed {
                                             code, message, request_id
                                         } => {
-                                            anyhow::bail!("completion request failed. request_id: {request_id}, code: {code}, message: {message}");
+                                            return Err(anyhow!("completion request failed. request_id: {request_id}, code: {code}, message: {message}"));
                                         }
                                         CompletionRequestStatus::UsageUpdated {
                                             amount, limit
@@ -1673,7 +1622,6 @@ impl Thread {
                                         }
                                         CompletionRequestStatus::ToolUseLimitReached => {
                                             thread.tool_use_limit_reached = true;
-                                            cx.emit(ThreadEvent::ToolUseLimitReached);
                                         }
                                     }
                                 }
@@ -1726,43 +1674,6 @@ impl Thread {
                                     project.set_agent_location(None, cx);
                                 });
                             }
-                            StopReason::Refusal => {
-                                thread.project.update(cx, |project, cx| {
-                                    project.set_agent_location(None, cx);
-                                });
-
-                                // Remove the turn that was refused.
-                                //
-                                // https://docs.anthropic.com/en/docs/test-and-evaluate/strengthen-guardrails/handle-streaming-refusals#reset-context-after-refusal
-                                {
-                                    let mut messages_to_remove = Vec::new();
-
-                                    for (ix, message) in thread.messages.iter().enumerate().rev() {
-                                        messages_to_remove.push(message.id);
-
-                                        if message.role == Role::User {
-                                            if ix == 0 {
-                                                break;
-                                            }
-
-                                            if let Some(prev_message) = thread.messages.get(ix - 1) {
-                                                if prev_message.role == Role::Assistant {
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-
-                                    for message_id in messages_to_remove {
-                                        thread.delete_message(message_id, cx);
-                                    }
-                                }
-
-                                cx.emit(ThreadEvent::ShowError(ThreadError::Message {
-                                    header: "Language model refusal".into(),
-                                    message: "Model refused to generate content for safety reasons.".into(),
-                                }));
-                            }
                         },
                         Err(error) => {
                             thread.project.update(cx, |project, cx| {
@@ -1771,6 +1682,10 @@ impl Thread {
 
                             if error.is::<PaymentRequiredError>() {
                                 cx.emit(ThreadEvent::ShowError(ThreadError::PaymentRequired));
+                            } else if error.is::<MaxMonthlySpendReachedError>() {
+                                cx.emit(ThreadEvent::ShowError(
+                                    ThreadError::MaxMonthlySpendReached,
+                                ));
                             } else if let Some(error) =
                                 error.downcast_ref::<ModelRequestLimitReachedError>()
                             {
@@ -1806,7 +1721,6 @@ impl Thread {
                             thread.cancel_last_completion(window, cx);
                         }
                     }
-
                     cx.emit(ThreadEvent::Stopped(result.map_err(Arc::new)));
 
                     if let Some((request_callback, (request, response_events))) = thread
@@ -1855,14 +1769,12 @@ impl Thread {
             return;
         }
 
-        let added_user_message = include_str!("./prompts/summarize_thread_prompt.txt");
+        let added_user_message = "Generate a concise 3-7 word title for this conversation, omitting punctuation. \
+            Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`. \
+            If the conversation is about a specific subject, include it in the title. \
+            Be descriptive. DO NOT speak in the first person.";
 
-        let request = self.to_summarize_request(
-            &model.model,
-            CompletionIntent::ThreadSummarization,
-            added_user_message.into(),
-            cx,
-        );
+        let request = self.to_summarize_request(&model.model, added_user_message.into(), cx);
 
         self.summary = ThreadSummary::Generating;
 
@@ -1956,14 +1868,14 @@ impl Thread {
             return;
         }
 
-        let added_user_message = include_str!("./prompts/summarize_thread_detailed_prompt.txt");
+        let added_user_message = "Generate a detailed summary of this conversation. Include:\n\
+             1. A brief overview of what was discussed\n\
+             2. Key facts or information discovered\n\
+             3. Outcomes or conclusions reached\n\
+             4. Any action items or next steps if any\n\
+             Format it in Markdown with headings and bullet points.";
 
-        let request = self.to_summarize_request(
-            &model,
-            CompletionIntent::ThreadContextSummarization,
-            added_user_message.into(),
-            cx,
-        );
+        let request = self.to_summarize_request(&model, added_user_message.into(), cx);
 
         *self.detailed_summary_tx.borrow_mut() = DetailedSummaryState::Generating {
             message_id: last_message_id,
@@ -2055,8 +1967,7 @@ impl Thread {
         model: Arc<dyn LanguageModel>,
     ) -> Vec<PendingToolUse> {
         self.auto_capture_telemetry(cx);
-        let request =
-            Arc::new(self.to_completion_request(model.clone(), CompletionIntent::ToolResults, cx));
+        let request = Arc::new(self.to_completion_request(model.clone(), cx));
         let pending_tool_uses = self
             .tool_use
             .pending_tool_uses()
@@ -2068,7 +1979,7 @@ impl Thread {
         for tool_use in pending_tool_uses.iter() {
             if let Some(tool) = self.tools.read(cx).tool(&tool_use.name, cx) {
                 if tool.needs_confirmation(&tool_use.input, cx)
-                    && !AgentSettings::get_global(cx).always_allow_tool_actions
+                    && !AssistantSettings::get_global(cx).always_allow_tool_actions
                 {
                     self.tool_use.confirm_tool_use(
                         tool_use.id.clone(),
@@ -2252,7 +2163,7 @@ impl Thread {
         if self.all_tools_finished() {
             if let Some(ConfiguredModel { model, .. }) = self.configured_model.as_ref() {
                 if !canceled {
-                    self.send_to_model(model.clone(), CompletionIntent::ToolResults, window, cx);
+                    self.send_to_model(model.clone(), window, cx);
                 }
                 self.auto_capture_telemetry(cx);
             }
@@ -2285,17 +2196,10 @@ impl Thread {
             );
         }
 
+        self.finalize_pending_checkpoint(cx);
+
         if canceled {
             cx.emit(ThreadEvent::CompletionCanceled);
-
-            // When canceled, we always want to insert the checkpoint.
-            // (We skip over finalize_pending_checkpoint, because it
-            // would conclude we didn't have anything to insert here.)
-            if let Some(checkpoint) = self.pending_checkpoint.take() {
-                self.insert_checkpoint(checkpoint, cx);
-            }
-        } else {
-            self.finalize_pending_checkpoint(cx);
         }
 
         canceled
@@ -2337,7 +2241,7 @@ impl Thread {
             .read(cx)
             .enabled_tools(cx)
             .iter()
-            .map(|tool| tool.name())
+            .map(|tool| tool.name().to_string())
             .collect();
 
         self.message_feedback.insert(message_id, feedback);
@@ -2598,15 +2502,7 @@ impl Thread {
                 }
 
                 writeln!(markdown, "**\n")?;
-                match &tool_result.content {
-                    LanguageModelToolResultContent::Text(text) => {
-                        writeln!(markdown, "{text}")?;
-                    }
-                    LanguageModelToolResultContent::Image(image) => {
-                        writeln!(markdown, "![Image](data:base64,{})", image.source)?;
-                    }
-                }
-
+                writeln!(markdown, "{}", tool_result.content)?;
                 if let Some(output) = tool_result.output.as_ref() {
                     writeln!(
                         markdown,
@@ -2677,7 +2573,7 @@ impl Thread {
             .read(cx)
             .current_user()
             .map(|user| user.github_login.clone());
-        let client = self.project.read(cx).client();
+        let client = self.project.read(cx).client().clone();
         let serialize_task = self.serialize(cx);
 
         cx.background_executor()
@@ -2796,6 +2692,8 @@ impl Thread {
 pub enum ThreadError {
     #[error("Payment required")]
     PaymentRequired,
+    #[error("Max monthly spend reached")]
+    MaxMonthlySpendReached,
     #[error("Model request limit reached")]
     ModelRequestLimitReached { plan: Plan },
     #[error("Message {header}: {message}")]
@@ -2844,7 +2742,6 @@ pub enum ThreadEvent {
     },
     CheckpointChanged,
     ToolConfirmationNeeded,
-    ToolUseLimitReached,
     CancelEditing,
     CompletionCanceled,
 }
@@ -2861,7 +2758,7 @@ struct PendingCompletion {
 mod tests {
     use super::*;
     use crate::{ThreadStore, context::load_context, context_store::ContextStore, thread_store};
-    use agent_settings::{AgentSettings, LanguageModelParameters};
+    use assistant_settings::{AssistantSettings, LanguageModelParameters};
     use assistant_tool::ToolRegistry;
     use editor::EditorSettings;
     use gpui::TestAppContext;
@@ -2892,8 +2789,7 @@ mod tests {
             .await
             .unwrap();
 
-        let context =
-            context_store.read_with(cx, |store, _| store.context().next().cloned().unwrap());
+        let context = context_store.update(cx, |store, _| store.context().next().cloned().unwrap());
         let loaded_context = cx
             .update(|cx| load_context(vec![context], &project, &None, cx))
             .await;
@@ -2944,7 +2840,7 @@ fn main() {{
 
         // Check message in request
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         assert_eq!(request.messages.len(), 2);
@@ -3039,7 +2935,7 @@ fn main() {{
 
         // Check entire request to make sure all contexts are properly included
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         // The request should contain all 3 messages
@@ -3146,7 +3042,7 @@ fn main() {{
 
         // Check message in request
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         assert_eq!(request.messages.len(), 2);
@@ -3172,7 +3068,7 @@ fn main() {{
 
         // Check that both messages appear in the request
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         assert_eq!(request.messages.len(), 3);
@@ -3204,8 +3100,7 @@ fn main() {{
             .await
             .unwrap();
 
-        let context =
-            context_store.read_with(cx, |store, _| store.context().next().cloned().unwrap());
+        let context = context_store.update(cx, |store, _| store.context().next().cloned().unwrap());
         let loaded_context = cx
             .update(|cx| load_context(vec![context], &project, &None, cx))
             .await;
@@ -3217,7 +3112,7 @@ fn main() {{
 
         // Create a request and check that it doesn't have a stale buffer warning yet
         let initial_request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         // Make sure we don't have a stale file warning yet
@@ -3253,7 +3148,7 @@ fn main() {{
 
         // Create a new request and check for the stale buffer warning
         let new_request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
 
         // We should have a stale file warning as the last message
@@ -3289,81 +3184,81 @@ fn main() {{
 
         // Both model and provider
         cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
+            AssistantSettings::override_global(
+                AssistantSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: Some(model.provider_id().0.to_string().into()),
                         model: Some(model.id().0.clone()),
                         temperature: Some(0.66),
                     }],
-                    ..AgentSettings::get_global(cx).clone()
+                    ..AssistantSettings::get_global(cx).clone()
                 },
                 cx,
             );
         });
 
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
         assert_eq!(request.temperature, Some(0.66));
 
         // Only model
         cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
+            AssistantSettings::override_global(
+                AssistantSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: None,
                         model: Some(model.id().0.clone()),
                         temperature: Some(0.66),
                     }],
-                    ..AgentSettings::get_global(cx).clone()
+                    ..AssistantSettings::get_global(cx).clone()
                 },
                 cx,
             );
         });
 
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
         assert_eq!(request.temperature, Some(0.66));
 
         // Only provider
         cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
+            AssistantSettings::override_global(
+                AssistantSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: Some(model.provider_id().0.to_string().into()),
                         model: None,
                         temperature: Some(0.66),
                     }],
-                    ..AgentSettings::get_global(cx).clone()
+                    ..AssistantSettings::get_global(cx).clone()
                 },
                 cx,
             );
         });
 
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
         assert_eq!(request.temperature, Some(0.66));
 
         // Same model name, different provider
         cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
+            AssistantSettings::override_global(
+                AssistantSettings {
                     model_parameters: vec![LanguageModelParameters {
                         provider: Some("anthropic".into()),
                         model: Some(model.id().0.clone()),
                         temperature: Some(0.66),
                     }],
-                    ..AgentSettings::get_global(cx).clone()
+                    ..AssistantSettings::get_global(cx).clone()
                 },
                 cx,
             );
         });
 
         let request = thread.update(cx, |thread, cx| {
-            thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx)
+            thread.to_completion_request(model.clone(), cx)
         });
         assert_eq!(request.temperature, None);
     }
@@ -3395,12 +3290,7 @@ fn main() {{
         // Send a message
         thread.update(cx, |thread, cx| {
             thread.insert_user_message("Hi!", ContextLoadResult::default(), None, vec![], cx);
-            thread.send_to_model(
-                model.clone(),
-                CompletionIntent::ThreadSummarization,
-                None,
-                cx,
-            );
+            thread.send_to_model(model.clone(), None, cx);
         });
 
         let fake_model = model.as_fake();
@@ -3422,8 +3312,8 @@ fn main() {{
         });
 
         cx.run_until_parked();
-        fake_model.stream_last_completion_response("Brief");
-        fake_model.stream_last_completion_response(" Introduction");
+        fake_model.stream_last_completion_response("Brief".into());
+        fake_model.stream_last_completion_response(" Introduction".into());
         fake_model.end_last_completion_stream();
         cx.run_until_parked();
 
@@ -3495,7 +3385,7 @@ fn main() {{
                 vec![],
                 cx,
             );
-            thread.send_to_model(model.clone(), CompletionIntent::UserPrompt, None, cx);
+            thread.send_to_model(model.clone(), None, cx);
         });
 
         let fake_model = model.as_fake();
@@ -3516,7 +3406,7 @@ fn main() {{
         });
 
         cx.run_until_parked();
-        fake_model.stream_last_completion_response("A successful summary");
+        fake_model.stream_last_completion_response("A successful summary".into());
         fake_model.end_last_completion_stream();
         cx.run_until_parked();
 
@@ -3533,12 +3423,7 @@ fn main() {{
     ) {
         thread.update(cx, |thread, cx| {
             thread.insert_user_message("Hi!", ContextLoadResult::default(), None, vec![], cx);
-            thread.send_to_model(
-                model.clone(),
-                CompletionIntent::ThreadSummarization,
-                None,
-                cx,
-            );
+            thread.send_to_model(model.clone(), None, cx);
         });
 
         let fake_model = model.as_fake();
@@ -3563,7 +3448,7 @@ fn main() {{
 
     fn simulate_successful_response(fake_model: &FakeLanguageModel, cx: &mut TestAppContext) {
         cx.run_until_parked();
-        fake_model.stream_last_completion_response("Assistant response");
+        fake_model.stream_last_completion_response("Assistant response".into());
         fake_model.end_last_completion_stream();
         cx.run_until_parked();
     }
@@ -3574,7 +3459,7 @@ fn main() {{
             cx.set_global(settings_store);
             language::init(cx);
             Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
             prompt_store::init(cx);
             thread_store::init(cx);
             workspace::init_settings(cx);

crates/agent/src/thread_history.rs

@@ -260,7 +260,10 @@ impl ThreadHistory {
             }
         });
 
-        self.search_state = SearchState::Searching { query, _task: task };
+        self.search_state = SearchState::Searching {
+            query: query.clone(),
+            _task: task,
+        };
         cx.notify();
     }
 

crates/agent/src/thread_store.rs

@@ -1,10 +1,11 @@
+use std::borrow::Cow;
 use std::cell::{Ref, RefCell};
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
-use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, CompletionMode};
 use assistant_tool::{ToolId, ToolSource, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
@@ -16,8 +17,9 @@ use gpui::{
     App, BackgroundExecutor, Context, Entity, EventEmitter, Global, ReadGlobal, SharedString,
     Subscription, Task, prelude::*,
 };
-
-use language_model::{LanguageModelToolResultContent, LanguageModelToolUseId, Role, TokenUsage};
+use heed::Database;
+use heed::types::SerdeBincode;
+use language_model::{LanguageModelToolUseId, Role, TokenUsage};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
@@ -33,42 +35,6 @@ use crate::context_server_tool::ContextServerTool;
 use crate::thread::{
     DetailedSummaryState, ExceededWindowError, MessageId, ProjectSnapshot, Thread, ThreadId,
 };
-use indoc::indoc;
-use sqlez::{
-    bindable::{Bind, Column},
-    connection::Connection,
-    statement::Statement,
-};
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DataType {
-    #[serde(rename = "json")]
-    Json,
-    #[serde(rename = "zstd")]
-    Zstd,
-}
-
-impl Bind for DataType {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let value = match self {
-            DataType::Json => "json",
-            DataType::Zstd => "zstd",
-        };
-        value.bind(statement, start_index)
-    }
-}
-
-impl Column for DataType {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (value, next_index) = String::column(statement, start_index)?;
-        let data_type = match value.as_str() {
-            "json" => DataType::Json,
-            "zstd" => DataType::Zstd,
-            _ => anyhow::bail!("Unknown data type: {}", value),
-        };
-        Ok((data_type, next_index))
-    }
-}
 
 const RULES_FILE_NAMES: [&'static str; 6] = [
     ".rules",
@@ -420,25 +386,6 @@ impl ThreadStore {
         })
     }
 
-    pub fn create_thread_from_serialized(
-        &mut self,
-        serialized: SerializedThread,
-        cx: &mut Context<Self>,
-    ) -> Entity<Thread> {
-        cx.new(|cx| {
-            Thread::deserialize(
-                ThreadId::new(),
-                serialized,
-                self.project.clone(),
-                self.tools.clone(),
-                self.prompt_builder.clone(),
-                self.project_context.clone(),
-                None,
-                cx,
-            )
-        })
-    }
-
     pub fn open_thread(
         &self,
         id: &ThreadId,
@@ -453,7 +400,7 @@ impl ThreadStore {
             let thread = database
                 .try_find_thread(id.clone())
                 .await?
-                .with_context(|| format!("no thread found with ID: {id:?}"))?;
+                .ok_or_else(|| anyhow!("no thread found with ID: {id:?}"))?;
 
             let thread = this.update_in(cx, |this, window, cx| {
                 cx.new(|cx| {
@@ -464,7 +411,7 @@ impl ThreadStore {
                         this.tools.clone(),
                         this.prompt_builder.clone(),
                         this.project_context.clone(),
-                        Some(window),
+                        window,
                         cx,
                     )
                 })
@@ -519,13 +466,13 @@ impl ThreadStore {
     }
 
     fn load_default_profile(&self, cx: &mut Context<Self>) {
-        let assistant_settings = AgentSettings::get_global(cx);
+        let assistant_settings = AssistantSettings::get_global(cx);
 
         self.load_profile_by_id(assistant_settings.default_profile.clone(), cx);
     }
 
     pub fn load_profile_by_id(&self, profile_id: AgentProfileId, cx: &mut Context<Self>) {
-        let assistant_settings = AgentSettings::get_global(cx);
+        let assistant_settings = AssistantSettings::get_global(cx);
 
         if let Some(profile) = assistant_settings.profiles.get(&profile_id) {
             self.load_profile(profile.clone(), cx);
@@ -539,8 +486,8 @@ impl ThreadStore {
                 ToolSource::Native,
                 &profile
                     .tools
-                    .into_iter()
-                    .filter_map(|(tool, enabled)| enabled.then(|| tool))
+                    .iter()
+                    .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
                     .collect::<Vec<_>>(),
                 cx,
             );
@@ -564,32 +511,32 @@ impl ThreadStore {
                 });
             }
             // Enable all the tools from all context servers, but disable the ones that are explicitly disabled
-            for (context_server_id, preset) in profile.context_servers {
+            for (context_server_id, preset) in &profile.context_servers {
                 self.tools.update(cx, |tools, cx| {
                     tools.disable(
                         ToolSource::ContextServer {
-                            id: context_server_id.into(),
+                            id: context_server_id.clone().into(),
                         },
                         &preset
                             .tools
-                            .into_iter()
-                            .filter_map(|(tool, enabled)| (!enabled).then(|| tool))
+                            .iter()
+                            .filter_map(|(tool, enabled)| (!enabled).then(|| tool.clone()))
                             .collect::<Vec<_>>(),
                         cx,
                     )
                 })
             }
         } else {
-            for (context_server_id, preset) in profile.context_servers {
+            for (context_server_id, preset) in &profile.context_servers {
                 self.tools.update(cx, |tools, cx| {
                     tools.enable(
                         ToolSource::ContextServer {
-                            id: context_server_id.into(),
+                            id: context_server_id.clone().into(),
                         },
                         &preset
                             .tools
-                            .into_iter()
-                            .filter_map(|(tool, enabled)| enabled.then(|| tool))
+                            .iter()
+                            .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
                             .collect::<Vec<_>>(),
                         cx,
                     )
@@ -710,8 +657,6 @@ pub struct SerializedThread {
     pub model: Option<SerializedLanguageModel>,
     #[serde(default)]
     pub completion_mode: Option<CompletionMode>,
-    #[serde(default)]
-    pub tool_use_limit_reached: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -735,14 +680,20 @@ impl SerializedThread {
                 SerializedThread::VERSION => Ok(serde_json::from_value::<SerializedThread>(
                     saved_thread_json,
                 )?),
-                _ => anyhow::bail!("unrecognized serialized thread version: {version:?}"),
+                _ => Err(anyhow!(
+                    "unrecognized serialized thread version: {}",
+                    version
+                )),
             },
             None => {
                 let saved_thread =
                     serde_json::from_value::<LegacySerializedThread>(saved_thread_json)?;
                 Ok(saved_thread.upgrade())
             }
-            version => anyhow::bail!("unrecognized serialized thread version: {version:?}"),
+            version => Err(anyhow!(
+                "unrecognized serialized thread version: {:?}",
+                version
+            )),
         }
     }
 }
@@ -793,8 +744,6 @@ pub struct SerializedMessage {
     pub context: String,
     #[serde(default)]
     pub creases: Vec<SerializedCrease>,
-    #[serde(default)]
-    pub is_hidden: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -826,7 +775,7 @@ pub struct SerializedToolUse {
 pub struct SerializedToolResult {
     pub tool_use_id: LanguageModelToolUseId,
     pub is_error: bool,
-    pub content: LanguageModelToolResultContent,
+    pub content: Arc<str>,
     pub output: Option<serde_json::Value>,
 }
 
@@ -853,7 +802,6 @@ impl LegacySerializedThread {
             exceeded_window_error: None,
             model: None,
             completion_mode: None,
-            tool_use_limit_reached: false,
         }
     }
 }
@@ -879,7 +827,6 @@ impl LegacySerializedMessage {
             tool_results: self.tool_results,
             context: String::new(),
             creases: Vec::new(),
-            is_hidden: false,
         }
     }
 }
@@ -900,27 +847,25 @@ impl Global for GlobalThreadsDatabase {}
 
 pub(crate) struct ThreadsDatabase {
     executor: BackgroundExecutor,
-    connection: Arc<Mutex<Connection>>,
+    env: heed::Env,
+    threads: Database<SerdeBincode<ThreadId>, SerializedThread>,
 }
 
-impl ThreadsDatabase {
-    fn connection(&self) -> Arc<Mutex<Connection>> {
-        self.connection.clone()
-    }
+impl heed::BytesEncode<'_> for SerializedThread {
+    type EItem = SerializedThread;
 
-    const COMPRESSION_LEVEL: i32 = 3;
-}
-
-impl Bind for ThreadId {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.to_string().bind(statement, start_index)
+    fn bytes_encode(item: &Self::EItem) -> Result<Cow<[u8]>, heed::BoxedError> {
+        serde_json::to_vec(item).map(Cow::Owned).map_err(Into::into)
     }
 }
 
-impl Column for ThreadId {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (id_str, next_index) = String::column(statement, start_index)?;
-        Ok((ThreadId::from(id_str.as_str()), next_index))
+impl<'a> heed::BytesDecode<'a> for SerializedThread {
+    type DItem = SerializedThread;
+
+    fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
+        // We implement this type manually because we want to call `SerializedThread::from_json`,
+        // instead of the Deserialize trait implementation for `SerializedThread`.
+        SerializedThread::from_json(bytes).map_err(Into::into)
     }
 }
 
@@ -936,8 +881,8 @@ impl ThreadsDatabase {
         let database_future = executor
             .spawn({
                 let executor = executor.clone();
-                let threads_dir = paths::data_dir().join("threads");
-                async move { ThreadsDatabase::new(threads_dir, executor) }
+                let database_path = paths::data_dir().join("threads/threads-db.1.mdb");
+                async move { ThreadsDatabase::new(database_path, executor) }
             })
             .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
             .boxed()
@@ -946,144 +891,41 @@ impl ThreadsDatabase {
         cx.set_global(GlobalThreadsDatabase(database_future));
     }
 
-    pub fn new(threads_dir: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
-        std::fs::create_dir_all(&threads_dir)?;
-
-        let sqlite_path = threads_dir.join("threads.db");
-        let mdb_path = threads_dir.join("threads-db.1.mdb");
-
-        let needs_migration_from_heed = mdb_path.exists();
-
-        let connection = Connection::open_file(&sqlite_path.to_string_lossy());
-
-        connection.exec(indoc! {"
-                CREATE TABLE IF NOT EXISTS threads (
-                    id TEXT PRIMARY KEY,
-                    summary TEXT NOT NULL,
-                    updated_at TEXT NOT NULL,
-                    data_type TEXT NOT NULL,
-                    data BLOB NOT NULL
-                )
-            "})?()
-        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
-
-        let db = Self {
-            executor: executor.clone(),
-            connection: Arc::new(Mutex::new(connection)),
-        };
-
-        if needs_migration_from_heed {
-            let db_connection = db.connection();
-            let executor_clone = executor.clone();
-            executor
-                .spawn(async move {
-                    log::info!("Starting threads.db migration");
-                    Self::migrate_from_heed(&mdb_path, db_connection, executor_clone)?;
-                    std::fs::remove_dir_all(mdb_path)?;
-                    log::info!("threads.db migrated to sqlite");
-                    Ok::<(), anyhow::Error>(())
-                })
-                .detach();
-        }
-
-        Ok(db)
-    }
-
-    // Remove this migration after 2025-09-01
-    fn migrate_from_heed(
-        mdb_path: &Path,
-        connection: Arc<Mutex<Connection>>,
-        _executor: BackgroundExecutor,
-    ) -> Result<()> {
-        use heed::types::SerdeBincode;
-        struct SerializedThreadHeed(SerializedThread);
-
-        impl heed::BytesEncode<'_> for SerializedThreadHeed {
-            type EItem = SerializedThreadHeed;
-
-            fn bytes_encode(
-                item: &Self::EItem,
-            ) -> Result<std::borrow::Cow<[u8]>, heed::BoxedError> {
-                serde_json::to_vec(&item.0)
-                    .map(std::borrow::Cow::Owned)
-                    .map_err(Into::into)
-            }
-        }
-
-        impl<'a> heed::BytesDecode<'a> for SerializedThreadHeed {
-            type DItem = SerializedThreadHeed;
-
-            fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
-                SerializedThread::from_json(bytes)
-                    .map(SerializedThreadHeed)
-                    .map_err(Into::into)
-            }
-        }
+    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
+        std::fs::create_dir_all(&path)?;
 
         const ONE_GB_IN_BYTES: usize = 1024 * 1024 * 1024;
-
         let env = unsafe {
             heed::EnvOpenOptions::new()
                 .map_size(ONE_GB_IN_BYTES)
                 .max_dbs(1)
-                .open(mdb_path)?
+                .open(path)?
         };
 
-        let txn = env.write_txn()?;
-        let threads: heed::Database<SerdeBincode<ThreadId>, SerializedThreadHeed> = env
-            .open_database(&txn, Some("threads"))?
-            .ok_or_else(|| anyhow!("threads database not found"))?;
+        let mut txn = env.write_txn()?;
+        let threads = env.create_database(&mut txn, Some("threads"))?;
+        txn.commit()?;
 
-        for result in threads.iter(&txn)? {
-            let (thread_id, thread_heed) = result?;
-            Self::save_thread_sync(&connection, thread_id, thread_heed.0)?;
-        }
-
-        Ok(())
-    }
-
-    fn save_thread_sync(
-        connection: &Arc<Mutex<Connection>>,
-        id: ThreadId,
-        thread: SerializedThread,
-    ) -> Result<()> {
-        let json_data = serde_json::to_string(&thread)?;
-        let summary = thread.summary.to_string();
-        let updated_at = thread.updated_at.to_rfc3339();
-
-        let connection = connection.lock().unwrap();
-
-        let compressed = zstd::encode_all(json_data.as_bytes(), Self::COMPRESSION_LEVEL)?;
-        let data_type = DataType::Zstd;
-        let data = compressed;
-
-        let mut insert = connection.exec_bound::<(ThreadId, String, String, DataType, Vec<u8>)>(indoc! {"
-            INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
-        "})?;
-
-        insert((id, summary, updated_at, data_type, data))?;
-
-        Ok(())
+        Ok(Self {
+            executor,
+            env,
+            threads,
+        })
     }
 
     pub fn list_threads(&self) -> Task<Result<Vec<SerializedThreadMetadata>>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;
 
         self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-            let mut select =
-                connection.select_bound::<(), (ThreadId, String, String)>(indoc! {"
-                SELECT id, summary, updated_at FROM threads ORDER BY updated_at DESC
-            "})?;
-
-            let rows = select(())?;
+            let txn = env.read_txn()?;
+            let mut iter = threads.iter(&txn)?;
             let mut threads = Vec::new();
-
-            for (id, summary, updated_at) in rows {
+            while let Some((key, value)) = iter.next().transpose()? {
                 threads.push(SerializedThreadMetadata {
-                    id,
-                    summary: summary.into(),
-                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
+                    id: key,
+                    summary: value.summary,
+                    updated_at: value.updated_at,
                 });
             }
 
@@ -1092,51 +934,36 @@ impl ThreadsDatabase {
     }
 
     pub fn try_find_thread(&self, id: ThreadId) -> Task<Result<Option<SerializedThread>>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;
 
         self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-            let mut select = connection.select_bound::<ThreadId, (DataType, Vec<u8>)>(indoc! {"
-                SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
-            "})?;
-
-            let rows = select(id)?;
-            if let Some((data_type, data)) = rows.into_iter().next() {
-                let json_data = match data_type {
-                    DataType::Zstd => {
-                        let decompressed = zstd::decode_all(&data[..])?;
-                        String::from_utf8(decompressed)?
-                    }
-                    DataType::Json => String::from_utf8(data)?,
-                };
-
-                let thread = SerializedThread::from_json(json_data.as_bytes())?;
-                Ok(Some(thread))
-            } else {
-                Ok(None)
-            }
+            let txn = env.read_txn()?;
+            let thread = threads.get(&txn, &id)?;
+            Ok(thread)
         })
     }
 
     pub fn save_thread(&self, id: ThreadId, thread: SerializedThread) -> Task<Result<()>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;
 
-        self.executor
-            .spawn(async move { Self::save_thread_sync(&connection, id, thread) })
+        self.executor.spawn(async move {
+            let mut txn = env.write_txn()?;
+            threads.put(&mut txn, &id, &thread)?;
+            txn.commit()?;
+            Ok(())
+        })
     }
 
     pub fn delete_thread(&self, id: ThreadId) -> Task<Result<()>> {
-        let connection = self.connection.clone();
+        let env = self.env.clone();
+        let threads = self.threads;
 
         self.executor.spawn(async move {
-            let connection = connection.lock().unwrap();
-
-            let mut delete = connection.exec_bound::<ThreadId>(indoc! {"
-                DELETE FROM threads WHERE id = ?
-            "})?;
-
-            delete(id)?;
-
+            let mut txn = env.write_txn()?;
+            threads.delete(&mut txn, &id)?;
+            txn.commit()?;
             Ok(())
         })
     }

crates/agent/src/tool_use.rs

@@ -1,16 +1,14 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use assistant_tool::{
-    AnyToolCard, Tool, ToolResultContent, ToolResultOutput, ToolUseStatus, ToolWorkingSet,
-};
+use assistant_tool::{AnyToolCard, Tool, ToolResultOutput, ToolUseStatus, ToolWorkingSet};
 use collections::HashMap;
 use futures::FutureExt as _;
 use futures::future::Shared;
 use gpui::{App, Entity, SharedString, Task};
 use language_model::{
     ConfiguredModel, LanguageModel, LanguageModelRequest, LanguageModelToolResult,
-    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, Role,
+    LanguageModelToolUse, LanguageModelToolUseId, Role,
 };
 use project::Project;
 use ui::{IconName, Window};
@@ -54,19 +52,15 @@ impl ToolUseState {
     /// Constructs a [`ToolUseState`] from the given list of [`SerializedMessage`]s.
     ///
     /// Accepts a function to filter the tools that should be used to populate the state.
-    ///
-    /// If `window` is `None` (e.g., when in headless mode or when running evals),
-    /// tool cards won't be deserialized
     pub fn from_serialized_messages(
         tools: Entity<ToolWorkingSet>,
         messages: &[SerializedMessage],
         project: Entity<Project>,
-        window: Option<&mut Window>, // None in headless mode
+        window: &mut Window,
         cx: &mut App,
     ) -> Self {
         let mut this = Self::new(tools);
         let mut tool_names_by_id = HashMap::default();
-        let mut window = window;
 
         for message in messages {
             match message.role {
@@ -111,17 +105,12 @@ impl ToolUseState {
                                 },
                             );
 
-                            if let Some(window) = &mut window {
-                                if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
-                                    if let Some(output) = tool_result.output.clone() {
-                                        if let Some(card) = tool.deserialize_card(
-                                            output,
-                                            project.clone(),
-                                            window,
-                                            cx,
-                                        ) {
-                                            this.tool_result_cards.insert(tool_use_id, card);
-                                        }
+                            if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
+                                if let Some(output) = tool_result.output.clone() {
+                                    if let Some(card) =
+                                        tool.deserialize_card(output, project.clone(), window, cx)
+                                    {
+                                        this.tool_result_cards.insert(tool_use_id, card);
                                     }
                                 }
                             }
@@ -176,16 +165,10 @@ impl ToolUseState {
 
             let status = (|| {
                 if let Some(tool_result) = tool_result {
-                    let content = tool_result
-                        .content
-                        .to_str()
-                        .map(|str| str.to_owned().into())
-                        .unwrap_or_default();
-
                     return if tool_result.is_error {
-                        ToolUseStatus::Error(content)
+                        ToolUseStatus::Error(tool_result.content.clone().into())
                     } else {
-                        ToolUseStatus::Finished(content)
+                        ToolUseStatus::Finished(tool_result.content.clone().into())
                     };
                 }
 
@@ -416,45 +399,21 @@ impl ToolUseState {
                 let tool_result = output.content;
                 const BYTES_PER_TOKEN_ESTIMATE: usize = 3;
 
-                let old_use = self.pending_tool_uses_by_id.remove(&tool_use_id);
-
-                // Protect from overly large output
+                // Protect from clearly large output
                 let tool_output_limit = configured_model
                     .map(|model| model.model.max_token_count() * BYTES_PER_TOKEN_ESTIMATE)
                     .unwrap_or(usize::MAX);
 
-                let content = match tool_result {
-                    ToolResultContent::Text(text) => {
-                        let text = if text.len() < tool_output_limit {
-                            text
-                        } else {
-                            let truncated = truncate_lines_to_byte_limit(&text, tool_output_limit);
-                            format!(
-                                "Tool result too long. The first {} bytes:\n\n{}",
-                                truncated.len(),
-                                truncated
-                            )
-                        };
-                        LanguageModelToolResultContent::Text(text.into())
-                    }
-                    ToolResultContent::Image(language_model_image) => {
-                        if language_model_image.estimate_tokens() < tool_output_limit {
-                            LanguageModelToolResultContent::Image(language_model_image)
-                        } else {
-                            self.tool_results.insert(
-                                tool_use_id.clone(),
-                                LanguageModelToolResult {
-                                    tool_use_id: tool_use_id.clone(),
-                                    tool_name,
-                                    content: "Tool responded with an image that would exceeded the remaining tokens".into(),
-                                    is_error: true,
-                                    output: None,
-                                },
-                            );
+                let tool_result = if tool_result.len() <= tool_output_limit {
+                    tool_result
+                } else {
+                    let truncated = truncate_lines_to_byte_limit(&tool_result, tool_output_limit);
 
-                            return old_use;
-                        }
-                    }
+                    format!(
+                        "Tool result too long. The first {} bytes:\n\n{}",
+                        truncated.len(),
+                        truncated
+                    )
                 };
 
                 self.tool_results.insert(
@@ -462,13 +421,12 @@ impl ToolUseState {
                     LanguageModelToolResult {
                         tool_use_id: tool_use_id.clone(),
                         tool_name,
-                        content,
+                        content: tool_result.into(),
                         is_error: false,
                         output: output.output,
                     },
                 );
-
-                old_use
+                self.pending_tool_uses_by_id.remove(&tool_use_id)
             }
             Err(err) => {
                 self.tool_results.insert(
@@ -476,7 +434,7 @@ impl ToolUseState {
                     LanguageModelToolResult {
                         tool_use_id: tool_use_id.clone(),
                         tool_name,
-                        content: LanguageModelToolResultContent::Text(err.to_string().into()),
+                        content: err.to_string().into(),
                         is_error: true,
                         output: None,
                     },

crates/agent/src/trial_markdown.md

@@ -0,0 +1,3 @@
+# Build better with Zed Pro
+
+Try [Zed Pro](https://zed.dev/pricing) for free for 14 days - no credit card required. Only $20/month afterward. Cancel anytime.

crates/agent/src/ui/context_pill.rs

@@ -304,7 +304,7 @@ impl AddedContext {
             AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
             AgentContextHandle::TextThread(handle) => Some(Self::pending_text_thread(handle, cx)),
             AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
-            AgentContextHandle::Image(handle) => Some(Self::image(handle, cx)),
+            AgentContextHandle::Image(handle) => Some(Self::image(handle)),
         }
     }
 
@@ -318,7 +318,7 @@ impl AddedContext {
             AgentContext::Thread(context) => Self::attached_thread(context),
             AgentContext::TextThread(context) => Self::attached_text_thread(context),
             AgentContext::Rules(context) => Self::attached_rules(context),
-            AgentContext::Image(context) => Self::image(context.clone(), cx),
+            AgentContext::Image(context) => Self::image(context.clone()),
         }
     }
 
@@ -333,8 +333,14 @@ impl AddedContext {
 
     fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
         let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let (name, parent) =
-            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+        let name = full_path
+            .file_name()
+            .map(|n| n.to_string_lossy().into_owned().into())
+            .unwrap_or_else(|| full_path_string.clone());
+        let parent = full_path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|n| n.to_string_lossy().into_owned().into());
         AddedContext {
             kind: ContextKind::File,
             name,
@@ -364,8 +370,14 @@ impl AddedContext {
 
     fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
         let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let (name, parent) =
-            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+        let name = full_path
+            .file_name()
+            .map(|n| n.to_string_lossy().into_owned().into())
+            .unwrap_or_else(|| full_path_string.clone());
+        let parent = full_path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|n| n.to_string_lossy().into_owned().into());
         AddedContext {
             kind: ContextKind::Directory,
             name,
@@ -593,23 +605,13 @@ impl AddedContext {
         }
     }
 
-    fn image(context: ImageContext, cx: &App) -> AddedContext {
-        let (name, parent, icon_path) = if let Some(full_path) = context.full_path.as_ref() {
-            let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-            let (name, parent) =
-                extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
-            let icon_path = FileIcons::get_icon(&full_path, cx);
-            (name, parent, icon_path)
-        } else {
-            ("Image".into(), None, None)
-        };
-
+    fn image(context: ImageContext) -> AddedContext {
         AddedContext {
             kind: ContextKind::Image,
-            name,
-            parent,
+            name: "Image".into(),
+            parent: None,
             tooltip: None,
-            icon_path,
+            icon_path: None,
             status: match context.status() {
                 ImageStatus::Loading => ContextStatus::Loading {
                     message: "Loading…".into(),
@@ -637,22 +639,6 @@ impl AddedContext {
     }
 }
 
-fn extract_file_name_and_directory_from_full_path(
-    path: &Path,
-    name_fallback: &SharedString,
-) -> (SharedString, Option<SharedString>) {
-    let name = path
-        .file_name()
-        .map(|n| n.to_string_lossy().into_owned().into())
-        .unwrap_or_else(|| name_fallback.clone());
-    let parent = path
-        .parent()
-        .and_then(|p| p.file_name())
-        .map(|n| n.to_string_lossy().into_owned().into());
-
-    (name, parent)
-}
-
 #[derive(Debug, Clone)]
 struct ContextFileExcerpt {
     pub file_name_and_range: SharedString,
@@ -779,49 +765,37 @@ impl Component for AddedContext {
         let mut next_context_id = ContextId::zero();
         let image_ready = (
             "Ready",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-                },
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
+            }),
         );
 
         let image_loading = (
             "Loading",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: cx
-                        .background_spawn(async move {
-                            smol::Timer::after(Duration::from_secs(60 * 5)).await;
-                            Some(LanguageModelImage::empty())
-                        })
-                        .shared(),
-                },
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: cx
+                    .background_spawn(async move {
+                        smol::Timer::after(Duration::from_secs(60 * 5)).await;
+                        Some(LanguageModelImage::empty())
+                    })
+                    .shared(),
+            }),
         );
 
         let image_error = (
             "Error",
-            AddedContext::image(
-                ImageContext {
-                    context_id: next_context_id.post_inc(),
-                    project_path: None,
-                    full_path: None,
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(None).shared(),
-                },
-                cx,
-            ),
+            AddedContext::image(ImageContext {
+                context_id: next_context_id.post_inc(),
+                project_path: None,
+                original_image: Arc::new(Image::empty()),
+                image_task: Task::ready(None).shared(),
+            }),
         );
 
         Some(

crates/agent/src/ui/max_mode_tooltip.rs

@@ -1,6 +1,5 @@
-use crate::ToggleBurnMode;
-use gpui::{Context, FontWeight, IntoElement, Render, Window};
-use ui::{KeyBinding, prelude::*, tooltip_container};
+use gpui::{Context, IntoElement, Render, Window};
+use ui::{prelude::*, tooltip_container};
 
 pub struct MaxModeTooltip {
     selected: bool,
@@ -19,48 +18,38 @@ impl MaxModeTooltip {
 
 impl Render for MaxModeTooltip {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (icon, color) = if self.selected {
-            (IconName::ZedBurnModeOn, Color::Error)
-        } else {
-            (IconName::ZedBurnMode, Color::Default)
-        };
-
-        let turned_on = h_flex()
-            .h_4()
-            .px_1()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().text_accent.opacity(0.1))
-            .rounded_sm()
-            .child(
-                Label::new("ON")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Accent),
-            );
-
-        let title = h_flex()
-            .gap_1p5()
-            .child(Icon::new(icon).size(IconSize::Small).color(color))
-            .child(Label::new("Burn Mode"))
-            .when(self.selected, |title| title.child(turned_on));
-
-        let keybinding = KeyBinding::for_action(&ToggleBurnMode, window, cx)
-            .map(|kb| kb.size(rems_from_px(12.)));
-
         tooltip_container(window, cx, |this, _, _| {
-            this
-                .child(
-                    h_flex()
-                        .justify_between()
-                        .child(title)
-                        .children(keybinding)
-                )
+            this.gap_1()
+                .map(|header| if self.selected {
+                    header.child(
+                        h_flex()
+                            .justify_between()
+                            .child(
+                                h_flex()
+                                    .gap_1p5()
+                                    .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small).color(Color::Accent))
+                                    .child(Label::new("Zed's Max Mode"))
+                            )
+                            .child(
+                                h_flex()
+                                    .gap_0p5()
+                                    .child(Icon::new(IconName::Check).size(IconSize::XSmall).color(Color::Accent))
+                                    .child(Label::new("Turned On").size(LabelSize::XSmall).color(Color::Accent))
+                            )
+                    )
+                } else {
+                    header.child(
+                        h_flex()
+                            .gap_1p5()
+                            .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small))
+                            .child(Label::new("Zed's Max Mode"))
+                    )
+                })
                 .child(
                     div()
-                        .max_w_64()
+                        .max_w_72()
                         .child(
-                            Label::new("Enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning.")
+                            Label::new("This mode enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning, offering an unfettered agentic experience.")
                                 .size(LabelSize::Small)
                                 .color(Color::Muted)
                         )

crates/agent/src/ui/preview/agent_preview.rs

@@ -1,8 +1,8 @@
-use std::sync::OnceLock;
-
 use collections::HashMap;
 use component::ComponentId;
 use gpui::{App, Entity, WeakEntity};
+use linkme::distributed_slice;
+use std::sync::OnceLock;
 use ui::{AnyElement, Component, ComponentScope, Window};
 use workspace::Workspace;
 
@@ -12,15 +12,9 @@ use crate::ActiveThread;
 pub type PreviewFn =
     fn(WeakEntity<Workspace>, Entity<ActiveThread>, &mut Window, &mut App) -> Option<AnyElement>;
 
-pub struct AgentPreviewFn(fn() -> (ComponentId, PreviewFn));
-
-impl AgentPreviewFn {
-    pub const fn new(f: fn() -> (ComponentId, PreviewFn)) -> Self {
-        Self(f)
-    }
-}
-
-inventory::collect!(AgentPreviewFn);
+/// Distributed slice for preview registration functions
+#[distributed_slice]
+pub static __ALL_AGENT_PREVIEWS: [fn() -> (ComponentId, PreviewFn)] = [..];
 
 /// Trait that must be implemented by components that provide agent previews.
 pub trait AgentPreview: Component + Sized {
@@ -42,14 +36,16 @@ pub trait AgentPreview: Component + Sized {
 #[macro_export]
 macro_rules! register_agent_preview {
     ($type:ty) => {
-        inventory::submit! {
-            $crate::ui::preview::AgentPreviewFn::new(|| {
-                (
-                    <$type as component::Component>::id(),
-                    <$type as $crate::ui::preview::AgentPreview>::agent_preview,
-                )
-            })
-        }
+        #[linkme::distributed_slice($crate::ui::preview::__ALL_AGENT_PREVIEWS)]
+        static __REGISTER_AGENT_PREVIEW: fn() -> (
+            component::ComponentId,
+            $crate::ui::preview::PreviewFn,
+        ) = || {
+            (
+                <$type as component::Component>::id(),
+                <$type as $crate::ui::preview::AgentPreview>::agent_preview,
+            )
+        };
     };
 }
 
@@ -60,8 +56,8 @@ static AGENT_PREVIEW_REGISTRY: OnceLock<HashMap<ComponentId, PreviewFn>> = OnceL
 fn get_or_init_registry() -> &'static HashMap<ComponentId, PreviewFn> {
     AGENT_PREVIEW_REGISTRY.get_or_init(|| {
         let mut map = HashMap::default();
-        for register_fn in inventory::iter::<AgentPreviewFn>() {
-            let (id, preview_fn) = (register_fn.0)();
+        for register_fn in __ALL_AGENT_PREVIEWS.iter() {
+            let (id, preview_fn) = register_fn();
             map.insert(id, preview_fn);
         }
         map

crates/agent/src/ui/preview/usage_callouts.rs

@@ -39,7 +39,7 @@ impl RenderOnce for UsageCallout {
 
         let (title, message, button_text, url) = if is_limit_reached {
             match self.plan {
-                Plan::ZedFree => (
+                Plan::Free => (
                     "Out of free prompts",
                     "Upgrade to continue, wait for the next reset, or switch to API key."
                         .to_string(),
@@ -61,7 +61,7 @@ impl RenderOnce for UsageCallout {
             }
         } else {
             match self.plan {
-                Plan::ZedFree => (
+                Plan::Free => (
                     "Reaching free plan limit soon",
                     format!(
                         "{remaining} remaining - Upgrade to increase limit, or switch providers",
@@ -120,7 +120,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Approaching limit (90%)",
                     UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::Free,
                         RequestUsage {
                             limit: UsageLimit::Limited(50),
                             amount: 45, // 90% of limit
@@ -131,7 +131,7 @@ impl Component for UsageCallout {
                 single_example(
                     "Limit reached (100%)",
                     UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::Free,
                         RequestUsage {
                             limit: UsageLimit::Limited(50),
                             amount: 50, // 100% of limit

crates/anthropic/src/anthropic.rs

@@ -34,6 +34,7 @@ pub enum AnthropicModelMode {
 pub enum Model {
     #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
     Claude3_5Sonnet,
+    #[default]
     #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
     Claude3_7Sonnet,
     #[serde(
@@ -41,21 +42,6 @@ pub enum Model {
         alias = "claude-3-7-sonnet-thinking-latest"
     )]
     Claude3_7SonnetThinking,
-    #[serde(rename = "claude-opus-4", alias = "claude-opus-4-latest")]
-    ClaudeOpus4,
-    #[serde(
-        rename = "claude-opus-4-thinking",
-        alias = "claude-opus-4-thinking-latest"
-    )]
-    ClaudeOpus4Thinking,
-    #[default]
-    #[serde(rename = "claude-sonnet-4", alias = "claude-sonnet-4-latest")]
-    ClaudeSonnet4,
-    #[serde(
-        rename = "claude-sonnet-4-thinking",
-        alias = "claude-sonnet-4-thinking-latest"
-    )]
-    ClaudeSonnet4Thinking,
     #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
     Claude3_5Haiku,
     #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
@@ -103,25 +89,13 @@ impl Model {
             Ok(Self::Claude3Sonnet)
         } else if id.starts_with("claude-3-haiku") {
             Ok(Self::Claude3Haiku)
-        } else if id.starts_with("claude-opus-4-thinking") {
-            Ok(Self::ClaudeOpus4Thinking)
-        } else if id.starts_with("claude-opus-4") {
-            Ok(Self::ClaudeOpus4)
-        } else if id.starts_with("claude-sonnet-4-thinking") {
-            Ok(Self::ClaudeSonnet4Thinking)
-        } else if id.starts_with("claude-sonnet-4") {
-            Ok(Self::ClaudeSonnet4)
         } else {
-            anyhow::bail!("invalid model id {id}");
+            Err(anyhow!("invalid model id"))
         }
     }
 
     pub fn id(&self) -> &str {
         match self {
-            Model::ClaudeOpus4 => "claude-opus-4-latest",
-            Model::ClaudeOpus4Thinking => "claude-opus-4-thinking-latest",
-            Model::ClaudeSonnet4 => "claude-sonnet-4-latest",
-            Model::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking-latest",
             Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
             Model::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
             Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking-latest",
@@ -136,8 +110,6 @@ impl Model {
     /// The id of the model that should be used for making API requests
     pub fn request_id(&self) -> &str {
         match self {
-            Model::ClaudeOpus4 | Model::ClaudeOpus4Thinking => "claude-opus-4-20250514",
-            Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => "claude-sonnet-4-20250514",
             Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
             Model::Claude3_7Sonnet | Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-latest",
             Model::Claude3_5Haiku => "claude-3-5-haiku-latest",
@@ -150,10 +122,6 @@ impl Model {
 
     pub fn display_name(&self) -> &str {
         match self {
-            Model::ClaudeOpus4 => "Claude Opus 4",
-            Model::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
-            Model::ClaudeSonnet4 => "Claude Sonnet 4",
-            Model::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
             Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
             Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
             Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
@@ -169,11 +137,7 @@ impl Model {
 
     pub fn cache_configuration(&self) -> Option<AnthropicModelCacheConfiguration> {
         match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::Claude3_5Sonnet
+            Self::Claude3_5Sonnet
             | Self::Claude3_5Haiku
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
@@ -192,11 +156,7 @@ impl Model {
 
     pub fn max_token_count(&self) -> usize {
         match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::Claude3_5Sonnet
+            Self::Claude3_5Sonnet
             | Self::Claude3_5Haiku
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
@@ -213,11 +173,7 @@ impl Model {
             Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
-            | Self::Claude3_5Haiku
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking => 8_192,
+            | Self::Claude3_5Haiku => 8_192,
             Self::Custom {
                 max_output_tokens, ..
             } => max_output_tokens.unwrap_or(4_096),
@@ -226,11 +182,7 @@ impl Model {
 
     pub fn default_temperature(&self) -> f32 {
         match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::Claude3_5Sonnet
+            Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_7SonnetThinking
             | Self::Claude3_5Haiku
@@ -249,14 +201,10 @@ impl Model {
             Self::Claude3_5Sonnet
             | Self::Claude3_7Sonnet
             | Self::Claude3_5Haiku
-            | Self::ClaudeOpus4
-            | Self::ClaudeSonnet4
             | Self::Claude3Opus
             | Self::Claude3Sonnet
             | Self::Claude3Haiku => AnthropicModelMode::Default,
-            Self::Claude3_7SonnetThinking
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeSonnet4Thinking => AnthropicModelMode::Thinking {
+            Self::Claude3_7SonnetThinking => AnthropicModelMode::Thinking {
                 budget_tokens: Some(4_096),
             },
             Self::Custom { mode, .. } => mode.clone(),
@@ -437,10 +385,10 @@ impl RateLimitInfo {
     }
 }
 
-fn get_header<'a>(key: &str, headers: &'a HeaderMap) -> anyhow::Result<&'a str> {
+fn get_header<'a>(key: &str, headers: &'a HeaderMap) -> Result<&'a str, anyhow::Error> {
     Ok(headers
         .get(key)
-        .with_context(|| format!("missing header `{key}`"))?
+        .ok_or_else(|| anyhow!("missing header `{key}`"))?
         .to_str()?)
 }
 
@@ -586,26 +534,12 @@ pub enum RequestContent {
     ToolResult {
         tool_use_id: String,
         is_error: bool,
-        content: ToolResultContent,
+        content: String,
         #[serde(skip_serializing_if = "Option::is_none")]
         cache_control: Option<CacheControl>,
     },
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ToolResultContent {
-    Plain(String),
-    Multipart(Vec<ToolResultPart>),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolResultPart {
-    Text { text: String },
-    Image { source: ImageSource },
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum ResponseContent {

crates/askpass/src/askpass.rs

@@ -163,10 +163,8 @@ impl AskPassSession {
 #[cfg(unix)]
 fn get_shell_safe_zed_path() -> anyhow::Result<String> {
     let zed_path = std::env::current_exe()
-        .context("Failed to determine current executable path for use in askpass")?
+        .context("Failed to figure out current executable path for use in askpass")?
         .to_string_lossy()
-        // see https://github.com/rust-lang/rust/issues/69343
-        .trim_end_matches(" (deleted)")
         .to_string();
 
     // NOTE: this was previously enabled, however, it caused errors when it shouldn't have

crates/assets/src/assets.rs

@@ -1,6 +1,6 @@
 // This crate was essentially pulled out verbatim from main `zed` crate to avoid having to run RustEmbed macro whenever zed has to be rebuilt. It saves a second or two on an incremental build.
+use anyhow::anyhow;
 
-use anyhow::Context as _;
 use gpui::{App, AssetSource, Result, SharedString};
 use rust_embed::RustEmbed;
 
@@ -21,7 +21,7 @@ impl AssetSource for Assets {
     fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
         Self::get(path)
             .map(|f| Some(f.data))
-            .with_context(|| format!("loading asset at path {path:?}"))
+            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
     }
 
     fn list(&self, path: &str) -> Result<Vec<SharedString>> {
@@ -39,7 +39,7 @@ impl AssetSource for Assets {
 
 impl Assets {
     /// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
-    pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
+    pub fn load_fonts(&self, cx: &App) -> gpui::Result<()> {
         let font_paths = self.list("fonts")?;
         let mut embedded_fonts = Vec::new();
         for font_path in font_paths {

crates/assistant_context_editor/Cargo.toml

@@ -12,8 +12,8 @@ workspace = true
 path = "src/assistant_context_editor.rs"
 
 [dependencies]
-agent_settings.workspace = true
 anyhow.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
 chrono.workspace = true
@@ -22,7 +22,6 @@ clock.workspace = true
 collections.workspace = true
 context_server.workspace = true
 editor.workspace = true
-feature_flags.workspace = true
 fs.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
@@ -30,16 +29,15 @@ gpui.workspace = true
 indexed_docs.workspace = true
 language.workspace = true
 language_model.workspace = true
+language_model_selector.workspace = true
 log.workspace = true
 multi_buffer.workspace = true
 open_ai.workspace = true
-ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
 project.workspace = true
 prompt_store.workspace = true
-proto.workspace = true
 regex.workspace = true
 rope.workspace = true
 rpc.workspace = true
@@ -48,6 +46,7 @@ serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
+strum.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
 theme.workspace = true
@@ -57,10 +56,8 @@ uuid.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-zed_llm_client.workspace = true
 
 [dev-dependencies]
-indoc.workspace = true
 language_model = { workspace = true, features = ["test-support"] }
 languages = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true

crates/assistant_context_editor/src/assistant_context_editor.rs

@@ -2,8 +2,7 @@ mod context;
 mod context_editor;
 mod context_history;
 mod context_store;
-pub mod language_model_selector;
-mod max_mode_tooltip;
+mod patch;
 mod slash_command;
 mod slash_command_picker;
 
@@ -17,6 +16,7 @@ pub use crate::context::*;
 pub use crate::context_editor::*;
 pub use crate::context_history::*;
 pub use crate::context_store::*;
+pub use crate::patch::*;
 pub use crate::slash_command::*;
 
 pub fn init(client: Arc<Client>, cx: &mut App) {

crates/assistant_context_editor/src/context.rs

@@ -1,8 +1,9 @@
 #[cfg(test)]
 mod context_tests;
 
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result, bail};
+use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
+use anyhow::{Context as _, Result, anyhow, bail};
+use assistant_settings::AssistantSettings;
 use assistant_slash_command::{
     SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
     SlashCommandResult, SlashCommandWorkingSet,
@@ -21,15 +22,14 @@ use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, P
 use language_model::{
     LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
     LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelToolUseId, MessageContent, PaymentRequiredError, Role, StopReason,
-    report_assistant_event,
+    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
+    Role, StopReason, report_assistant_event,
 };
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
 use project::Project;
 use prompt_store::PromptBuilder;
 use serde::{Deserialize, Serialize};
-use settings::Settings;
 use smallvec::SmallVec;
 use std::{
     cmp::{Ordering, max},
@@ -37,6 +37,7 @@ use std::{
     iter, mem,
     ops::Range,
     path::Path,
+    str::FromStr as _,
     sync::Arc,
     time::{Duration, Instant},
 };
@@ -45,7 +46,6 @@ use text::{BufferSnapshot, ToPoint};
 use ui::IconName;
 use util::{ResultExt, TryFutureExt, post_inc};
 use uuid::Uuid;
-use zed_llm_client::CompletionIntent;
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct ContextId(String);
@@ -122,6 +122,14 @@ impl MessageStatus {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum RequestType {
+    /// Request a normal chat response from the model.
+    Chat,
+    /// Add a preamble to the message, which tells the model to return a structured response that suggests edits.
+    SuggestEdits,
+}
+
 #[derive(Clone, Debug)]
 pub enum ContextOperation {
     InsertMessage {
@@ -449,12 +457,17 @@ impl ContextOperation {
 pub enum ContextEvent {
     ShowAssistError(SharedString),
     ShowPaymentRequiredError,
+    ShowMaxMonthlySpendReachedError,
     MessagesEdited,
     SummaryChanged,
     SummaryGenerated,
     StreamedCompletion,
     StartedThoughtProcess(Range<language::Anchor>),
     EndedThoughtProcess(language::Anchor),
+    PatchesUpdated {
+        removed: Vec<Range<language::Anchor>>,
+        updated: Vec<Range<language::Anchor>>,
+    },
     InvokedSlashCommandChanged {
         command_id: InvokedSlashCommandId,
     },
@@ -654,6 +667,26 @@ struct PendingCompletion {
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct InvokedSlashCommandId(clock::Lamport);
 
+#[derive(Clone, Debug)]
+pub struct XmlTag {
+    pub kind: XmlTagKind,
+    pub range: Range<text::Anchor>,
+    pub is_open_tag: bool,
+}
+
+#[derive(Copy, Clone, Debug, strum::EnumString, PartialEq, Eq, strum::AsRefStr)]
+#[strum(serialize_all = "snake_case")]
+pub enum XmlTagKind {
+    Patch,
+    Title,
+    Edit,
+    Path,
+    Description,
+    OldText,
+    NewText,
+    Operation,
+}
+
 pub struct AssistantContext {
     id: ContextId,
     timestamp: clock::Lamport,
@@ -682,9 +715,10 @@ pub struct AssistantContext {
     _subscriptions: Vec<Subscription>,
     telemetry: Option<Arc<Telemetry>>,
     language_registry: Arc<LanguageRegistry>,
+    patches: Vec<AssistantPatch>,
+    xml_tags: Vec<XmlTag>,
     project: Option<Entity<Project>>,
     prompt_builder: Arc<PromptBuilder>,
-    completion_mode: agent_settings::CompletionMode,
 }
 
 trait ContextAnnotation {
@@ -697,6 +731,18 @@ impl ContextAnnotation for ParsedSlashCommand {
     }
 }
 
+impl ContextAnnotation for AssistantPatch {
+    fn range(&self) -> &Range<language::Anchor> {
+        &self.range
+    }
+}
+
+impl ContextAnnotation for XmlTag {
+    fn range(&self) -> &Range<language::Anchor> {
+        &self.range
+    }
+}
+
 impl EventEmitter<ContextEvent> for AssistantContext {}
 
 impl AssistantContext {
@@ -721,14 +767,6 @@ impl AssistantContext {
         )
     }
 
-    pub fn completion_mode(&self) -> agent_settings::CompletionMode {
-        self.completion_mode
-    }
-
-    pub fn set_completion_mode(&mut self, completion_mode: agent_settings::CompletionMode) {
-        self.completion_mode = completion_mode;
-    }
-
     pub fn new(
         id: ContextId,
         replica_id: ReplicaId,
@@ -775,13 +813,14 @@ impl AssistantContext {
             pending_cache_warming_task: Task::ready(None),
             _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
             pending_save: Task::ready(Ok(())),
-            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
             path: None,
             buffer,
             telemetry,
             project,
             language_registry,
             slash_commands,
+            patches: Vec::new(),
+            xml_tags: Vec::new(),
             prompt_builder,
         };
 
@@ -1177,6 +1216,48 @@ impl AssistantContext {
         &self.summary
     }
 
+    pub fn patch_containing(&self, position: Point, cx: &App) -> Option<&AssistantPatch> {
+        let buffer = self.buffer.read(cx);
+        let index = self.patches.binary_search_by(|patch| {
+            let patch_range = patch.range.to_point(&buffer);
+            if position < patch_range.start {
+                Ordering::Greater
+            } else if position > patch_range.end {
+                Ordering::Less
+            } else {
+                Ordering::Equal
+            }
+        });
+        if let Ok(ix) = index {
+            Some(&self.patches[ix])
+        } else {
+            None
+        }
+    }
+
+    pub fn patch_ranges(&self) -> impl Iterator<Item = Range<language::Anchor>> + '_ {
+        self.patches.iter().map(|patch| patch.range.clone())
+    }
+
+    pub fn patch_for_range(
+        &self,
+        range: &Range<language::Anchor>,
+        cx: &App,
+    ) -> Option<&AssistantPatch> {
+        let buffer = self.buffer.read(cx);
+        let index = self.patch_index_for_range(range, buffer).ok()?;
+        Some(&self.patches[index])
+    }
+
+    fn patch_index_for_range(
+        &self,
+        tagged_range: &Range<text::Anchor>,
+        buffer: &text::BufferSnapshot,
+    ) -> Result<usize, usize> {
+        self.patches
+            .binary_search_by(|probe| probe.range.cmp(&tagged_range, buffer))
+    }
+
     pub fn parsed_slash_commands(&self) -> &[ParsedSlashCommand] {
         &self.parsed_slash_commands
     }
@@ -1256,7 +1337,7 @@ impl AssistantContext {
         let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
             return;
         };
-        let request = self.to_completion_request(Some(&model.model), cx);
+        let request = self.to_completion_request(Some(&model.model), RequestType::Chat, cx);
         let debounce = self.token_count.is_some();
         self.pending_token_count = cx.spawn(async move |this, cx| {
             async move {
@@ -1402,7 +1483,7 @@ impl AssistantContext {
         }
 
         let request = {
-            let mut req = self.to_completion_request(Some(&model), cx);
+            let mut req = self.to_completion_request(Some(&model), RequestType::Chat, cx);
             // Skip the last message because it's likely to change and
             // therefore would be a waste to cache.
             req.messages.pop();
@@ -1477,6 +1558,8 @@ impl AssistantContext {
 
         let mut removed_parsed_slash_command_ranges = Vec::new();
         let mut updated_parsed_slash_commands = Vec::new();
+        let mut removed_patches = Vec::new();
+        let mut updated_patches = Vec::new();
         while let Some(mut row_range) = row_ranges.next() {
             while let Some(next_row_range) = row_ranges.peek() {
                 if row_range.end >= next_row_range.start {
@@ -1501,6 +1584,13 @@ impl AssistantContext {
                 cx,
             );
             self.invalidate_pending_slash_commands(&buffer, cx);
+            self.reparse_patches_in_range(
+                start..end,
+                &buffer,
+                &mut updated_patches,
+                &mut removed_patches,
+                cx,
+            );
         }
 
         if !updated_parsed_slash_commands.is_empty()
@@ -1511,6 +1601,13 @@ impl AssistantContext {
                 updated: updated_parsed_slash_commands,
             });
         }
+
+        if !updated_patches.is_empty() || !removed_patches.is_empty() {
+            cx.emit(ContextEvent::PatchesUpdated {
+                removed: removed_patches,
+                updated: updated_patches,
+            });
+        }
     }
 
     fn reparse_slash_commands_in_range(
@@ -1601,6 +1698,267 @@ impl AssistantContext {
         }
     }
 
+    fn reparse_patches_in_range(
+        &mut self,
+        range: Range<text::Anchor>,
+        buffer: &BufferSnapshot,
+        updated: &mut Vec<Range<text::Anchor>>,
+        removed: &mut Vec<Range<text::Anchor>>,
+        cx: &mut Context<Self>,
+    ) {
+        // Rebuild the XML tags in the edited range.
+        let intersecting_tags_range =
+            self.indices_intersecting_buffer_range(&self.xml_tags, range.clone(), cx);
+        let new_tags = self.parse_xml_tags_in_range(buffer, range.clone(), cx);
+        self.xml_tags
+            .splice(intersecting_tags_range.clone(), new_tags);
+
+        // Find which patches intersect the changed range.
+        let intersecting_patches_range =
+            self.indices_intersecting_buffer_range(&self.patches, range.clone(), cx);
+
+        // Reparse all tags after the last unchanged patch before the change.
+        let mut tags_start_ix = 0;
+        if let Some(preceding_unchanged_patch) =
+            self.patches[..intersecting_patches_range.start].last()
+        {
+            tags_start_ix = match self.xml_tags.binary_search_by(|tag| {
+                tag.range
+                    .start
+                    .cmp(&preceding_unchanged_patch.range.end, buffer)
+                    .then(Ordering::Less)
+            }) {
+                Ok(ix) | Err(ix) => ix,
+            };
+        }
+
+        // Rebuild the patches in the range.
+        let new_patches = self.parse_patches(tags_start_ix, range.end, buffer, cx);
+        updated.extend(new_patches.iter().map(|patch| patch.range.clone()));
+        let removed_patches = self.patches.splice(intersecting_patches_range, new_patches);
+        removed.extend(
+            removed_patches
+                .map(|patch| patch.range)
+                .filter(|range| !updated.contains(&range)),
+        );
+    }
+
+    fn parse_xml_tags_in_range(
+        &self,
+        buffer: &BufferSnapshot,
+        range: Range<text::Anchor>,
+        cx: &App,
+    ) -> Vec<XmlTag> {
+        let mut messages = self.messages(cx).peekable();
+
+        let mut tags = Vec::new();
+        let mut lines = buffer.text_for_range(range).lines();
+        let mut offset = lines.offset();
+
+        while let Some(line) = lines.next() {
+            while let Some(message) = messages.peek() {
+                if offset < message.offset_range.end {
+                    break;
+                } else {
+                    messages.next();
+                }
+            }
+
+            let is_assistant_message = messages
+                .peek()
+                .map_or(false, |message| message.role == Role::Assistant);
+            if is_assistant_message {
+                for (start_ix, _) in line.match_indices('<') {
+                    let mut name_start_ix = start_ix + 1;
+                    let closing_bracket_ix = line[start_ix..].find('>').map(|i| start_ix + i);
+                    if let Some(closing_bracket_ix) = closing_bracket_ix {
+                        let end_ix = closing_bracket_ix + 1;
+                        let mut is_open_tag = true;
+                        if line[name_start_ix..closing_bracket_ix].starts_with('/') {
+                            name_start_ix += 1;
+                            is_open_tag = false;
+                        }
+                        let tag_inner = &line[name_start_ix..closing_bracket_ix];
+                        let tag_name_len = tag_inner
+                            .find(|c: char| c.is_whitespace())
+                            .unwrap_or(tag_inner.len());
+                        if let Ok(kind) = XmlTagKind::from_str(&tag_inner[..tag_name_len]) {
+                            tags.push(XmlTag {
+                                range: buffer.anchor_after(offset + start_ix)
+                                    ..buffer.anchor_before(offset + end_ix),
+                                is_open_tag,
+                                kind,
+                            });
+                        };
+                    }
+                }
+            }
+
+            offset = lines.offset();
+        }
+        tags
+    }
+
+    fn parse_patches(
+        &mut self,
+        tags_start_ix: usize,
+        buffer_end: text::Anchor,
+        buffer: &BufferSnapshot,
+        cx: &App,
+    ) -> Vec<AssistantPatch> {
+        let mut new_patches = Vec::new();
+        let mut pending_patch = None;
+        let mut patch_tag_depth = 0;
+        let mut tags = self.xml_tags[tags_start_ix..].iter().peekable();
+        'tags: while let Some(tag) = tags.next() {
+            if tag.range.start.cmp(&buffer_end, buffer).is_gt() && patch_tag_depth == 0 {
+                break;
+            }
+
+            if tag.kind == XmlTagKind::Patch && tag.is_open_tag {
+                patch_tag_depth += 1;
+                let patch_start = tag.range.start;
+                let mut edits = Vec::<Result<AssistantEdit>>::new();
+                let mut patch = AssistantPatch {
+                    range: patch_start..patch_start,
+                    title: String::new().into(),
+                    edits: Default::default(),
+                    status: crate::AssistantPatchStatus::Pending,
+                };
+
+                while let Some(tag) = tags.next() {
+                    if tag.kind == XmlTagKind::Patch && !tag.is_open_tag {
+                        patch_tag_depth -= 1;
+                        if patch_tag_depth == 0 {
+                            patch.range.end = tag.range.end;
+
+                            // Include the line immediately after this <patch> tag if it's empty.
+                            let patch_end_offset = patch.range.end.to_offset(buffer);
+                            let mut patch_end_chars = buffer.chars_at(patch_end_offset);
+                            if patch_end_chars.next() == Some('\n')
+                                && patch_end_chars.next().map_or(true, |ch| ch == '\n')
+                            {
+                                let messages = self.messages_for_offsets(
+                                    [patch_end_offset, patch_end_offset + 1],
+                                    cx,
+                                );
+                                if messages.len() == 1 {
+                                    patch.range.end = buffer.anchor_before(patch_end_offset + 1);
+                                }
+                            }
+
+                            edits.sort_unstable_by(|a, b| {
+                                if let (Ok(a), Ok(b)) = (a, b) {
+                                    a.path.cmp(&b.path)
+                                } else {
+                                    Ordering::Equal
+                                }
+                            });
+                            patch.edits = edits.into();
+                            patch.status = AssistantPatchStatus::Ready;
+                            new_patches.push(patch);
+                            continue 'tags;
+                        }
+                    }
+
+                    if tag.kind == XmlTagKind::Title && tag.is_open_tag {
+                        let content_start = tag.range.end;
+                        while let Some(tag) = tags.next() {
+                            if tag.kind == XmlTagKind::Title && !tag.is_open_tag {
+                                let content_end = tag.range.start;
+                                patch.title =
+                                    trimmed_text_in_range(buffer, content_start..content_end)
+                                        .into();
+                                break;
+                            }
+                        }
+                    }
+
+                    if tag.kind == XmlTagKind::Edit && tag.is_open_tag {
+                        let mut path = None;
+                        let mut old_text = None;
+                        let mut new_text = None;
+                        let mut operation = None;
+                        let mut description = None;
+
+                        while let Some(tag) = tags.next() {
+                            if tag.kind == XmlTagKind::Edit && !tag.is_open_tag {
+                                edits.push(AssistantEdit::new(
+                                    path,
+                                    operation,
+                                    old_text,
+                                    new_text,
+                                    description,
+                                ));
+                                break;
+                            }
+
+                            if tag.is_open_tag
+                                && [
+                                    XmlTagKind::Path,
+                                    XmlTagKind::OldText,
+                                    XmlTagKind::NewText,
+                                    XmlTagKind::Operation,
+                                    XmlTagKind::Description,
+                                ]
+                                .contains(&tag.kind)
+                            {
+                                let kind = tag.kind;
+                                let content_start = tag.range.end;
+                                if let Some(tag) = tags.peek() {
+                                    if tag.kind == kind && !tag.is_open_tag {
+                                        let tag = tags.next().unwrap();
+                                        let content_end = tag.range.start;
+                                        let content = trimmed_text_in_range(
+                                            buffer,
+                                            content_start..content_end,
+                                        );
+                                        match kind {
+                                            XmlTagKind::Path => path = Some(content),
+                                            XmlTagKind::Operation => operation = Some(content),
+                                            XmlTagKind::OldText => {
+                                                old_text = Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            XmlTagKind::NewText => {
+                                                new_text = Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            XmlTagKind::Description => {
+                                                description =
+                                                    Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            _ => {}
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                patch.edits = edits.into();
+                pending_patch = Some(patch);
+            }
+        }
+
+        if let Some(mut pending_patch) = pending_patch {
+            let patch_start = pending_patch.range.start.to_offset(buffer);
+            if let Some(message) = self.message_for_offset(patch_start, cx) {
+                if message.anchor_range.end == text::Anchor::MAX {
+                    pending_patch.range.end = text::Anchor::MAX;
+                } else {
+                    let message_end = buffer.anchor_after(message.offset_range.end - 1);
+                    pending_patch.range.end = message_end;
+                }
+            } else {
+                pending_patch.range.end = text::Anchor::MAX;
+            }
+
+            new_patches.push(pending_patch);
+        }
+
+        new_patches
+    }
+
     pub fn pending_command_for_position(
         &mut self,
         position: language::Anchor,
@@ -1742,8 +2100,9 @@ impl AssistantContext {
                                 merge_same_roles,
                             } => {
                                 if !merge_same_roles && Some(role) != last_role {
-                                    let buffer = this.buffer.read(cx);
-                                    let offset = insert_position.to_offset(buffer);
+                                    let offset = this.buffer.read_with(cx, |buffer, _cx| {
+                                        insert_position.to_offset(buffer)
+                                    });
                                     this.insert_message_at_offset(
                                         offset,
                                         role,
@@ -2004,7 +2363,11 @@ impl AssistantContext {
         })
     }
 
-    pub fn assist(&mut self, cx: &mut Context<Self>) -> Option<MessageAnchor> {
+    pub fn assist(
+        &mut self,
+        request_type: RequestType,
+        cx: &mut Context<Self>,
+    ) -> Option<MessageAnchor> {
         let model_registry = LanguageModelRegistry::read_global(cx);
         let model = model_registry.default_model()?;
         let last_message_id = self.get_last_valid_message_id(cx)?;
@@ -2019,7 +2382,7 @@ impl AssistantContext {
         // Compute which messages to cache, including the last one.
         self.mark_cache_anchors(&model.cache_configuration(), false, cx);
 
-        let request = self.to_completion_request(Some(&model), cx);
+        let request = self.to_completion_request(Some(&model), request_type, cx);
 
         let assistant_message = self
             .insert_message_after(last_message_id, Role::Assistant, MessageStatus::Pending, cx)
@@ -2165,6 +2528,12 @@ impl AssistantContext {
                                 metadata.status = MessageStatus::Canceled;
                             });
                             Some(error.to_string())
+                        } else if error.is::<MaxMonthlySpendReachedError>() {
+                            cx.emit(ContextEvent::ShowMaxMonthlySpendReachedError);
+                            this.update_metadata(assistant_message_id, cx, |metadata| {
+                                metadata.status = MessageStatus::Canceled;
+                            });
+                            Some(error.to_string())
                         } else {
                             let error_message = error
                                 .chain()
@@ -2215,7 +2584,6 @@ impl AssistantContext {
                             StopReason::ToolUse => {}
                             StopReason::EndTurn => {}
                             StopReason::MaxTokens => {}
-                            StopReason::Refusal => {}
                         }
                     }
                 })
@@ -2255,6 +2623,7 @@ impl AssistantContext {
     pub fn to_completion_request(
         &self,
         model: Option<&Arc<dyn LanguageModel>>,
+        request_type: RequestType,
         cx: &App,
     ) -> LanguageModelRequest {
         let buffer = self.buffer.read(cx);
@@ -2273,13 +2642,13 @@ impl AssistantContext {
         let mut completion_request = LanguageModelRequest {
             thread_id: None,
             prompt_id: None,
-            intent: Some(CompletionIntent::UserPrompt),
             mode: None,
             messages: Vec::new(),
             tools: Vec::new(),
             tool_choice: None,
             stop: Vec::new(),
-            temperature: model.and_then(|model| AgentSettings::temperature_for_model(model, cx)),
+            temperature: model
+                .and_then(|model| AssistantSettings::temperature_for_model(model, cx)),
         };
         for message in self.messages(cx) {
             if message.status != MessageStatus::Done {
@@ -2334,15 +2703,26 @@ impl AssistantContext {
                 completion_request.messages.push(request_message);
             }
         }
-        let supports_max_mode = if let Some(model) = model {
-            model.supports_max_mode()
-        } else {
-            false
-        };
 
-        if supports_max_mode {
-            completion_request.mode = Some(self.completion_mode.into());
+        if let RequestType::SuggestEdits = request_type {
+            if let Ok(preamble) = self.prompt_builder.generate_suggest_edits_prompt() {
+                let last_elem_index = completion_request.messages.len();
+
+                completion_request
+                    .messages
+                    .push(LanguageModelRequestMessage {
+                        role: Role::User,
+                        content: vec![MessageContent::Text(preamble)],
+                        cache: false,
+                    });
+
+                // The preamble message should be sent right before the last actual user message.
+                completion_request
+                    .messages
+                    .swap(last_elem_index, last_elem_index.saturating_sub(1));
+            }
         }
+
         completion_request
     }
 
@@ -2377,6 +2757,17 @@ impl AssistantContext {
                 ranges.push(message.anchor_range.clone());
             }
         }
+
+        let buffer = self.buffer.read(cx).text_snapshot();
+        let mut updated = Vec::new();
+        let mut removed = Vec::new();
+        for range in ranges {
+            self.reparse_patches_in_range(range, &buffer, &mut updated, &mut removed, cx);
+        }
+
+        if !updated.is_empty() || !removed.is_empty() {
+            cx.emit(ContextEvent::PatchesUpdated { removed, updated })
+        }
     }
 
     pub fn update_metadata(
@@ -2654,7 +3045,7 @@ impl AssistantContext {
                 return;
             }
 
-            let mut request = self.to_completion_request(Some(&model.model), cx);
+            let mut request = self.to_completion_request(Some(&model.model), RequestType::Chat, cx);
             request.messages.push(LanguageModelRequestMessage {
                 role: Role::User,
                 content: vec![
@@ -2926,6 +3317,24 @@ impl AssistantContext {
     }
 }
 
+fn trimmed_text_in_range(buffer: &BufferSnapshot, range: Range<text::Anchor>) -> String {
+    let mut is_start = true;
+    let mut content = buffer
+        .text_for_range(range)
+        .map(|mut chunk| {
+            if is_start {
+                chunk = chunk.trim_start_matches('\n');
+                if !chunk.is_empty() {
+                    is_start = false;
+                }
+            }
+            chunk
+        })
+        .collect::<String>();
+    content.truncate(content.trim_end().len());
+    content
+}
+
 #[derive(Debug, Default)]
 pub struct ContextVersion {
     context: clock::Global,
@@ -3031,7 +3440,7 @@ impl SavedContext {
         let saved_context_json = serde_json::from_str::<serde_json::Value>(json)?;
         match saved_context_json
             .get("version")
-            .context("version not found")?
+            .ok_or_else(|| anyhow!("version not found"))?
         {
             serde_json::Value::String(version) => match version.as_str() {
                 SavedContext::VERSION => {
@@ -3052,9 +3461,9 @@ impl SavedContext {
                         serde_json::from_value::<SavedContextV0_1_0>(saved_context_json)?;
                     Ok(saved_context.upgrade())
                 }
-                _ => anyhow::bail!("unrecognized saved context version: {version:?}"),
+                _ => Err(anyhow!("unrecognized saved context version: {}", version)),
             },
-            _ => anyhow::bail!("version not found on saved context"),
+            _ => Err(anyhow!("version not found on saved context")),
         }
     }
 

crates/assistant_context_editor/src/context/context_tests.rs

@@ -1,6 +1,7 @@
 use crate::{
-    AssistantContext, CacheStatus, ContextEvent, ContextId, ContextOperation, ContextSummary,
-    InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus,
+    AssistantContext, AssistantEdit, AssistantEditKind, CacheStatus, ContextEvent, ContextId,
+    ContextOperation, ContextSummary, InvokedSlashCommandId, MessageCacheMetadata, MessageId,
+    MessageStatus, RequestType,
 };
 use anyhow::Result;
 use assistant_slash_command::{
@@ -35,10 +36,13 @@ use std::{
     rc::Rc,
     sync::{Arc, atomic::AtomicBool},
 };
-use text::{ReplicaId, ToOffset, network::Network};
+use text::{OffsetRangeExt as _, ReplicaId, ToOffset, network::Network};
 use ui::{IconName, Window};
 use unindent::Unindent;
-use util::RandomCharIter;
+use util::{
+    RandomCharIter,
+    test::{generate_marked_text, marked_text_ranges},
+};
 use workspace::Workspace;
 
 #[gpui::test]
@@ -664,6 +668,401 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
     }
 }
 
+#[gpui::test]
+async fn test_workflow_step_parsing(cx: &mut TestAppContext) {
+    cx.update(|cx| {
+        init_test(cx);
+        cx.update_global(|settings_store: &mut SettingsStore, cx| {
+            settings_store
+                .set_user_settings(
+                    r#"{ "assistant": { "enable_experimental_live_diffs": true } }"#,
+                    cx,
+                )
+                .unwrap()
+        })
+    });
+    let fs = FakeFs::new(cx.executor());
+    let project = Project::test(fs, [Path::new("/root")], cx).await;
+
+    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
+
+    // Create a new context
+    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+    let context = cx.new(|cx| {
+        AssistantContext::local(
+            registry.clone(),
+            Some(project),
+            None,
+            prompt_builder.clone(),
+            Arc::new(SlashCommandWorkingSet::default()),
+            cx,
+        )
+    });
+
+    // Insert an assistant message to simulate a response.
+    let assistant_message_id = context.update(cx, |context, cx| {
+        let user_message_id = context.messages(cx).next().unwrap().id;
+        context
+            .insert_message_after(user_message_id, Role::Assistant, MessageStatus::Done, cx)
+            .unwrap()
+            .id
+    });
+
+    // No edit tags
+    edit(
+        &context,
+        "
+
+        «one
+        two
+        »",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+        ",
+        &[],
+        cx,
+    );
+
+    // Partial edit step tag is added
+    edit(
+        &context,
+        "
+
+        one
+        two
+        «
+        <patch»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        <patch",
+        &[],
+        cx,
+    );
+
+    // The rest of the step tag is added. The unclosed
+    // step is treated as incomplete.
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch«>
+        <edit>»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>»",
+        &[&[]],
+        cx,
+    );
+
+    // The full patch is added
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>«
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn one</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn one</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn one".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // The step is manually edited.
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>«fn zero»</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // When setting the message role to User, the steps are cleared.
+    context.update(cx, |context, cx| {
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+    });
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,",
+        &[],
+        cx,
+    );
+
+    // When setting the message role back to Assistant, the steps are reparsed.
+    context.update(cx, |context, cx| {
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+    });
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // Ensure steps are re-parsed when deserializing.
+    let serialized_context = context.read_with(cx, |context, cx| context.serialize(cx));
+    let deserialized_context = cx.new(|cx| {
+        AssistantContext::deserialize(
+            serialized_context,
+            Path::new("").into(),
+            registry.clone(),
+            prompt_builder.clone(),
+            Arc::new(SlashCommandWorkingSet::default()),
+            None,
+            None,
+            cx,
+        )
+    });
+    expect_patches(
+        &deserialized_context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    fn edit(
+        context: &Entity<AssistantContext>,
+        new_text_marked_with_edits: &str,
+        cx: &mut TestAppContext,
+    ) {
+        context.update(cx, |context, cx| {
+            context.buffer.update(cx, |buffer, cx| {
+                buffer.edit_via_marked_text(&new_text_marked_with_edits.unindent(), None, cx);
+            });
+        });
+        cx.executor().run_until_parked();
+    }
+
+    #[track_caller]
+    fn expect_patches(
+        context: &Entity<AssistantContext>,
+        expected_marked_text: &str,
+        expected_suggestions: &[&[AssistantEdit]],
+        cx: &mut TestAppContext,
+    ) {
+        let expected_marked_text = expected_marked_text.unindent();
+        let (expected_text, _) = marked_text_ranges(&expected_marked_text, false);
+
+        let (buffer_text, ranges, patches) = context.update(cx, |context, cx| {
+            context.buffer.read_with(cx, |buffer, _| {
+                let ranges = context
+                    .patches
+                    .iter()
+                    .map(|entry| entry.range.to_offset(buffer))
+                    .collect::<Vec<_>>();
+                (
+                    buffer.text(),
+                    ranges,
+                    context
+                        .patches
+                        .iter()
+                        .map(|step| step.edits.clone())
+                        .collect::<Vec<_>>(),
+                )
+            })
+        });
+
+        assert_eq!(buffer_text, expected_text);
+
+        let actual_marked_text = generate_marked_text(&expected_text, &ranges, false);
+        assert_eq!(actual_marked_text, expected_marked_text);
+
+        assert_eq!(
+            patches
+                .iter()
+                .map(|patch| {
+                    patch
+                        .iter()
+                        .map(|edit| {
+                            let edit = edit.as_ref().unwrap();
+                            AssistantEdit {
+                                path: edit.path.clone(),
+                                kind: edit.kind.clone(),
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                })
+                .collect::<Vec<_>>(),
+            expected_suggestions
+        );
+    }
+}
+
 #[gpui::test]
 async fn test_serialization(cx: &mut TestAppContext) {
     cx.update(init_test);
@@ -1199,7 +1598,7 @@ async fn test_summarization(cx: &mut TestAppContext) {
 
     // Send a message
     context.update(cx, |context, cx| {
-        context.assist(cx);
+        context.assist(RequestType::Chat, cx);
     });
 
     simulate_successful_response(&fake_model, cx);
@@ -1210,8 +1609,8 @@ async fn test_summarization(cx: &mut TestAppContext) {
     });
 
     cx.run_until_parked();
-    fake_model.stream_last_completion_response("Brief");
-    fake_model.stream_last_completion_response(" Introduction");
+    fake_model.stream_last_completion_response("Brief".into());
+    fake_model.stream_last_completion_response(" Introduction".into());
     fake_model.end_last_completion_stream();
     cx.run_until_parked();
 
@@ -1254,7 +1653,7 @@ async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
 
     // Sending another message should not trigger another summarize request
     context.update(cx, |context, cx| {
-        context.assist(cx);
+        context.assist(RequestType::Chat, cx);
     });
 
     simulate_successful_response(&fake_model, cx);
@@ -1274,7 +1673,7 @@ async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
     });
 
     cx.run_until_parked();
-    fake_model.stream_last_completion_response("A successful summary");
+    fake_model.stream_last_completion_response("A successful summary".into());
     fake_model.end_last_completion_stream();
     cx.run_until_parked();
 
@@ -1297,7 +1696,7 @@ fn test_summarize_error(
 
     // Send a message
     context.update(cx, |context, cx| {
-        context.assist(cx);
+        context.assist(RequestType::Chat, cx);
     });
 
     simulate_successful_response(&model, cx);
@@ -1356,7 +1755,7 @@ fn setup_context_editor_with_fake_model(
 
 fn simulate_successful_response(fake_model: &FakeLanguageModel, cx: &mut TestAppContext) {
     cx.run_until_parked();
-    fake_model.stream_last_completion_response("Assistant response");
+    fake_model.stream_last_completion_response("Assistant response".into());
     fake_model.end_last_completion_stream();
     cx.run_until_parked();
 }
@@ -1386,7 +1785,7 @@ fn init_test(cx: &mut App) {
     LanguageModelRegistry::test(cx);
     cx.set_global(settings_store);
     language::init(cx);
-    agent_settings::init(cx);
+    assistant_settings::init(cx);
     Project::init_settings(cx);
 }
 

crates/assistant_context_editor/src/context_store.rs

@@ -2,7 +2,7 @@ use crate::{
     AssistantContext, ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext,
     SavedContextMetadata,
 };
-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Result, anyhow};
 use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
 use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
 use clock::ReplicaId;
@@ -164,18 +164,16 @@ impl ContextStore {
     ) -> Result<proto::OpenContextResponse> {
         let context_id = ContextId::from_proto(envelope.payload.context_id);
         let operations = this.update(&mut cx, |this, cx| {
-            anyhow::ensure!(
-                !this.project.read(cx).is_via_collab(),
-                "only the host contexts can be opened"
-            );
+            if this.project.read(cx).is_via_collab() {
+                return Err(anyhow!("only the host contexts can be opened"));
+            }
 
             let context = this
                 .loaded_context_for_id(&context_id, cx)
                 .context("context not found")?;
-            anyhow::ensure!(
-                context.read(cx).replica_id() == ReplicaId::default(),
-                "context must be opened via the host"
-            );
+            if context.read(cx).replica_id() != ReplicaId::default() {
+                return Err(anyhow!("context must be opened via the host"));
+            }
 
             anyhow::Ok(
                 context
@@ -195,10 +193,9 @@ impl ContextStore {
         mut cx: AsyncApp,
     ) -> Result<proto::CreateContextResponse> {
         let (context_id, operations) = this.update(&mut cx, |this, cx| {
-            anyhow::ensure!(
-                !this.project.read(cx).is_via_collab(),
-                "can only create contexts as the host"
-            );
+            if this.project.read(cx).is_via_collab() {
+                return Err(anyhow!("can only create contexts as the host"));
+            }
 
             let context = this.create(cx);
             let context_id = context.read(cx).id().clone();
@@ -240,10 +237,9 @@ impl ContextStore {
         mut cx: AsyncApp,
     ) -> Result<proto::SynchronizeContextsResponse> {
         this.update(&mut cx, |this, cx| {
-            anyhow::ensure!(
-                !this.project.read(cx).is_via_collab(),
-                "only the host can synchronize contexts"
-            );
+            if this.project.read(cx).is_via_collab() {
+                return Err(anyhow!("only the host can synchronize contexts"));
+            }
 
             let mut local_versions = Vec::new();
             for remote_version_proto in envelope.payload.contexts {
@@ -374,7 +370,7 @@ impl ContextStore {
     ) -> Task<Result<Entity<AssistantContext>>> {
         let project = self.project.read(cx);
         let Some(project_id) = project.remote_id() else {
-            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
+            return Task::ready(Err(anyhow!("project was not remote")));
         };
 
         let replica_id = project.replica_id();
@@ -537,7 +533,7 @@ impl ContextStore {
     ) -> Task<Result<Entity<AssistantContext>>> {
         let project = self.project.read(cx);
         let Some(project_id) = project.remote_id() else {
-            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
+            return Task::ready(Err(anyhow!("project was not remote")));
         };
 
         if let Some(context) = self.loaded_context_for_id(&context_id, cx) {

crates/assistant_context_editor/src/max_mode_tooltip.rs

@@ -1,61 +0,0 @@
-use gpui::{Context, FontWeight, IntoElement, Render, Window};
-use ui::{prelude::*, tooltip_container};
-
-pub struct MaxModeTooltip {
-    selected: bool,
-}
-
-impl MaxModeTooltip {
-    pub fn new() -> Self {
-        Self { selected: false }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl Render for MaxModeTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (icon, color) = if self.selected {
-            (IconName::ZedBurnModeOn, Color::Error)
-        } else {
-            (IconName::ZedBurnMode, Color::Default)
-        };
-
-        let turned_on = h_flex()
-            .h_4()
-            .px_1()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().text_accent.opacity(0.1))
-            .rounded_sm()
-            .child(
-                Label::new("ON")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Accent),
-            );
-
-        let title = h_flex()
-            .gap_1p5()
-            .child(Icon::new(icon).size(IconSize::Small).color(color))
-            .child(Label::new("Burn Mode"))
-            .when(self.selected, |title| title.child(turned_on));
-
-        tooltip_container(window, cx, |this, _, _| {
-            this
-                .child(title)
-                .child(
-                    div()
-                        .max_w_64()
-                        .child(
-                            Label::new("Enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                        )
-                )
-        })
-    }
-}

crates/assistant_context_editor/src/patch.rs

@@ -0,0 +1,957 @@
+use anyhow::{Context as _, Result, anyhow};
+use collections::HashMap;
+use editor::ProposedChangesEditor;
+use futures::{TryFutureExt as _, future};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString};
+use language::{AutoindentMode, Buffer, BufferSnapshot};
+use project::{Project, ProjectPath};
+use std::{cmp, ops::Range, path::Path, sync::Arc};
+use text::{AnchorRangeExt as _, Bias, OffsetRangeExt as _, Point};
+
+#[derive(Clone, Debug)]
+pub struct AssistantPatch {
+    pub range: Range<language::Anchor>,
+    pub title: SharedString,
+    pub edits: Arc<[Result<AssistantEdit>]>,
+    pub status: AssistantPatchStatus,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum AssistantPatchStatus {
+    Pending,
+    Ready,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AssistantEdit {
+    pub path: String,
+    pub kind: AssistantEditKind,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum AssistantEditKind {
+    Update {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    Create {
+        new_text: String,
+        description: Option<String>,
+    },
+    InsertBefore {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    InsertAfter {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    Delete {
+        old_text: String,
+    },
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedPatch {
+    pub edit_groups: HashMap<Entity<Buffer>, Vec<ResolvedEditGroup>>,
+    pub errors: Vec<AssistantPatchResolutionError>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedEditGroup {
+    pub context_range: Range<language::Anchor>,
+    pub edits: Vec<ResolvedEdit>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedEdit {
+    range: Range<language::Anchor>,
+    new_text: String,
+    description: Option<String>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AssistantPatchResolutionError {
+    pub edit_ix: usize,
+    pub message: String,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+enum SearchDirection {
+    Up,
+    Left,
+    Diagonal,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+struct SearchState {
+    cost: u32,
+    direction: SearchDirection,
+}
+
+impl SearchState {
+    fn new(cost: u32, direction: SearchDirection) -> Self {
+        Self { cost, direction }
+    }
+}
+
+struct SearchMatrix {
+    cols: usize,
+    data: Vec<SearchState>,
+}
+
+impl SearchMatrix {
+    fn new(rows: usize, cols: usize) -> Self {
+        SearchMatrix {
+            cols,
+            data: vec![SearchState::new(0, SearchDirection::Diagonal); rows * cols],
+        }
+    }
+
+    fn get(&self, row: usize, col: usize) -> SearchState {
+        self.data[row * self.cols + col]
+    }
+
+    fn set(&mut self, row: usize, col: usize, cost: SearchState) {
+        self.data[row * self.cols + col] = cost;
+    }
+}
+
+impl ResolvedPatch {
+    pub fn apply(&self, editor: &ProposedChangesEditor, cx: &mut App) {
+        for (buffer, groups) in &self.edit_groups {
+            let branch = editor.branch_buffer_for_base(buffer).unwrap();
+            Self::apply_edit_groups(groups, &branch, cx);
+        }
+        editor.recalculate_all_buffer_diffs();
+    }
+
+    fn apply_edit_groups(groups: &Vec<ResolvedEditGroup>, buffer: &Entity<Buffer>, cx: &mut App) {
+        let mut edits = Vec::new();
+        for group in groups {
+            for suggestion in &group.edits {
+                edits.push((suggestion.range.clone(), suggestion.new_text.clone()));
+            }
+        }
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit(
+                edits,
+                Some(AutoindentMode::Block {
+                    original_indent_columns: Vec::new(),
+                }),
+                cx,
+            );
+        });
+    }
+}
+
+impl ResolvedEdit {
+    pub fn try_merge(&mut self, other: &Self, buffer: &text::BufferSnapshot) -> bool {
+        let range = &self.range;
+        let other_range = &other.range;
+
+        // Don't merge if we don't contain the other suggestion.
+        if range.start.cmp(&other_range.start, buffer).is_gt()
+            || range.end.cmp(&other_range.end, buffer).is_lt()
+        {
+            return false;
+        }
+
+        let other_offset_range = other_range.to_offset(buffer);
+        let offset_range = range.to_offset(buffer);
+
+        // If the other range is empty at the start of this edit's range, combine the new text
+        if other_offset_range.is_empty() && other_offset_range.start == offset_range.start {
+            self.new_text = format!("{}\n{}", other.new_text, self.new_text);
+            self.range.start = other_range.start;
+
+            if let Some((description, other_description)) =
+                self.description.as_mut().zip(other.description.as_ref())
+            {
+                *description = format!("{}\n{}", other_description, description)
+            }
+        } else {
+            if let Some((description, other_description)) =
+                self.description.as_mut().zip(other.description.as_ref())
+            {
+                description.push('\n');
+                description.push_str(other_description);
+            }
+        }
+
+        true
+    }
+}
+
+impl AssistantEdit {
+    pub fn new(
+        path: Option<String>,
+        operation: Option<String>,
+        old_text: Option<String>,
+        new_text: Option<String>,
+        description: Option<String>,
+    ) -> Result<Self> {
+        let path = path.ok_or_else(|| anyhow!("missing path"))?;
+        let operation = operation.ok_or_else(|| anyhow!("missing operation"))?;
+
+        let kind = match operation.as_str() {
+            "update" => AssistantEditKind::Update {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "insert_before" => AssistantEditKind::InsertBefore {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "insert_after" => AssistantEditKind::InsertAfter {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "delete" => AssistantEditKind::Delete {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+            },
+            "create" => AssistantEditKind::Create {
+                description,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+            },
+            _ => Err(anyhow!("unknown operation {operation:?}"))?,
+        };
+
+        Ok(Self { path, kind })
+    }
+
+    pub async fn resolve(
+        &self,
+        project: Entity<Project>,
+        mut cx: AsyncApp,
+    ) -> Result<(Entity<Buffer>, ResolvedEdit)> {
+        let path = self.path.clone();
+        let kind = self.kind.clone();
+        let buffer = project
+            .update(&mut cx, |project, cx| {
+                let project_path = project
+                    .find_project_path(Path::new(&path), cx)
+                    .or_else(|| {
+                        // If we couldn't find a project path for it, put it in the active worktree
+                        // so that when we create the buffer, it can be saved.
+                        let worktree = project
+                            .active_entry()
+                            .and_then(|entry_id| project.worktree_for_entry(entry_id, cx))
+                            .or_else(|| project.worktrees(cx).next())?;
+                        let worktree = worktree.read(cx);
+
+                        Some(ProjectPath {
+                            worktree_id: worktree.id(),
+                            path: Arc::from(Path::new(&path)),
+                        })
+                    })
+                    .with_context(|| format!("worktree not found for {:?}", path))?;
+                anyhow::Ok(project.open_buffer(project_path, cx))
+            })??
+            .await?;
+
+        let snapshot = buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
+        let suggestion = cx
+            .background_spawn(async move { kind.resolve(&snapshot) })
+            .await;
+
+        Ok((buffer, suggestion))
+    }
+}
+
+impl AssistantEditKind {
+    fn resolve(self, snapshot: &BufferSnapshot) -> ResolvedEdit {
+        match self {
+            Self::Update {
+                old_text,
+                new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                ResolvedEdit {
+                    range,
+                    new_text,
+                    description,
+                }
+            }
+            Self::Create {
+                new_text,
+                description,
+            } => ResolvedEdit {
+                range: text::Anchor::MIN..text::Anchor::MAX,
+                description,
+                new_text,
+            },
+            Self::InsertBefore {
+                old_text,
+                mut new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                new_text.push('\n');
+                ResolvedEdit {
+                    range: range.start..range.start,
+                    new_text,
+                    description,
+                }
+            }
+            Self::InsertAfter {
+                old_text,
+                mut new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                new_text.insert(0, '\n');
+                ResolvedEdit {
+                    range: range.end..range.end,
+                    new_text,
+                    description,
+                }
+            }
+            Self::Delete { old_text } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                ResolvedEdit {
+                    range,
+                    new_text: String::new(),
+                    description: None,
+                }
+            }
+        }
+    }
+
+    fn resolve_location(buffer: &text::BufferSnapshot, search_query: &str) -> Range<text::Anchor> {
+        const INSERTION_COST: u32 = 3;
+        const DELETION_COST: u32 = 10;
+        const WHITESPACE_INSERTION_COST: u32 = 1;
+        const WHITESPACE_DELETION_COST: u32 = 1;
+
+        let buffer_len = buffer.len();
+        let query_len = search_query.len();
+        let mut matrix = SearchMatrix::new(query_len + 1, buffer_len + 1);
+        let mut leading_deletion_cost = 0_u32;
+        for (row, query_byte) in search_query.bytes().enumerate() {
+            let deletion_cost = if query_byte.is_ascii_whitespace() {
+                WHITESPACE_DELETION_COST
+            } else {
+                DELETION_COST
+            };
+
+            leading_deletion_cost = leading_deletion_cost.saturating_add(deletion_cost);
+            matrix.set(
+                row + 1,
+                0,
+                SearchState::new(leading_deletion_cost, SearchDirection::Diagonal),
+            );
+
+            for (col, buffer_byte) in buffer.bytes_in_range(0..buffer.len()).flatten().enumerate() {
+                let insertion_cost = if buffer_byte.is_ascii_whitespace() {
+                    WHITESPACE_INSERTION_COST
+                } else {
+                    INSERTION_COST
+                };
+
+                let up = SearchState::new(
+                    matrix.get(row, col + 1).cost.saturating_add(deletion_cost),
+                    SearchDirection::Up,
+                );
+                let left = SearchState::new(
+                    matrix.get(row + 1, col).cost.saturating_add(insertion_cost),
+                    SearchDirection::Left,
+                );
+                let diagonal = SearchState::new(
+                    if query_byte == *buffer_byte {
+                        matrix.get(row, col).cost
+                    } else {
+                        matrix
+                            .get(row, col)
+                            .cost
+                            .saturating_add(deletion_cost + insertion_cost)
+                    },
+                    SearchDirection::Diagonal,
+                );
+                matrix.set(row + 1, col + 1, up.min(left).min(diagonal));
+            }
+        }
+
+        // Traceback to find the best match
+        let mut best_buffer_end = buffer_len;
+        let mut best_cost = u32::MAX;
+        for col in 1..=buffer_len {
+            let cost = matrix.get(query_len, col).cost;
+            if cost < best_cost {
+                best_cost = cost;
+                best_buffer_end = col;
+            }
+        }
+
+        let mut query_ix = query_len;
+        let mut buffer_ix = best_buffer_end;
+        while query_ix > 0 && buffer_ix > 0 {
+            let current = matrix.get(query_ix, buffer_ix);
+            match current.direction {
+                SearchDirection::Diagonal => {
+                    query_ix -= 1;
+                    buffer_ix -= 1;
+                }
+                SearchDirection::Up => {
+                    query_ix -= 1;
+                }
+                SearchDirection::Left => {
+                    buffer_ix -= 1;
+                }
+            }
+        }
+
+        let mut start = buffer.offset_to_point(buffer.clip_offset(buffer_ix, Bias::Left));
+        start.column = 0;
+        let mut end = buffer.offset_to_point(buffer.clip_offset(best_buffer_end, Bias::Right));
+        if end.column > 0 {
+            end.column = buffer.line_len(end.row);
+        }
+
+        buffer.anchor_after(start)..buffer.anchor_before(end)
+    }
+}
+
+impl AssistantPatch {
+    pub async fn resolve(&self, project: Entity<Project>, cx: &mut AsyncApp) -> ResolvedPatch {
+        let mut resolve_tasks = Vec::new();
+        for (ix, edit) in self.edits.iter().enumerate() {
+            if let Ok(edit) = edit.as_ref() {
+                resolve_tasks.push(
+                    edit.resolve(project.clone(), cx.clone())
+                        .map_err(move |error| (ix, error)),
+                );
+            }
+        }
+
+        let edits = future::join_all(resolve_tasks).await;
+        let mut errors = Vec::new();
+        let mut edits_by_buffer = HashMap::default();
+        for entry in edits {
+            match entry {
+                Ok((buffer, edit)) => {
+                    edits_by_buffer
+                        .entry(buffer)
+                        .or_insert_with(Vec::new)
+                        .push(edit);
+                }
+                Err((edit_ix, error)) => errors.push(AssistantPatchResolutionError {
+                    edit_ix,
+                    message: error.to_string(),
+                }),
+            }
+        }
+
+        // Expand the context ranges of each edit and group edits with overlapping context ranges.
+        let mut edit_groups_by_buffer = HashMap::default();
+        for (buffer, edits) in edits_by_buffer {
+            if let Ok(snapshot) = buffer.update(cx, |buffer, _| buffer.text_snapshot()) {
+                edit_groups_by_buffer.insert(buffer, Self::group_edits(edits, &snapshot));
+            }
+        }
+
+        ResolvedPatch {
+            edit_groups: edit_groups_by_buffer,
+            errors,
+        }
+    }
+
+    fn group_edits(
+        mut edits: Vec<ResolvedEdit>,
+        snapshot: &text::BufferSnapshot,
+    ) -> Vec<ResolvedEditGroup> {
+        let mut edit_groups = Vec::<ResolvedEditGroup>::new();
+        // Sort edits by their range so that earlier, larger ranges come first
+        edits.sort_by(|a, b| a.range.cmp(&b.range, &snapshot));
+
+        // Merge overlapping edits
+        edits.dedup_by(|a, b| b.try_merge(a, &snapshot));
+
+        // Create context ranges for each edit
+        for edit in edits {
+            let context_range = {
+                let edit_point_range = edit.range.to_point(&snapshot);
+                let start_row = edit_point_range.start.row.saturating_sub(5);
+                let end_row = cmp::min(edit_point_range.end.row + 5, snapshot.max_point().row);
+                let start = snapshot.anchor_before(Point::new(start_row, 0));
+                let end = snapshot.anchor_after(Point::new(end_row, snapshot.line_len(end_row)));
+                start..end
+            };
+
+            if let Some(last_group) = edit_groups.last_mut() {
+                if last_group
+                    .context_range
+                    .end
+                    .cmp(&context_range.start, &snapshot)
+                    .is_ge()
+                {
+                    // Merge with the previous group if context ranges overlap
+                    last_group.context_range.end = context_range.end;
+                    last_group.edits.push(edit);
+                } else {
+                    // Create a new group
+                    edit_groups.push(ResolvedEditGroup {
+                        context_range,
+                        edits: vec![edit],
+                    });
+                }
+            } else {
+                // Create the first group
+                edit_groups.push(ResolvedEditGroup {
+                    context_range,
+                    edits: vec![edit],
+                });
+            }
+        }
+
+        edit_groups
+    }
+
+    pub fn path_count(&self) -> usize {
+        self.paths().count()
+    }
+
+    pub fn paths(&self) -> impl '_ + Iterator<Item = &str> {
+        let mut prev_path = None;
+        self.edits.iter().filter_map(move |edit| {
+            if let Ok(edit) = edit {
+                let path = Some(edit.path.as_str());
+                if path != prev_path {
+                    prev_path = path;
+                    return path;
+                }
+            }
+            None
+        })
+    }
+}
+
+impl PartialEq for AssistantPatch {
+    fn eq(&self, other: &Self) -> bool {
+        self.range == other.range
+            && self.title == other.title
+            && Arc::ptr_eq(&self.edits, &other.edits)
+    }
+}
+
+impl Eq for AssistantPatch {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::App;
+    use language::{
+        Language, LanguageConfig, LanguageMatcher, language_settings::AllLanguageSettings,
+    };
+    use settings::SettingsStore;
+    use ui::BorrowAppContext;
+    use unindent::Unindent as _;
+    use util::test::{generate_marked_text, marked_text_ranges};
+
+    #[gpui::test]
+    fn test_resolve_location(cx: &mut App) {
+        assert_location_resolution(
+            concat!(
+                "    Lorem\n",
+                "«    ipsum\n",
+                "    dolor sit amet»\n",
+                "    consecteur",
+            ),
+            "ipsum\ndolor",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            «fn foo1(a: usize) -> usize {
+                40
+            }»
+
+            fn foo2(b: usize) -> usize {
+                42
+            }
+            "
+            .unindent(),
+            "fn foo1(b: usize) {\n40\n}",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            fn main() {
+            «    Foo
+                    .bar()
+                    .baz()
+                    .qux()»
+            }
+
+            fn foo2(b: usize) -> usize {
+                42
+            }
+            "
+            .unindent(),
+            "Foo.bar.baz.qux()",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            class Something {
+                one() { return 1; }
+            «    two() { return 2222; }
+                three() { return 333; }
+                four() { return 4444; }
+                five() { return 5555; }
+                six() { return 6666; }
+            »    seven() { return 7; }
+                eight() { return 8; }
+            }
+            "
+            .unindent(),
+            &"
+                two() { return 2222; }
+                four() { return 4444; }
+                five() { return 5555; }
+                six() { return 6666; }
+            "
+            .unindent(),
+            cx,
+        );
+    }
+
+    #[gpui::test]
+    fn test_resolve_edits(cx: &mut App) {
+        init_test(cx);
+
+        assert_edits(
+            "
+                /// A person
+                struct Person {
+                    name: String,
+                    age: usize,
+                }
+
+                /// A dog
+                struct Dog {
+                    weight: f32,
+                }
+
+                impl Person {
+                    fn name(&self) -> &str {
+                        &self.name
+                    }
+                }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "
+                        name: String,
+                    "
+                    .unindent(),
+                    new_text: "
+                        first_name: String,
+                        last_name: String,
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn name(&self) -> &str {
+                            &self.name
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn name(&self) -> String {
+                            format!(\"{} {}\", self.first_name, self.last_name)
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+            ],
+            "
+                /// A person
+                struct Person {
+                    first_name: String,
+                    last_name: String,
+                    age: usize,
+                }
+
+                /// A dog
+                struct Dog {
+                    weight: f32,
+                }
+
+                impl Person {
+                    fn name(&self) -> String {
+                        format!(\"{} {}\", self.first_name, self.last_name)
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        // Ensure InsertBefore merges correctly with Update of the same text
+        assert_edits(
+            "
+                fn foo() {
+
+                }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::InsertBefore {
+                    old_text: "
+                        fn foo() {"
+                        .unindent(),
+                    new_text: "
+                        fn bar() {
+                            qux();
+                        }"
+                    .unindent(),
+                    description: Some("implement bar".into()),
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn foo() {
+
+                        }"
+                    .unindent(),
+                    new_text: "
+                        fn foo() {
+                            bar();
+                        }"
+                    .unindent(),
+                    description: Some("call bar in foo".into()),
+                },
+                AssistantEditKind::InsertAfter {
+                    old_text: "
+                        fn foo() {
+
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn qux() {
+                            // todo
+                        }
+                    "
+                    .unindent(),
+                    description: Some("implement qux".into()),
+                },
+            ],
+            "
+                fn bar() {
+                    qux();
+                }
+
+                fn foo() {
+                    bar();
+                }
+
+                fn qux() {
+                    // todo
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        // Correctly indent new text when replacing multiple adjacent indented blocks.
+        assert_edits(
+            "
+            impl Numbers {
+                fn one() {
+                    1
+                }
+
+                fn two() {
+                    2
+                }
+
+                fn three() {
+                    3
+                }
+            }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn one() {
+                            1
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn one() {
+                            101
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn two() {
+                            2
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn two() {
+                            102
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn three() {
+                            3
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn three() {
+                            103
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+            ],
+            "
+                impl Numbers {
+                    fn one() {
+                        101
+                    }
+
+                    fn two() {
+                        102
+                    }
+
+                    fn three() {
+                        103
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        assert_edits(
+            "
+            impl Person {
+                fn set_name(&mut self, name: String) {
+                    self.name = name;
+                }
+
+                fn name(&self) -> String {
+                    return self.name;
+                }
+            }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "self.name = name;".unindent(),
+                    new_text: "self._name = name;".unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "return self.name;\n".unindent(),
+                    new_text: "return self._name;\n".unindent(),
+                    description: None,
+                },
+            ],
+            "
+                impl Person {
+                    fn set_name(&mut self, name: String) {
+                        self._name = name;
+                    }
+
+                    fn name(&self) -> String {
+                        return self._name;
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+    }
+
+    fn init_test(cx: &mut App) {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+        language::init(cx);
+        cx.update_global::<SettingsStore, _>(|settings, cx| {
+            settings.update_user_settings::<AllLanguageSettings>(cx, |_| {});
+        });
+    }
+
+    #[track_caller]
+    fn assert_location_resolution(text_with_expected_range: &str, query: &str, cx: &mut App) {
+        let (text, _) = marked_text_ranges(text_with_expected_range, false);
+        let buffer = cx.new(|cx| Buffer::local(text.clone(), cx));
+        let snapshot = buffer.read(cx).snapshot();
+        let range = AssistantEditKind::resolve_location(&snapshot, query).to_offset(&snapshot);
+        let text_with_actual_range = generate_marked_text(&text, &[range], false);
+        pretty_assertions::assert_eq!(text_with_actual_range, text_with_expected_range);
+    }
+
+    #[track_caller]
+    fn assert_edits(
+        old_text: String,
+        edits: Vec<AssistantEditKind>,
+        new_text: String,
+        cx: &mut App,
+    ) {
+        let buffer =
+            cx.new(|cx| Buffer::local(old_text, cx).with_language(Arc::new(rust_lang()), cx));
+        let snapshot = buffer.read(cx).snapshot();
+        let resolved_edits = edits
+            .into_iter()
+            .map(|kind| kind.resolve(&snapshot))
+            .collect();
+        let edit_groups = AssistantPatch::group_edits(resolved_edits, &snapshot);
+        ResolvedPatch::apply_edit_groups(&edit_groups, &buffer, cx);
+        let actual_new_text = buffer.read(cx).text();
+        pretty_assertions::assert_eq!(actual_new_text, new_text);
+    }
+
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(language::tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+            (call_expression) @indent
+            (field_expression) @indent
+            (_ "(" ")" @end) @indent
+            (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap()
+    }
+}

crates/assistant_context_editor/src/slash_command.rs

@@ -48,7 +48,7 @@ impl SlashCommandCompletionProvider {
         name_range: Range<Anchor>,
         window: &mut Window,
         cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
         let slash_commands = self.slash_commands.clone();
         let candidates = slash_commands
             .command_names(cx)
@@ -71,27 +71,28 @@ impl SlashCommandCompletionProvider {
             .await;
 
             cx.update(|_, cx| {
-                let completions = matches
-                    .into_iter()
-                    .filter_map(|mat| {
-                        let command = slash_commands.command(&mat.string, cx)?;
-                        let mut new_text = mat.string.clone();
-                        let requires_argument = command.requires_argument();
-                        let accepts_arguments = command.accepts_arguments();
-                        if requires_argument || accepts_arguments {
-                            new_text.push(' ');
-                        }
+                Some(
+                    matches
+                        .into_iter()
+                        .filter_map(|mat| {
+                            let command = slash_commands.command(&mat.string, cx)?;
+                            let mut new_text = mat.string.clone();
+                            let requires_argument = command.requires_argument();
+                            let accepts_arguments = command.accepts_arguments();
+                            if requires_argument || accepts_arguments {
+                                new_text.push(' ');
+                            }
 
-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    let command_name = mat.string.clone();
-                                    let command_range = command_range.clone();
-                                    let editor = editor.clone();
-                                    let workspace = workspace.clone();
-                                    Arc::new(
+                            let confirm =
+                                editor
+                                    .clone()
+                                    .zip(workspace.clone())
+                                    .map(|(editor, workspace)| {
+                                        let command_name = mat.string.clone();
+                                        let command_range = command_range.clone();
+                                        let editor = editor.clone();
+                                        let workspace = workspace.clone();
+                                        Arc::new(
                                             move |intent: CompletionIntent,
                                             window: &mut Window,
                                             cx: &mut App| {
@@ -117,27 +118,22 @@ impl SlashCommandCompletionProvider {
                                                 }
                                             },
                                         ) as Arc<_>
-                                });
-
-                        Some(project::Completion {
-                            replace_range: name_range.clone(),
-                            documentation: Some(CompletionDocumentation::SingleLine(
-                                command.description().into(),
-                            )),
-                            new_text,
-                            label: command.label(cx),
-                            icon_path: None,
-                            insert_text_mode: None,
-                            confirm,
-                            source: CompletionSource::Custom,
+                                    });
+                            Some(project::Completion {
+                                replace_range: name_range.clone(),
+                                documentation: Some(CompletionDocumentation::SingleLine(
+                                    command.description().into(),
+                                )),
+                                new_text,
+                                label: command.label(cx),
+                                icon_path: None,
+                                insert_text_mode: None,
+                                confirm,
+                                source: CompletionSource::Custom,
+                            })
                         })
-                    })
-                    .collect();
-
-                vec![project::CompletionResponse {
-                    completions,
-                    is_incomplete: false,
-                }]
+                        .collect(),
+                )
             })
         })
     }
@@ -151,7 +147,7 @@ impl SlashCommandCompletionProvider {
         last_argument_range: Range<Anchor>,
         window: &mut Window,
         cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
         let new_cancel_flag = Arc::new(AtomicBool::new(false));
         let mut flag = self.cancel_flag.lock();
         flag.store(true, SeqCst);
@@ -169,27 +165,28 @@ impl SlashCommandCompletionProvider {
             let workspace = self.workspace.clone();
             let arguments = arguments.to_vec();
             cx.background_spawn(async move {
-                let completions = completions
-                    .await?
-                    .into_iter()
-                    .map(|new_argument| {
-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    Arc::new({
-                                        let mut completed_arguments = arguments.clone();
-                                        if new_argument.replace_previous_arguments {
-                                            completed_arguments.clear();
-                                        } else {
-                                            completed_arguments.pop();
-                                        }
-                                        completed_arguments.push(new_argument.new_text.clone());
+                Ok(Some(
+                    completions
+                        .await?
+                        .into_iter()
+                        .map(|new_argument| {
+                            let confirm =
+                                editor
+                                    .clone()
+                                    .zip(workspace.clone())
+                                    .map(|(editor, workspace)| {
+                                        Arc::new({
+                                            let mut completed_arguments = arguments.clone();
+                                            if new_argument.replace_previous_arguments {
+                                                completed_arguments.clear();
+                                            } else {
+                                                completed_arguments.pop();
+                                            }
+                                            completed_arguments.push(new_argument.new_text.clone());
 
-                                        let command_range = command_range.clone();
-                                        let command_name = command_name.clone();
-                                        move |intent: CompletionIntent,
+                                            let command_range = command_range.clone();
+                                            let command_name = command_name.clone();
+                                            move |intent: CompletionIntent,
                                               window: &mut Window,
                                               cx: &mut App| {
                                             if new_argument.after_completion.run()
@@ -213,41 +210,34 @@ impl SlashCommandCompletionProvider {
                                                 !new_argument.after_completion.run()
                                             }
                                         }
-                                    }) as Arc<_>
-                                });
+                                        }) as Arc<_>
+                                    });
 
-                        let mut new_text = new_argument.new_text.clone();
-                        if new_argument.after_completion == AfterCompletion::Continue {
-                            new_text.push(' ');
-                        }
+                            let mut new_text = new_argument.new_text.clone();
+                            if new_argument.after_completion == AfterCompletion::Continue {
+                                new_text.push(' ');
+                            }
 
-                        project::Completion {
-                            replace_range: if new_argument.replace_previous_arguments {
-                                argument_range.clone()
-                            } else {
-                                last_argument_range.clone()
-                            },
-                            label: new_argument.label,
-                            icon_path: None,
-                            new_text,
-                            documentation: None,
-                            confirm,
-                            insert_text_mode: None,
-                            source: CompletionSource::Custom,
-                        }
-                    })
-                    .collect();
-
-                Ok(vec![project::CompletionResponse {
-                    completions,
-                    is_incomplete: false,
-                }])
+                            project::Completion {
+                                replace_range: if new_argument.replace_previous_arguments {
+                                    argument_range.clone()
+                                } else {
+                                    last_argument_range.clone()
+                                },
+                                label: new_argument.label,
+                                icon_path: None,
+                                new_text,
+                                documentation: None,
+                                confirm,
+                                insert_text_mode: None,
+                                source: CompletionSource::Custom,
+                            }
+                        })
+                        .collect(),
+                ))
             })
         } else {
-            Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                is_incomplete: false,
-            }]))
+            Task::ready(Ok(Some(Vec::new())))
         }
     }
 }
@@ -261,7 +251,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
         _: editor::CompletionContext,
         window: &mut Window,
         cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
+    ) -> Task<Result<Option<Vec<project::Completion>>>> {
         let Some((name, arguments, command_range, last_argument_range)) =
             buffer.update(cx, |buffer, _cx| {
                 let position = buffer_position.to_point(buffer);
@@ -288,8 +278,8 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                         buffer.anchor_after(Point::new(position.row, first_arg_start.start as u32));
                     let arguments = call
                         .arguments
-                        .into_iter()
-                        .filter_map(|argument| Some(line.get(argument)?.to_string()))
+                        .iter()
+                        .filter_map(|argument| Some(line.get(argument.clone())?.to_string()))
                         .collect::<Vec<_>>();
                     let argument_range = first_arg_start..buffer_position;
                     (
@@ -305,10 +295,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                 Some((name, arguments, command_range, last_argument_range))
             })
         else {
-            return Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                is_incomplete: false,
-            }]));
+            return Task::ready(Ok(Some(Vec::new())));
         };
 
         if let Some((arguments, argument_range)) = arguments {

crates/assistant_context_editor/src/slash_command_picker.rs

@@ -338,7 +338,7 @@ where
 
         let handle = self
             .active_context_editor
-            .read_with(cx, |this, _| this.slash_menu_handle.clone())
+            .update(cx, |this, _| this.slash_menu_handle.clone())
             .ok();
         PopoverMenu::new("model-switcher")
             .menu(move |_window, _cx| Some(picker_view.clone()))

crates/assistant_settings/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "agent_settings"
+name = "assistant_settings"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later"
 workspace = true
 
 [lib]
-path = "src/agent_settings.rs"
+path = "src/assistant_settings.rs"
 
 [dependencies]
 anthropic = { workspace = true, features = ["schemars"] }
@@ -23,7 +23,6 @@ log.workspace = true
 ollama = { workspace = true, features = ["schemars"] }
 open_ai = { workspace = true, features = ["schemars"] }
 deepseek = { workspace = true, features = ["schemars"] }
-mistral = { workspace = true, features = ["schemars"] }
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true

crates/assistant_settings/src/agent_profile.rs

@@ -24,7 +24,7 @@ pub struct GroupedAgentProfiles {
 }
 
 impl GroupedAgentProfiles {
-    pub fn from_settings(settings: &crate::AgentSettings) -> Self {
+    pub fn from_settings(settings: &crate::AssistantSettings) -> Self {
         let mut builtin = IndexMap::default();
         let mut custom = IndexMap::default();
 

crates/assistant_slash_command/src/assistant_slash_command.rs

@@ -9,7 +9,6 @@ use anyhow::Result;
 use futures::StreamExt;
 use futures::stream::{self, BoxStream};
 use gpui::{App, SharedString, Task, WeakEntity, Window};
-use language::HighlightId;
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
 pub use language_model::Role;
 use serde::{Deserialize, Serialize};
@@ -17,7 +16,6 @@ use std::{
     ops::Range,
     sync::{Arc, atomic::AtomicBool},
 };
-use ui::ActiveTheme;
 use workspace::{Workspace, ui::IconName};
 
 pub fn init(cx: &mut App) {
@@ -327,18 +325,6 @@ impl SlashCommandLine {
     }
 }
 
-pub fn create_label_for_command(command_name: &str, arguments: &[&str], cx: &App) -> CodeLabel {
-    let mut label = CodeLabel::default();
-    label.push_str(command_name, None);
-    label.push_str(" ", None);
-    label.push_str(
-        &arguments.join(" "),
-        cx.theme().syntax().highlight_id("comment").map(HighlightId),
-    );
-    label.filter_range = 0..command_name.len();
-    label
-}
-
 #[cfg(test)]
 mod tests {
     use pretty_assertions::assert_eq;