zed 0.187.2

debugger: Make the stack frame list and module list keyboard-navigable (#30682 )
- Switch stack frame list and module list to `UniformList` to access scrolling behavior - Implement `menu::` navigation actions Release Notes: - Debugger Beta: Added support for menu navigation actions (`ctrl-n`, `ctrl-p`, etc.) in the stack frame list and module list.
2025-05-15 12:44:38 +02:00 · 2025-05-15 11:53:55 +02:00 · 2025-05-15 11:53:00 +02:00 · 2025-05-15 11:48:18 +02:00 · 2025-05-14 16:15:22 +02:00 · 2025-05-14 16:13:53 +02:00
628 changed files with 9695 additions and 19204 deletions
--- a/.cargo/config.toml
+++ b/.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",
--- a/.git-blame-ignore-revs
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/01_bug_agent.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_agent.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
--- a/.github/ISSUE_TEMPLATE/02_bug_edit_predictions.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/03_bug_git.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
+++ b/.github/ISSUE_TEMPLATE/04_bug_debugger.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
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/11_crash_report.yml
+++ b/.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
--- a/.mailmap
+++ b/.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>
--- a/.rules
+++ b/.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.
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -3,13 +3,15 @@
    "label": "Debug Zed (CodeLLDB)",
    "adapter": "CodeLLDB",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch"
+    "request": "launch",
+    "cwd": "$ZED_WORKTREE_ROOT"
  },
  {
    "label": "Debug Zed (GDB)",
    "adapter": "GDB",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
+    "cwd": "$ZED_WORKTREE_ROOT",
    "initialize_args": {
      "stopAtBeginningOfMainSubprogram": true
    }
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,12 +74,11 @@ members = [
    "crates/inline_completion",
    "crates/inline_completion_button",
    "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",
@@ -280,12 +279,11 @@ indexed_docs = { path = "crates/indexed_docs" }
 inline_completion = { path = "crates/inline_completion" }
 inline_completion_button = { path = "crates/inline_completion_button" }
 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" }
@@ -428,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"
@@ -461,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" }
@@ -470,12 +465,12 @@ 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"] }
 nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
@@ -554,9 +549,9 @@ 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",
@@ -599,8 +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"
-wasi-preview1-component-adapter-provider = "29"
+walkdir = "2.3"
 wasm-encoder = "0.221"
 wasmparser = "0.221"
 wasmtime = { version = "29", default-features = false, features = [
@@ -609,14 +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.2"
+zed_llm_client = "0.8.1"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
@@ -796,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",
@@ -806,6 +795,7 @@ ignored = [
    "prost_build",
    "serde",
    "component",
+    "linkme",
    "documented",
    "workspace-hack",
 ]
--- a/2
+++ b/2
@@ -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 . .

--- a/README.md
+++ b/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:
--- a/assets/icons/bolt.svg
+++ b/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>
--- a/assets/icons/bolt_filled.svg
+++ b/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>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -33,7 +33,6 @@
      "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",
@@ -513,8 +512,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",
@@ -559,7 +556,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",
@@ -597,6 +593,7 @@
  {
    "context": "Editor",
    "bindings": {
+      "ctrl-shift-d": "editor::DuplicateLineDown",
      "ctrl-shift-j": "editor::JoinLines",
      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
      "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
@@ -769,7 +766,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"
@@ -863,13 +860,6 @@
      "alt-l": "git::GenerateCommitMessage"
    }
  },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker"
-    }
-  },
  {
    "context": "CollabPanel && not_editing",
    "bindings": {
@@ -938,7 +928,6 @@
      "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"],
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1,4 +1,15 @@
 [
+  // 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,
@@ -6,7 +17,6 @@
      "f4": "debugger::Start",
      "f5": "debugger::Continue",
      "shift-f5": "debugger::Stop",
-      "shift-cmd-f5": "debugger::Restart",
      "f6": "debugger::Pause",
      "f7": "debugger::StepOver",
      "f11": "debugger::StepInto",
@@ -369,15 +379,6 @@
      "shift-backspace": "agent::RemoveSelectedThread"
    }
  },
-  {
-    "context": "PromptLibrary",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "rules_library::NewRule",
-      "cmd-shift-s": "rules_library::ToggleDefaultRule",
-      "cmd-w": "workspace::CloseWindow"
-    }
-  },
  {
    "context": "BufferSearchBar",
    "use_key_equivalents": true,
@@ -587,7 +588,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",
@@ -623,7 +623,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",
@@ -826,7 +825,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"
@@ -929,13 +928,6 @@
      "alt-tab": "git::GenerateCommitMessage"
    }
  },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "cmd-t": "debugger::ToggleThreadPicker",
-      "cmd-i": "debugger::ToggleSessionPicker"
-    }
-  },
  {
    "context": "CollabPanel && not_editing",
    "use_key_equivalents": true,
@@ -1019,7 +1011,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"],
--- a/assets/keymaps/linux/emacs.json
+++ b/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",
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -51,7 +51,9 @@
      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd"
+      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "f3": "editor::FindNextMatch",
+      "shift-f3": "editor::FindPreviousMatch"
    }
  },
  {
--- a/assets/keymaps/macos/emacs.json
+++ b/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",
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -53,7 +53,9 @@
      "cmd-shift-j": "editor::JoinLines",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd"
+      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "cmd-g": "editor::FindNextMatch",
+      "cmd-shift-g": "editor::FindPreviousMatch"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/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",
@@ -846,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"
+    }
  }
 ]
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -230,11 +230,11 @@
  // Possible values:
  //  - "off" — no diagnostics are allowed
  //  - "error"
-  //  - "warning"
+  //  - "warning" (default)
  //  - "info"
  //  - "hint"
-  //  - null — allow all diagnostics (default)
-  "diagnostics_max_severity": null,
+  //  - null — allow all diagnostics
+  "diagnostics_max_severity": "warning",
  // 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
@@ -322,9 +322,7 @@
    // 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": true
+    "agent_review": true
  },
  // Titlebar related settings
  "title_bar": {
@@ -337,9 +335,7 @@
    // 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": {
@@ -760,8 +756,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": {
@@ -1717,8 +1711,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": {
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -1,30 +1,32 @@
 [
  {
    "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"
+    }
  }
 ]
--- a/crates/activity_indicator/Cargo.toml
+++ b/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
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/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,7 +305,6 @@ impl ActivityIndicator {
                ),
                message,
                on_click: Some(Arc::new(Self::toggle_language_server_work_context_menu)),
-                tooltip_message: None,
            });
        }

@@ -335,7 +332,6 @@ impl ActivityIndicator {
                    ),
                    message: job_info.message.into(),
                    on_click: None,
-                    tooltip_message: None,
                });
            }
        }
@@ -378,7 +374,6 @@ impl ActivityIndicator {
                        .retain(|status| !downloading.contains(&status.name));
                    this.dismiss_error_message(&DismissErrorMessage, window, cx)
                })),
-                tooltip_message: None,
            });
        }

@@ -407,7 +402,6 @@ impl ActivityIndicator {
                        .retain(|status| !checking_for_update.contains(&status.name));
                    this.dismiss_error_message(&DismissErrorMessage, window, cx)
                })),
-                tooltip_message: None,
            });
        }

@@ -434,7 +428,6 @@ impl ActivityIndicator {
                on_click: Some(Arc::new(|this, window, cx| {
                    this.show_error_message(&Default::default(), window, cx)
                })),
-                tooltip_message: None,
            });
        }

@@ -453,7 +446,6 @@ impl ActivityIndicator {
                    });
                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
                })),
-                tooltip_message: None,
            });
        }

@@ -470,7 +462,6 @@ impl ActivityIndicator {
                    on_click: Some(Arc::new(|this, window, cx| {
                        this.dismiss_error_message(&DismissErrorMessage, window, cx)
                    })),
-                    tooltip_message: None,
                }),
                AutoUpdateStatus::Downloading => Some(Content {
                    icon: Some(
@@ -482,7 +473,6 @@ impl ActivityIndicator {
                    on_click: Some(Arc::new(|this, window, cx| {
                        this.dismiss_error_message(&DismissErrorMessage, window, cx)
                    })),
-                    tooltip_message: None,
                }),
                AutoUpdateStatus::Installing => Some(Content {
                    icon: Some(
@@ -494,12 +484,8 @@ impl ActivityIndicator {
                    on_click: Some(Arc::new(|this, window, cx| {
                        this.dismiss_error_message(&DismissErrorMessage, window, cx)
                    })),
-                    tooltip_message: None,
                }),
-                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({
@@ -508,7 +494,6 @@ impl ActivityIndicator {
                        };
                        move |_, _, cx| workspace::reload(&reload, cx)
                    })),
-                    tooltip_message: Some(Self::install_version_tooltip_message(&version)),
                }),
                AutoUpdateStatus::Errored => Some(Content {
                    icon: Some(
@@ -520,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,
            };
@@ -540,7 +524,6 @@ impl ActivityIndicator {
                    on_click: Some(Arc::new(|this, window, cx| {
                        this.dismiss_error_message(&DismissErrorMessage, window, cx)
                    })),
-                    tooltip_message: None,
                });
            }
        }
@@ -548,17 +531,6 @@ impl ActivityIndicator {
        None
    }

-    fn install_version_tooltip_message(version: &VersionCheckType) -> String {
-        format!("Install 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,
@@ -603,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| {
@@ -690,26 +655,3 @@ impl StatusItemView for ActivityIndicator {
    ) {
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use gpui::SemanticVersion;
-    use release_channel::AppCommitSha;
-
-    use super::*;
-
-    #[test]
-    fn test_install_version_tooltip_message() {
-        let message = ActivityIndicator::install_version_tooltip_message(
-            &VersionCheckType::Semantic(SemanticVersion::new(1, 0, 0)),
-        );
-
-        assert_eq!(message, "Install version: 1.0.0");
-
-        let message = ActivityIndicator::install_version_tooltip_message(&VersionCheckType::Sha(
-            AppCommitSha::new("14d9a4189f058d8736339b06ff2340101eaea5af".to_string()),
-        ));
-
-        assert_eq!(message, "Install version: 14d9a41…");
-    }
-}
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -47,11 +47,12 @@ heed.workspace = true
 html_to_markdown.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
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -52,7 +52,7 @@ use ui::{
 };
 use util::ResultExt as _;
 use util::markdown::MarkdownCodeBlock;
-use workspace::{CollaboratorId, Workspace};
+use workspace::Workspace;
 use zed_actions::assistant::OpenRulesLibrary;

 pub struct ActiveThread {
@@ -185,14 +185,12 @@ pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle
    let ui_font_size = TextSize::Default.rems(cx);
    let buffer_font_size = TextSize::Small.rems(cx);
    let mut text_style = window.text_style();
-    let line_height = buffer_font_size * 1.75;

    text_style.refine(&TextStyleRefinement {
        font_family: Some(theme_settings.ui_font.family.clone()),
        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
        font_features: Some(theme_settings.ui_font.features.clone()),
        font_size: Some(ui_font_size.into()),
-        line_height: Some(line_height.into()),
        color: Some(cx.theme().colors().text),
        ..Default::default()
    });
@@ -333,6 +331,7 @@ fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
 }

 const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
+const MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK: usize = 10;

 fn render_markdown_code_block(
    message_id: MessageId,
@@ -345,20 +344,17 @@ fn render_markdown_code_block(
    _window: &Window,
    cx: &App,
 ) -> Div {
-    let label_size = rems(0.8125);
-
    let label = match kind {
        CodeBlockKind::Indented => None,
        CodeBlockKind::Fenced => Some(
            h_flex()
-                .px_1()
                .gap_1()
                .child(
                    Icon::new(IconName::Code)
                        .color(Color::Muted)
                        .size(IconSize::XSmall),
                )
-                .child(div().text_size(label_size).child("Plain Text"))
+                .child(Label::new("untitled").size(LabelSize::Small))
                .into_any_element(),
        ),
        CodeBlockKind::FencedLang(raw_language_name) => Some(render_code_language(
@@ -395,7 +391,7 @@ fn render_markdown_code_block(
                        .id(("code-block-header-label", ix))
                        .ml_1()
                        .gap_1()
-                        .child(div().text_size(label_size).child(file_name))
+                        .child(Label::new(file_name).size(LabelSize::Small))
                        .child(Label::new(path).color(Color::Muted).size(LabelSize::Small))
                        .tooltip(move |window, cx| {
                            Tooltip::with_meta(
@@ -408,10 +404,9 @@ fn render_markdown_code_block(
                        })
                        .into_any_element()
                } else {
-                    div()
+                    Label::new(path_range.path.to_string_lossy().to_string())
+                        .size(LabelSize::Small)
                        .ml_1()
-                        .text_size(label_size)
-                        .child(path_range.path.to_string_lossy().to_string())
                        .into_any_element()
                };

@@ -459,13 +454,19 @@ fn render_markdown_code_block(
        .copied_code_block_ids
        .contains(&(message_id, ix));

-    let is_expanded = active_thread.read(cx).is_codeblock_expanded(message_id, ix);
+    let can_expand = metadata.line_count >= MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK;
+
+    let is_expanded = if can_expand {
+        active_thread.read(cx).is_codeblock_expanded(message_id, ix)
+    } else {
+        false
+    };

    let codeblock_header_bg = cx
        .theme()
        .colors()
        .element_background
-        .blend(cx.theme().colors().editor_foreground.opacity(0.025));
+        .blend(cx.theme().colors().editor_foreground.opacity(0.01));

    let control_buttons = h_flex()
        .visible_on_hover(CODEBLOCK_CONTAINER_GROUP)
@@ -516,48 +517,44 @@ fn render_markdown_code_block(
                }
            }),
        )
-        .child(
-            IconButton::new(
-                ("expand-collapse-code", ix),
-                if is_expanded {
-                    IconName::ChevronUp
+        .when(can_expand, |header| {
+            header.child(
+                IconButton::new(
+                    ("expand-collapse-code", ix),
+                    if is_expanded {
+                        IconName::ChevronUp
+                    } else {
+                        IconName::ChevronDown
+                    },
+                )
+                .icon_color(Color::Muted)
+                .shape(ui::IconButtonShape::Square)
+                .tooltip(Tooltip::text(if is_expanded {
+                    "Collapse Code"
                } else {
-                    IconName::ChevronDown
-                },
+                    "Expand Code"
+                }))
+                .on_click({
+                    let active_thread = active_thread.clone();
+                    move |_event, _window, cx| {
+                        active_thread.update(cx, |this, cx| {
+                            this.toggle_codeblock_expanded(message_id, ix);
+                            cx.notify();
+                        });
+                    }
+                }),
            )
-            .icon_color(Color::Muted)
-            .shape(ui::IconButtonShape::Square)
-            .tooltip(Tooltip::text(if is_expanded {
-                "Collapse Code"
-            } else {
-                "Expand Code"
-            }))
-            .on_click({
-                let active_thread = active_thread.clone();
-                move |_event, _window, cx| {
-                    active_thread.update(cx, |this, cx| {
-                        this.toggle_codeblock_expanded(message_id, ix);
-                        cx.notify();
-                    });
-                }
-            }),
-        );
+        });

    let codeblock_header = h_flex()
        .relative()
        .p_1()
        .gap_1()
        .justify_between()
+        .border_b_1()
+        .border_color(cx.theme().colors().border.opacity(0.6))
        .bg(codeblock_header_bg)
-        .map(|this| {
-            if !is_expanded {
-                this.rounded_md()
-            } else {
-                this.rounded_t_md()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border.opacity(0.6))
-            }
-        })
+        .rounded_t_md()
        .children(label)
        .child(control_buttons);

@@ -565,12 +562,12 @@ fn render_markdown_code_block(
        .group(CODEBLOCK_CONTAINER_GROUP)
        .my_2()
        .overflow_hidden()
-        .rounded_md()
+        .rounded_lg()
        .border_1()
        .border_color(cx.theme().colors().border.opacity(0.6))
        .bg(cx.theme().colors().editor_background)
        .child(codeblock_header)
-        .when(!is_expanded, |this| this.h(rems_from_px(31.)))
+        .when(can_expand && !is_expanded, |this| this.max_h_80())
 }

 fn open_path(
@@ -631,13 +628,10 @@ fn render_code_language(
        .map(|language| language.name().into())
        .unwrap_or(name_fallback);

-    let label_size = rems(0.8125);
-
    h_flex()
-        .px_1()
-        .gap_1p5()
-        .children(icon_path.map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)))
-        .child(div().text_size(label_size).child(language_label))
+        .gap_1()
+        .children(icon_path.map(|icon| icon.color(Color::Muted).size(IconSize::Small)))
+        .child(Label::new(language_label).size(LabelSize::Small))
        .into_any_element()
 }

@@ -971,22 +965,7 @@ impl ActiveThread {
            ThreadEvent::ShowError(error) => {
                self.last_error = Some(error.clone());
            }
-            ThreadEvent::NewRequest => {
-                cx.notify();
-            }
-            ThreadEvent::CompletionCanceled => {
-                self.thread.update(cx, |thread, cx| {
-                    thread.project().update(cx, |project, cx| {
-                        project.set_agent_location(None, cx);
-                    })
-                });
-                self.workspace
-                    .update(cx, |workspace, cx| {
-                        if workspace.is_being_followed(CollaboratorId::Agent) {
-                            workspace.unfollow(CollaboratorId::Agent, window, cx);
-                        }
-                    })
-                    .ok();
+            ThreadEvent::NewRequest | ThreadEvent::CompletionCanceled => {
                cx.notify();
            }
            ThreadEvent::StreamedCompletion
@@ -1033,7 +1012,6 @@ impl ActiveThread {
                    self.push_message(message_id, &message_segments, window, cx);
                }

-                self.scroll_to_bottom(cx);
                self.save_thread(cx);
                cx.notify();
            }
@@ -1047,7 +1025,6 @@ impl ActiveThread {
                    self.edited_message(message_id, &message_segments, window, cx);
                }

-                self.scroll_to_bottom(cx);
                self.save_thread(cx);
                cx.notify();
            }
@@ -1561,15 +1538,11 @@ impl ActiveThread {
        let project = self.thread.read(cx).project().clone();
        let prompt_store = self.thread_store.read(cx).prompt_store().clone();

-        let git_store = project.read(cx).git_store().clone();
-        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
-
        let load_context_task =
            crate::context::load_context(new_context, &project, &prompt_store, cx);
        self._load_edited_message_context_task =
            Some(cx.spawn_in(window, async move |this, cx| {
-                let (context, checkpoint) =
-                    futures::future::join(load_context_task, checkpoint).await;
+                let context = load_context_task.await;
                let _ = this
                    .update_in(cx, |this, window, cx| {
                        this.thread.update(cx, |thread, cx| {
@@ -1578,7 +1551,6 @@ impl ActiveThread {
                                Role::User,
                                vec![MessageSegment::Text(edited_text)],
                                Some(context.loaded_context),
-                                checkpoint.ok(),
                                cx,
                            );
                            for message_id in this.messages_after(message_id) {
@@ -1748,11 +1720,10 @@ impl ActiveThread {
            .on_action(cx.listener(Self::confirm_editing_message))
            .capture_action(cx.listener(Self::paste))
            .min_h_6()
-            .w_full()
            .flex_grow()
+            .w_full()
            .gap_2()
-            .child(state.context_strip.clone())
-            .child(div().pt(px(-3.)).px_neg_0p5().child(EditorElement::new(
+            .child(EditorElement::new(
                &state.editor,
                EditorStyle {
                    background: colors.editor_background,
@@ -1761,7 +1732,8 @@ impl ActiveThread {
                    syntax: cx.theme().syntax().clone(),
                    ..Default::default()
                },
-            )))
+            ))
+            .child(state.context_strip.clone())
    }

    fn render_message(&self, ix: usize, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
@@ -1889,8 +1861,7 @@ impl ActiveThread {
                        .child(open_as_markdown),
                )
                .into_any_element(),
-            None if AssistantSettings::get_global(cx).enable_feedback =>
-                feedback_container
+            None => feedback_container
                .child(
                    div().visible_on_hover("feedback_container").child(
                        Label::new(
@@ -1933,9 +1904,6 @@ impl ActiveThread {
                        .child(open_as_markdown),
                )
                .into_any_element(),
-            None => feedback_container
-                .child(h_flex().child(open_as_markdown))
-                .into_any_element(),
        };

        let message_is_empty = message.should_display_content();
@@ -1949,6 +1917,16 @@ impl ActiveThread {
                v_flex()
                    .w_full()
                    .gap_1()
+                    .when(!message_is_empty, |parent| {
+                        parent.child(div().min_h_6().child(self.render_message_content(
+                            message_id,
+                            rendered_message,
+                            has_tool_uses,
+                            workspace.clone(),
+                            window,
+                            cx,
+                        )))
+                    })
                    .when(!added_context.is_empty(), |parent| {
                        parent.child(h_flex().flex_wrap().gap_1().children(
                            added_context.into_iter().map(|added_context| {
@@ -1967,16 +1945,6 @@ impl ActiveThread {
                            }),
                        ))
                    })
-                    .when(!message_is_empty, |parent| {
-                        parent.child(div().pt_0p5().min_h_6().child(self.render_message_content(
-                            message_id,
-                            rendered_message,
-                            has_tool_uses,
-                            workspace.clone(),
-                            window,
-                            cx,
-                        )))
-                    })
                    .into_any_element()
            }
        });
@@ -2002,7 +1970,6 @@ impl ActiveThread {
                            h_flex()
                                .p_2p5()
                                .gap_1()
-                                .items_end()
                                .children(message_content)
                                .when_some(editing_message_state, |this, state| {
                                    let focus_handle = state.editor.focus_handle(cx).clone();
@@ -2016,7 +1983,6 @@ impl ActiveThread {
                                                )
                                                .shape(ui::IconButtonShape::Square)
                                                .icon_color(Color::Error)
-                                                .icon_size(IconSize::Small)
                                                .tooltip({
                                                    let focus_handle = focus_handle.clone();
                                                    move |window, cx| {
@@ -2034,12 +2000,11 @@ impl ActiveThread {
                                            .child(
                                                IconButton::new(
                                                    "confirm-edit-message",
-                                                    IconName::Return,
+                                                    IconName::Check,
                                                )
                                                .disabled(state.editor.read(cx).is_empty(cx))
                                                .shape(ui::IconButtonShape::Square)
-                                                .icon_color(Color::Muted)
-                                                .icon_size(IconSize::Small)
+                                                .icon_color(Color::Success)
                                                .tooltip({
                                                    let focus_handle = focus_handle.clone();
                                                    move |window, cx| {
@@ -2059,6 +2024,9 @@ impl ActiveThread {
                                    )
                                }),
                        )
+                        .when(editing_message_state.is_none(), |this| {
+                            this.tooltip(Tooltip::text("Click To Edit"))
+                        })
                        .on_click(cx.listener({
                            let message_segments = message.segments.clone();
                            move |this, _, window, cx| {
@@ -2099,16 +2067,6 @@ impl ActiveThread {

        let panel_background = cx.theme().colors().panel_background;

-        let backdrop = div()
-            .id("backdrop")
-            .stop_mouse_events_except_scroll()
-            .absolute()
-            .inset_0()
-            .size_full()
-            .bg(panel_background)
-            .opacity(0.8)
-            .on_click(cx.listener(Self::handle_cancel_click));
-
        v_flex()
            .w_full()
            .map(|parent| {
@@ -2278,7 +2236,15 @@ impl ActiveThread {
            })
            .when(after_editing_message, |parent| {
                // Backdrop to dim out the whole thread below the editing user message
-                parent.relative().child(backdrop)
+                parent.relative().child(
+                    div()
+                        .stop_mouse_events_except_scroll()
+                        .absolute()
+                        .inset_0()
+                        .size_full()
+                        .bg(panel_background)
+                        .opacity(0.8),
+                )
            })
            .into_any()
    }
@@ -2388,17 +2354,39 @@ impl ActiveThread {
                                        }),
                                        transform: Some(Arc::new({
                                            let active_thread = cx.entity();
+                                            let editor_bg = cx.theme().colors().editor_background;
+
+                                            move |el, range, metadata, _, cx| {
+                                                let can_expand = metadata.line_count
+                                                    >= MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK;
+                                                if !can_expand {
+                                                    return el;
+                                                }

-                                            move |element, range, _, _, cx| {
                                                let is_expanded = active_thread
                                                    .read(cx)
                                                    .is_codeblock_expanded(message_id, range.start);
-
                                                if is_expanded {
-                                                    return element;
+                                                    return el;
                                                }

-                                                element
+                                                el.child(
+                                                    div()
+                                                        .absolute()
+                                                        .bottom_0()
+                                                        .left_0()
+                                                        .w_full()
+                                                        .h_1_4()
+                                                        .rounded_b_lg()
+                                                        .bg(linear_gradient(
+                                                            0.,
+                                                            linear_color_stop(editor_bg, 0.),
+                                                            linear_color_stop(
+                                                                editor_bg.opacity(0.),
+                                                                1.,
+                                                            ),
+                                                        )),
+                                                )
                                            }
                                        })),
                                    },
@@ -3400,21 +3388,16 @@ impl ActiveThread {
        self.expanded_code_blocks
            .get(&(message_id, ix))
            .copied()
-            .unwrap_or(true)
+            .unwrap_or(false)
    }

    pub fn toggle_codeblock_expanded(&mut self, message_id: MessageId, ix: usize) {
        let is_expanded = self
            .expanded_code_blocks
            .entry((message_id, ix))
-            .or_insert(true);
+            .or_insert(false);
        *is_expanded = !*is_expanded;
    }
-
-    pub fn scroll_to_bottom(&mut self, cx: &mut Context<Self>) {
-        self.list_state.reset(self.messages.len());
-        cx.notify();
-    }
 }

 pub enum ActiveThreadEvent {
@@ -3428,7 +3411,6 @@ impl Render for ActiveThread {
        v_flex()
            .size_full()
            .relative()
-            .bg(cx.theme().colors().panel_background)
            .on_mouse_move(cx.listener(|this, _, _, cx| {
                this.show_scrollbar = true;
                this.hide_scrollbar_later(cx);
@@ -3608,163 +3590,3 @@ fn open_editor_at_position(
        }
    })
 }
-
-#[cfg(test)]
-mod tests {
-    use assistant_tool::{ToolRegistry, ToolWorkingSet};
-    use editor::EditorSettings;
-    use fs::FakeFs;
-    use gpui::{AppContext, TestAppContext, VisualTestContext};
-    use language_model::{LanguageModel, fake_provider::FakeLanguageModel};
-    use project::Project;
-    use prompt_store::PromptBuilder;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::CollaboratorId;
-
-    use crate::{ContextLoadResult, thread_store};
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_agent_is_unfollowed_after_cancelling_completion(cx: &mut TestAppContext) {
-        init_test_settings(cx);
-
-        let project = create_test_project(
-            cx,
-            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
-        )
-        .await;
-
-        let (cx, _active_thread, workspace, thread, model) =
-            setup_test_environment(cx, project.clone()).await;
-
-        // Insert user message without any context (empty context vector)
-        thread.update(cx, |thread, cx| {
-            thread.insert_user_message(
-                "What is the best way to learn Rust?",
-                ContextLoadResult::default(),
-                None,
-                vec![],
-                cx,
-            );
-        });
-
-        // Stream response to user message
-        thread.update(cx, |thread, cx| {
-            let request = thread.to_completion_request(model.clone(), cx);
-            thread.stream_completion(request, model, cx.active_window(), cx)
-        });
-        // Follow the agent
-        cx.update(|window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                workspace.follow(CollaboratorId::Agent, window, cx);
-            })
-        });
-        assert!(cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
-
-        // Cancel the current completion
-        thread.update(cx, |thread, cx| {
-            thread.cancel_last_completion(cx.active_window(), cx)
-        });
-
-        cx.executor().run_until_parked();
-
-        // No longer following the agent
-        assert!(!cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
-    }
-
-    fn init_test_settings(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-            AssistantSettings::register(cx);
-            prompt_store::init(cx);
-            thread_store::init(cx);
-            workspace::init_settings(cx);
-            language_model::init_settings(cx);
-            ThemeSettings::register(cx);
-            EditorSettings::register(cx);
-            ToolRegistry::default_global(cx);
-        });
-    }
-
-    // Helper to create a test project with test files
-    async fn create_test_project(
-        cx: &mut TestAppContext,
-        files: serde_json::Value,
-    ) -> Entity<Project> {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/test"), files).await;
-        Project::test(fs, [path!("/test").as_ref()], cx).await
-    }
-
-    async fn setup_test_environment(
-        cx: &mut TestAppContext,
-        project: Entity<Project>,
-    ) -> (
-        &mut VisualTestContext,
-        Entity<ActiveThread>,
-        Entity<Workspace>,
-        Entity<Thread>,
-        Arc<dyn LanguageModel>,
-    ) {
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let thread_store = cx
-            .update(|_, cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    None,
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let text_thread_store = cx
-            .update(|_, cx| {
-                TextThreadStore::new(
-                    project.clone(),
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    Default::default(),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
-        let context_store =
-            cx.new(|_cx| ContextStore::new(project.downgrade(), Some(thread_store.downgrade())));
-
-        let model = FakeLanguageModel::default();
-        let model: Arc<dyn LanguageModel> = Arc::new(model);
-
-        let language_registry = LanguageRegistry::new(cx.executor());
-        let language_registry = Arc::new(language_registry);
-
-        let active_thread = cx.update(|window, cx| {
-            cx.new(|cx| {
-                ActiveThread::new(
-                    thread.clone(),
-                    thread_store.clone(),
-                    text_thread_store,
-                    context_store.clone(),
-                    language_registry.clone(),
-                    workspace.downgrade(),
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        (cx, active_thread, workspace, thread, model)
-    }
-}
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -85,7 +85,6 @@ actions!(
        KeepAll,
        Follow,
        ResetTrialUpsell,
-        ResetTrialEndUpsell,
    ]
 );

@@ -117,7 +116,6 @@ pub fn init(
    client: Arc<Client>,
    prompt_builder: Arc<PromptBuilder>,
    language_registry: Arc<LanguageRegistry>,
-    is_eval: bool,
    cx: &mut App,
 ) {
    AssistantSettings::register(cx);
@@ -125,11 +123,7 @@ pub fn init(

    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);
@@ -222,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);
--- a/crates/agent/src/agent_configuration.rs
+++ b/crates/agent/src/agent_configuration.rs
@@ -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()
@@ -332,8 +331,7 @@ impl AgentConfiguration {
            .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))
@@ -346,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| {
@@ -631,7 +630,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(
--- a/crates/agent/src/agent_configuration/configure_context_server_modal.rs
+++ b/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),
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -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 => {
--- a/crates/agent/src/agent_model_selector.rs
+++ b/crates/agent/src/agent_model_selector.rs
@@ -3,10 +3,10 @@ use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};

 use crate::Thread;
-use assistant_context_editor::language_model_selector::{
+use language_model::{ConfiguredModel, LanguageModelRegistry};
+use language_model_selector::{
    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
 };
-use language_model::{ConfiguredModel, LanguageModelRegistry};
 use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{PopoverMenuHandle, Tooltip, prelude::*};
--- a/crates/agent/src/agent_panel.rs
+++ b/crates/agent/src/agent_panel.rs
@@ -3,7 +3,8 @@ use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;

-use db::kvp::{Dismissable, KEY_VALUE_STORE};
+use db::kvp::KEY_VALUE_STORE;
+use markdown::Markdown;
 use serde::{Deserialize, Serialize};

 use anyhow::{Result, anyhow};
@@ -16,7 +17,6 @@ use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;

-use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use client::{UserStore, zed_urls};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
 use fs::Fs;
@@ -30,6 +30,7 @@ use language::LanguageRegistry;
 use language_model::{
    LanguageModelProviderTosView, LanguageModelRegistry, RequestUsage, ZED_CLOUD_PROVIDER_ID,
 };
+use language_model_selector::ToggleModelSelector;
 use project::{Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use proto::Plan;
@@ -65,8 +66,8 @@ use crate::ui::AgentOnboardingModal;
 use crate::{
    AddContextServer, AgentDiffPane, ContextStore, DeleteRecentlyOpenThread, ExpandMessageEditor,
    Follow, InlineAssistant, NewTextThread, NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff,
-    OpenHistory, ResetTrialEndUpsell, ResetTrialUpsell, TextThreadStore, ThreadEvent,
-    ToggleContextPicker, ToggleNavigationMenu, ToggleOptionsMenu,
+    OpenHistory, ResetTrialUpsell, TextThreadStore, ThreadEvent, ToggleContextPicker,
+    ToggleNavigationMenu, ToggleOptionsMenu,
 };

 const AGENT_PANEL_KEY: &str = "agent_panel";
@@ -156,10 +157,7 @@ pub fn init(cx: &mut App) {
                    window.refresh();
                })
                .register_action(|_workspace, _: &ResetTrialUpsell, _window, cx| {
-                    Upsell::set_dismissed(false, cx);
-                })
-                .register_action(|_workspace, _: &ResetTrialEndUpsell, _window, cx| {
-                    TrialEndUpsell::set_dismissed(false, cx);
+                    set_trial_upsell_dismissed(false, cx);
                });
        },
    )
@@ -369,7 +367,8 @@ pub struct AgentPanel {
    height: Option<Pixels>,
    zoomed: bool,
    pending_serialization: Option<Task<Result<()>>>,
-    hide_upsell: bool,
+    hide_trial_upsell: bool,
+    _trial_markdown: Entity<Markdown>,
 }

 impl AgentPanel {
@@ -568,15 +567,6 @@ impl AgentPanel {
                        menu = menu.header("Recently Opened");

                        for entry in recently_opened.iter() {
-                            if let RecentEntry::Context(context) = entry {
-                                if context.read(cx).path().is_none() {
-                                    log::error!(
-                                        "bug: text thread in recent history list was never saved"
-                                    );
-                                    continue;
-                                }
-                            }
-
                            let summary = entry.summary(cx);

                            menu = menu.entry_with_end_slot_on_hover(
@@ -674,6 +664,15 @@ impl AgentPanel {
            },
        );

+        let trial_markdown = cx.new(|cx| {
+            Markdown::new(
+                include_str!("trial_markdown.md").into(),
+                Some(language_registry.clone()),
+                None,
+                cx,
+            )
+        });
+
        Self {
            active_view,
            workspace,
@@ -710,7 +709,8 @@ impl AgentPanel {
            height: None,
            zoomed: false,
            pending_serialization: None,
-            hide_upsell: false,
+            hide_trial_upsell: false,
+            _trial_markdown: trial_markdown,
        }
    }

@@ -1200,7 +1200,12 @@ impl AgentPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
+        let Some(workspace) = self
+            .workspace
+            .upgrade()
+            .ok_or_else(|| anyhow!("workspace dropped"))
+            .log_err()
+        else {
            return;
        };

@@ -1285,26 +1290,14 @@ impl AgentPanel {
        let new_is_history = matches!(new_view, ActiveView::History);

        match &self.active_view {
-            ActiveView::Thread { thread, .. } => {
+            ActiveView::Thread { thread, .. } => self.history_store.update(cx, |store, cx| {
                if let Some(thread) = thread.upgrade() {
                    if thread.read(cx).is_empty() {
                        let id = thread.read(cx).id().clone();
-                        self.history_store.update(cx, |store, cx| {
-                            store.remove_recently_opened_thread(id, cx);
-                        });
+                        store.remove_recently_opened_thread(id, cx);
                    }
                }
-            }
-            ActiveView::PromptEditor { context_editor, .. } => {
-                let context = context_editor.read(cx).context();
-                // When switching away from an unsaved text thread, delete its entry.
-                if context.read(cx).path().is_none() {
-                    let context = context.clone();
-                    self.history_store.update(cx, |store, cx| {
-                        store.remove_recently_opened_entry(&RecentEntry::Context(context), cx);
-                    });
-                }
-            }
+            }),
            _ => {}
        }

@@ -1918,23 +1911,12 @@ impl AgentPanel {
        }
    }

-    fn should_render_trial_end_upsell(&self, cx: &mut Context<Self>) -> bool {
-        if TrialEndUpsell::dismissed() {
-            return false;
-        }
-
-        let plan = self.user_store.read(cx).current_plan();
-        let has_previous_trial = self.user_store.read(cx).trial_started_at().is_some();
-
-        matches!(plan, Some(Plan::Free)) && has_previous_trial
-    }
-
    fn should_render_upsell(&self, cx: &mut Context<Self>) -> bool {
        if !matches!(self.active_view, ActiveView::Thread { .. }) {
            return false;
        }

-        if self.hide_upsell || Upsell::dismissed() {
+        if self.hide_trial_upsell || dismissed_trial_upsell() {
            return false;
        }

@@ -1964,7 +1946,7 @@ impl AgentPanel {
        true
    }

-    fn render_upsell(
+    fn render_trial_upsell(
        &self,
        _window: &mut Window,
        cx: &mut Context<Self>,
@@ -1973,14 +1955,6 @@ impl AgentPanel {
            return None;
        }

-        if self.user_store.read(cx).current_user_account_too_young() {
-            Some(self.render_young_account_upsell(cx).into_any_element())
-        } else {
-            Some(self.render_trial_upsell(cx).into_any_element())
-        }
-    }
-
-    fn render_young_account_upsell(&self, cx: &mut Context<Self>) -> impl IntoElement {
        let checkbox = CheckboxWithLabel::new(
            "dont-show-again",
            Label::new("Don't show again").color(Color::Muted),
@@ -1988,178 +1962,125 @@ impl AgentPanel {
            move |toggle_state, _window, cx| {
                let toggle_state_bool = toggle_state.selected();

-                Upsell::set_dismissed(toggle_state_bool, cx);
+                set_trial_upsell_dismissed(toggle_state_bool, cx);
            },
        );

-        let contents = div()
-            .size_full()
-            .gap_2()
-            .flex()
-            .flex_col()
-            .child(Headline::new("Build better with Zed Pro").size(HeadlineSize::Small))
-            .child(
-                Label::new("Your GitHub account was created less than 30 days ago, so we can't offer you a free trial.")
-                    .size(LabelSize::Small),
-            )
-            .child(
-                Label::new(
-                    "Use your own API keys, upgrade to Zed Pro or send an email to billing-support@zed.dev.",
-                )
-                .color(Color::Muted),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .px_neg_1()
-                    .justify_between()
-                    .items_center()
-                    .child(h_flex().items_center().gap_1().child(checkbox))
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Button::new("dismiss-button", "Not Now")
-                                    .style(ButtonStyle::Transparent)
-                                    .color(Color::Muted)
-                                    .on_click({
-                                        let agent_panel = cx.entity();
-                                        move |_, _, cx| {
-                                            agent_panel.update(cx, |this, cx| {
-                                                this.hide_upsell = true;
-                                                cx.notify();
-                                            });
-                                        }
-                                    }),
-                            )
-                            .child(
-                                Button::new("cta-button", "Upgrade to Zed Pro")
-                                    .style(ButtonStyle::Transparent)
-                                    .on_click(|_, _, cx| cx.open_url(&zed_urls::account_url(cx))),
-                            ),
-                    ),
-            );
-
-        self.render_upsell_container(cx, contents)
-    }
-
-    fn render_trial_upsell(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let checkbox = CheckboxWithLabel::new(
-            "dont-show-again",
-            Label::new("Don't show again").color(Color::Muted),
-            ToggleState::Unselected,
-            move |toggle_state, _window, cx| {
-                let toggle_state_bool = toggle_state.selected();
-
-                Upsell::set_dismissed(toggle_state_bool, cx);
-            },
-        );
-
-        let contents = div()
-            .size_full()
-            .gap_2()
-            .flex()
-            .flex_col()
-            .child(Headline::new("Build better with Zed Pro").size(HeadlineSize::Small))
-            .child(
-                Label::new("Try Zed Pro for free for 14 days - no credit card required.")
-                    .size(LabelSize::Small),
-            )
-            .child(
-                Label::new(
-                    "Use your own API keys or enable usage-based billing once you hit the cap.",
-                )
-                .color(Color::Muted),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .px_neg_1()
-                    .justify_between()
-                    .items_center()
-                    .child(h_flex().items_center().gap_1().child(checkbox))
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Button::new("dismiss-button", "Not Now")
-                                    .style(ButtonStyle::Transparent)
-                                    .color(Color::Muted)
-                                    .on_click({
-                                        let agent_panel = cx.entity();
-                                        move |_, _, cx| {
-                                            agent_panel.update(cx, |this, cx| {
-                                                this.hide_upsell = true;
-                                                cx.notify();
-                                            });
-                                        }
-                                    }),
-                            )
-                            .child(
-                                Button::new("cta-button", "Start Trial")
-                                    .style(ButtonStyle::Transparent)
-                                    .on_click(|_, _, cx| cx.open_url(&zed_urls::account_url(cx))),
-                            ),
-                    ),
-            );
-
-        self.render_upsell_container(cx, contents)
-    }
-
-    fn render_trial_end_upsell(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        if !self.should_render_trial_end_upsell(cx) {
-            return None;
-        }
-
        Some(
-            self.render_upsell_container(
-                cx,
-                div()
-                    .size_full()
-                    .gap_2()
-                    .flex()
-                    .flex_col()
+            div().p_2().child(
+                v_flex()
+                    .w_full()
+                    .elevation_2(cx)
+                    .rounded(px(8.))
+                    .bg(cx.theme().colors().background.alpha(0.5))
+                    .p(px(3.))
+
                    .child(
-                        Headline::new("Your Zed Pro trial has expired.").size(HeadlineSize::Small),
-                    )
-                    .child(
-                        Label::new("You've been automatically reset to the free plan.")
-                            .size(LabelSize::Small),
-                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .px_neg_1()
-                            .justify_between()
-                            .items_center()
-                            .child(div())
+                        div()
+                            .gap_2()
+                            .flex()
+                            .flex_col()
+                            .size_full()
+                            .border_1()
+                            .rounded(px(5.))
+                            .border_color(cx.theme().colors().text.alpha(0.1))
+                            .overflow_hidden()
+                            .relative()
+                            .bg(cx.theme().colors().panel_background)
+                            .px_4()
+                            .py_3()
+                            .child(
+                                div()
+                                    .absolute()
+                                    .top_0()
+                                    .right(px(-1.0))
+                                    .w(px(441.))
+                                    .h(px(167.))
+                                    .child(
+                                    Vector::new(VectorName::Grid, rems_from_px(441.), rems_from_px(167.)).color(ui::Color::Custom(cx.theme().colors().text.alpha(0.1)))
+                                )
+                            )
+                            .child(
+                                div()
+                                    .absolute()
+                                    .top(px(-8.0))
+                                    .right_0()
+                                    .w(px(400.))
+                                    .h(px(92.))
+                                    .child(
+                                    Vector::new(VectorName::AiGrid, rems_from_px(400.), rems_from_px(92.)).color(ui::Color::Custom(cx.theme().colors().text.alpha(0.32)))
+                                )
+                            )
+                            // .child(
+                            //     div()
+                            //         .absolute()
+                            //         .top_0()
+                            //         .right(px(360.))
+                            //         .size(px(401.))
+                            //         .overflow_hidden()
+                            //         .bg(cx.theme().colors().panel_background)
+                            // )
+                            .child(
+                                div()
+                                    .absolute()
+                                    .top_0()
+                                    .right_0()
+                                    .w(px(660.))
+                                    .h(px(401.))
+                                    .overflow_hidden()
+                                    .bg(linear_gradient(
+                                        75.,
+                                        linear_color_stop(cx.theme().colors().panel_background.alpha(0.01), 1.0),
+                                        linear_color_stop(cx.theme().colors().panel_background, 0.45),
+                                    ))
+                            )
+                            .child(Headline::new("Build better with Zed Pro").size(HeadlineSize::Small))
+                            .child(Label::new("Try Zed Pro for free for 14 days - no credit card required.").size(LabelSize::Small))
+                            .child(Label::new("Use your own API keys or enable usage-based billing once you hit the cap.").color(Color::Muted))
                            .child(
                                h_flex()
-                                    .gap_2()
+                                    .w_full()
+                                    .px_neg_1()
+                                    .justify_between()
+                                    .items_center()
+                                    .child(h_flex().items_center().gap_1().child(checkbox))
                                    .child(
-                                        Button::new("dismiss-button", "Stay on Free")
-                                            .style(ButtonStyle::Transparent)
-                                            .color(Color::Muted)
-                                            .on_click({
-                                                let agent_panel = cx.entity();
-                                                move |_, _, cx| {
-                                                    agent_panel.update(cx, |_this, cx| {
-                                                        TrialEndUpsell::set_dismissed(true, cx);
-                                                        cx.notify();
-                                                    });
-                                                }
-                                            }),
-                                    )
-                                    .child(
-                                        Button::new("cta-button", "Upgrade to Zed Pro")
-                                            .style(ButtonStyle::Transparent)
-                                            .on_click(|_, _, cx| {
-                                                cx.open_url(&zed_urls::account_url(cx))
-                                            }),
+                                        h_flex()
+                                            .gap_2()
+                                            .child(
+                                                Button::new("dismiss-button", "Not Now")
+                                                    .style(ButtonStyle::Transparent)
+                                                    .color(Color::Muted)
+                                                    .on_click({
+                                                        let agent_panel = cx.entity();
+                                                        move |_, _, cx| {
+                                                            agent_panel.update(
+                                                                cx,
+                                                                |this, cx| {
+                                                                    let hidden =
+                                                                        this.hide_trial_upsell;
+                                                                    println!("hidden: {}", hidden);
+                                                                    this.hide_trial_upsell = true;
+                                                                    let new_hidden =
+                                                                        this.hide_trial_upsell;
+                                                                    println!(
+                                                                        "new_hidden: {}",
+                                                                        new_hidden
+                                                                    );
+
+                                                                    cx.notify();
+                                                                },
+                                                            );
+                                                        }
+                                                    }),
+                                            )
+                                            .child(
+                                                Button::new("cta-button", "Start Trial")
+                                                    .style(ButtonStyle::Transparent)
+                                                    .on_click(|_, _, cx| {
+                                                        cx.open_url(&zed_urls::account_url(cx))
+                                                    }),
+                                            ),
                                    ),
                            ),
                    ),
@@ -2167,91 +2088,6 @@ impl AgentPanel {
        )
    }

-    fn render_upsell_container(&self, cx: &mut Context<Self>, content: Div) -> Div {
-        div().p_2().child(
-            v_flex()
-                .w_full()
-                .elevation_2(cx)
-                .rounded(px(8.))
-                .bg(cx.theme().colors().background.alpha(0.5))
-                .p(px(3.))
-                .child(
-                    div()
-                        .gap_2()
-                        .flex()
-                        .flex_col()
-                        .size_full()
-                        .border_1()
-                        .rounded(px(5.))
-                        .border_color(cx.theme().colors().text.alpha(0.1))
-                        .overflow_hidden()
-                        .relative()
-                        .bg(cx.theme().colors().panel_background)
-                        .px_4()
-                        .py_3()
-                        .child(
-                            div()
-                                .absolute()
-                                .top_0()
-                                .right(px(-1.0))
-                                .w(px(441.))
-                                .h(px(167.))
-                                .child(
-                                    Vector::new(
-                                        VectorName::Grid,
-                                        rems_from_px(441.),
-                                        rems_from_px(167.),
-                                    )
-                                    .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.1))),
-                                ),
-                        )
-                        .child(
-                            div()
-                                .absolute()
-                                .top(px(-8.0))
-                                .right_0()
-                                .w(px(400.))
-                                .h(px(92.))
-                                .child(
-                                    Vector::new(
-                                        VectorName::AiGrid,
-                                        rems_from_px(400.),
-                                        rems_from_px(92.),
-                                    )
-                                    .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.32))),
-                                ),
-                        )
-                        // .child(
-                        //     div()
-                        //         .absolute()
-                        //         .top_0()
-                        //         .right(px(360.))
-                        //         .size(px(401.))
-                        //         .overflow_hidden()
-                        //         .bg(cx.theme().colors().panel_background)
-                        // )
-                        .child(
-                            div()
-                                .absolute()
-                                .top_0()
-                                .right_0()
-                                .w(px(660.))
-                                .h(px(401.))
-                                .overflow_hidden()
-                                .bg(linear_gradient(
-                                    75.,
-                                    linear_color_stop(
-                                        cx.theme().colors().panel_background.alpha(0.01),
-                                        1.0,
-                                    ),
-                                    linear_color_stop(cx.theme().colors().panel_background, 0.45),
-                                )),
-                        )
-                        .child(content),
-                ),
-        )
-    }
-
    fn render_active_thread_or_empty_state(
        &self,
        window: &mut Window,
@@ -2299,7 +2135,6 @@ impl AgentPanel {

        v_flex()
            .size_full()
-            .bg(cx.theme().colors().panel_background)
            .when(recent_history.is_empty(), |this| {
                let configuration_error_ref = &configuration_error;
                this.child(
@@ -2969,8 +2804,7 @@ impl Render for AgentPanel {
            .on_action(cx.listener(Self::reset_font_size))
            .on_action(cx.listener(Self::toggle_zoom))
            .child(self.render_toolbar(window, cx))
-            .children(self.render_upsell(window, cx))
-            .children(self.render_trial_end_upsell(window, cx))
+            .children(self.render_trial_upsell(window, cx))
            .map(|parent| match &self.active_view {
                ActiveView::Thread { .. } => parent
                    .relative()
@@ -3158,14 +2992,25 @@ impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
    }
 }

-struct Upsell;
+const DISMISSED_TRIAL_UPSELL_KEY: &str = "dismissed-trial-upsell";

-impl Dismissable for Upsell {
-    const KEY: &'static str = "dismissed-trial-upsell";
+fn dismissed_trial_upsell() -> bool {
+    db::kvp::KEY_VALUE_STORE
+        .read_kvp(DISMISSED_TRIAL_UPSELL_KEY)
+        .log_err()
+        .map_or(false, |s| s.is_some())
 }

-struct TrialEndUpsell;
-
-impl Dismissable for TrialEndUpsell {
-    const KEY: &'static str = "dismissed-trial-end-upsell";
+fn set_trial_upsell_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_TRIAL_UPSELL_KEY.into(), "1".into())
+                .await
+        } else {
+            db::kvp::KEY_VALUE_STORE
+                .delete_kvp(DISMISSED_TRIAL_UPSELL_KEY.into())
+                .await
+        }
+    })
 }
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -1,7 +1,7 @@
 use crate::context::ContextLoadResult;
 use crate::inline_prompt_editor::CodegenStatus;
 use crate::{context::load_context, context_store::ContextStore};
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::HashSet;
@@ -419,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() {
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -942,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,
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -1213,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);

--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -2,7 +2,7 @@ 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};
@@ -142,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 {
--- a/crates/agent/src/context_strip.rs
+++ b/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;
        }
--- a/crates/agent/src/history_store.rs
+++ b/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,10 +140,7 @@ 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)
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -9,10 +9,8 @@ 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,
@@ -25,6 +23,7 @@ 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;
@@ -34,6 +33,7 @@ use ui::utils::WithRemSize;
 use ui::{
    CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip, prelude::*,
 };
+use util::ResultExt;
 use workspace::Workspace;

 pub struct PromptEditor<T> {
@@ -326,7 +326,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()
@@ -449,7 +451,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);
        }
    }
@@ -720,7 +722,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
@@ -732,7 +734,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(
@@ -972,7 +974,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();
@@ -1178,10 +1180,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 {
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -8,7 +8,6 @@ use crate::ui::{
    AnimatedLabel, MaxModeTooltip,
    preview::{AgentPreview, UsageCallout},
 };
-use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use assistant_settings::{AssistantSettings, CompletionMode};
 use buffer_diff::BufferDiff;
 use client::UserStore;
@@ -31,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;
@@ -401,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);
        }
    }
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -153,10 +153,13 @@ 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 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());

--- a/crates/agent/src/terminal_codegen.rs
+++ b/crates/agent/src/terminal_codegen.rs
@@ -193,8 +193,7 @@ impl TerminalTransaction {
        });
    }

-    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'], "")
    }
 }
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -191,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();
        }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -24,7 +24,7 @@ use language_model::{
    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
    LanguageModelToolResultContent, LanguageModelToolUseId, MessageContent,
    ModelRequestLimitReachedError, PaymentRequiredError, RequestUsage, Role, SelectedModel,
-    StopReason, TokenUsage, WrappedTextContent,
+    StopReason, TokenUsage,
 };
 use postage::stream::Stream as _;
 use project::Project;
@@ -214,7 +214,7 @@ pub struct GitState {
    pub diff: Option<String>,
 }

-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ThreadCheckpoint {
    message_id: MessageId,
    git_checkpoint: GitStoreCheckpoint,
@@ -881,10 +881,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)
-            | LanguageModelToolResultContent::WrappedText(WrappedTextContent { text, .. }) => {
-                Some(text)
-            }
+            LanguageModelToolResultContent::Text(str) => Some(str),
            LanguageModelToolResultContent::Image(_) => {
                // TODO: We should display image
                None
@@ -999,7 +996,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 {
@@ -1010,15 +1006,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
@@ -1630,7 +1617,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
@@ -1693,43 +1680,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| {
@@ -2555,12 +2505,8 @@ impl Thread {

                writeln!(markdown, "**\n")?;
                match &tool_result.content {
-                    LanguageModelToolResultContent::Text(text)
-                    | LanguageModelToolResultContent::WrappedText(WrappedTextContent {
-                        text,
-                        ..
-                    }) => {
-                        writeln!(markdown, "{text}")?;
+                    LanguageModelToolResultContent::Text(str) => {
+                        writeln!(markdown, "{}", str)?;
                    }
                    LanguageModelToolResultContent::Image(image) => {
                        writeln!(markdown, "![Image](data:base64,{})", image.source)?;
@@ -2637,7 +2583,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()
@@ -2851,8 +2797,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;
@@ -3163,8 +3108,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;
--- a/crates/agent/src/thread_history.rs
+++ b/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();
    }

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -419,7 +419,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| {
@@ -699,14 +699,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
+            )),
        }
    }
 }
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -425,17 +425,16 @@ impl ToolUseState {

                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);
+                        let truncated = truncate_lines_to_byte_limit(&text, tool_output_limit);
+
+                        LanguageModelToolResultContent::Text(
                            format!(
                                "Tool result too long. The first {} bytes:\n\n{}",
                                truncated.len(),
                                truncated
                            )
-                        };
-                        LanguageModelToolResultContent::Text(text.into())
+                            .into(),
+                        )
                    }
                    ToolResultContent::Image(language_model_image) => {
                        if language_model_image.estimate_tokens() < tool_output_limit {
--- a/crates/agent/src/trial_markdown.md
+++ b/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.
--- a/crates/agent/src/ui/preview/agent_preview.rs
+++ b/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
--- a/crates/anthropic/src/anthropic.rs
+++ b/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()?)
 }

--- a/crates/askpass/src/askpass.rs
+++ b/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
--- a/crates/assets/src/assets.rs
+++ b/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 {
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -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
--- a/crates/assistant_context_editor/src/assistant_context_editor.rs
+++ b/crates/assistant_context_editor/src/assistant_context_editor.rs
@@ -2,7 +2,6 @@ mod context;
 mod context_editor;
 mod context_history;
 mod context_store;
-pub mod language_model_selector;
 mod slash_command;
 mod slash_command_picker;

--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod context_tests;

-use anyhow::{Context as _, Result, bail};
+use anyhow::{Context as _, Result, anyhow, bail};
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{
    SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
@@ -2204,7 +2204,6 @@ impl AssistantContext {
                            StopReason::ToolUse => {}
                            StopReason::EndTurn => {}
                            StopReason::MaxTokens => {}
-                            StopReason::Refusal => {}
                        }
                    }
                })
@@ -3012,7 +3011,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 => {
@@ -3033,9 +3032,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")),
        }
    }

--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -1,6 +1,3 @@
-use crate::language_model_selector::{
-    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
-};
 use anyhow::Result;
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
@@ -39,6 +36,9 @@ use language_model::{
    LanguageModelImage, LanguageModelProvider, LanguageModelProviderTosView, LanguageModelRegistry,
    Role,
 };
+use language_model_selector::{
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
+};
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
 use project::{Project, Worktree};
@@ -3044,7 +3044,7 @@ fn invoked_slash_command_fold_placeholder(
                .gap_2()
                .bg(cx.theme().colors().surface_background)
                .rounded_sm()
-                .child(Label::new(format!("/{}", command.name)))
+                .child(Label::new(format!("/{}", command.name.clone())))
                .map(|parent| match &command.status {
                    InvokedSlashCommandStatus::Running(_) => {
                        parent.child(Icon::new(IconName::ArrowCircle).with_animation(
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/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) {
--- a/crates/assistant_settings/Cargo.toml
+++ b/crates/assistant_settings/Cargo.toml
@@ -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
--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -10,7 +10,6 @@ use deepseek::Model as DeepseekModel;
 use gpui::{App, Pixels, SharedString};
 use language_model::{CloudModel, LanguageModel};
 use lmstudio::Model as LmStudioModel;
-use mistral::Model as MistralModel;
 use ollama::Model as OllamaModel;
 use schemars::{JsonSchema, schema::Schema};
 use serde::{Deserialize, Serialize};
@@ -72,11 +71,6 @@ pub enum AssistantProviderContentV1 {
        default_model: Option<DeepseekModel>,
        api_url: Option<String>,
    },
-    #[serde(rename = "mistral")]
-    Mistral {
-        default_model: Option<MistralModel>,
-        api_url: Option<String>,
-    },
 }

 #[derive(Default, Clone, Debug)]
@@ -100,7 +94,6 @@ pub struct AssistantSettings {
    pub single_file_review: bool,
    pub model_parameters: Vec<LanguageModelParameters>,
    pub preferred_completion_mode: CompletionMode,
-    pub enable_feedback: bool,
 }

 impl AssistantSettings {
@@ -255,12 +248,6 @@ impl AssistantSettingsContent {
                                    model: model.id().to_string(),
                                })
                            }
-                            AssistantProviderContentV1::Mistral { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "mistral".into(),
-                                    model: model.id().to_string(),
-                                })
-                            }
                        }),
                    inline_assistant_model: None,
                    commit_message_model: None,
@@ -274,7 +261,6 @@ impl AssistantSettingsContent {
                    single_file_review: None,
                    model_parameters: Vec::new(),
                    preferred_completion_mode: None,
-                    enable_feedback: None,
                },
                VersionedAssistantSettingsContent::V2(ref settings) => settings.clone(),
            },
@@ -305,7 +291,6 @@ impl AssistantSettingsContent {
                single_file_review: None,
                model_parameters: Vec::new(),
                preferred_completion_mode: None,
-                enable_feedback: None,
            },
            None => AssistantSettingsContentV2::default(),
        }
@@ -588,7 +573,6 @@ impl Default for VersionedAssistantSettingsContent {
            single_file_review: None,
            model_parameters: Vec::new(),
            preferred_completion_mode: None,
-            enable_feedback: None,
        })
    }
 }
@@ -663,10 +647,6 @@ pub struct AssistantSettingsContentV2 {
    ///
    /// Default: normal
    preferred_completion_mode: Option<CompletionMode>,
-    /// Whether to show thumb buttons for feedback in the agent panel.
-    ///
-    /// Default: true
-    enable_feedback: Option<bool>,
 }

 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
@@ -704,7 +684,7 @@ impl JsonSchema for LanguageModelProviderSetting {
        schemars::schema::SchemaObject {
            enum_values: Some(vec![
                "anthropic".into(),
-                "amazon-bedrock".into(),
+                "bedrock".into(),
                "google".into(),
                "lmstudio".into(),
                "ollama".into(),
@@ -712,7 +692,6 @@ impl JsonSchema for LanguageModelProviderSetting {
                "zed.dev".into(),
                "copilot_chat".into(),
                "deepseek".into(),
-                "mistral".into(),
            ]),
            ..Default::default()
        }
@@ -874,7 +853,6 @@ impl Settings for AssistantSettings {
                &mut settings.preferred_completion_mode,
                value.preferred_completion_mode,
            );
-            merge(&mut settings.enable_feedback, value.enable_feedback);

            settings
                .model_parameters
@@ -1011,7 +989,6 @@ mod tests {
                                notify_when_agent_waiting: None,
                                stream_edits: None,
                                single_file_review: None,
-                                enable_feedback: None,
                                model_parameters: Vec::new(),
                                preferred_completion_mode: None,
                            },
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/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;
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -35,6 +35,7 @@ rope.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 smol.workspace = true
+terminal_view.workspace = true
 text.workspace = true
 toml.workspace = true
 ui.workspace = true
--- a/crates/assistant_slash_commands/src/assistant_slash_commands.rs
+++ b/crates/assistant_slash_commands/src/assistant_slash_commands.rs
@@ -12,6 +12,11 @@ mod selection_command;
 mod streaming_example_command;
 mod symbols_command;
 mod tab_command;
+mod terminal_command;
+
+use gpui::App;
+use language::{CodeLabel, HighlightId};
+use ui::ActiveTheme as _;

 pub use crate::cargo_workspace_command::*;
 pub use crate::context_server_command::*;
@@ -27,5 +32,16 @@ pub use crate::selection_command::*;
 pub use crate::streaming_example_command::*;
 pub use crate::symbols_command::*;
 pub use crate::tab_command::*;
+pub use crate::terminal_command::*;

-use assistant_slash_command::create_label_for_command;
+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
+}
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_slash_command::{
    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
    SlashCommandOutputSection, SlashCommandResult,
@@ -84,7 +84,9 @@ impl SlashCommand for ContextServerSlashCommand {

        if let Some(server) = self.store.read(cx).get_running_server(&server_id) {
            cx.foreground_executor().spawn(async move {
-                let protocol = server.client().context("Context server not initialized")?;
+                let Some(protocol) = server.client() else {
+                    return Err(anyhow!("Context server not initialized"));
+                };

                let completion_result = protocol
                    .completion(
@@ -137,16 +139,21 @@ impl SlashCommand for ContextServerSlashCommand {
        let store = self.store.read(cx);
        if let Some(server) = store.get_running_server(&server_id) {
            cx.foreground_executor().spawn(async move {
-                let protocol = server.client().context("Context server not initialized")?;
+                let Some(protocol) = server.client() else {
+                    return Err(anyhow!("Context server not initialized"));
+                };
                let result = protocol.run_prompt(&prompt_name, prompt_args).await?;

-                anyhow::ensure!(
-                    result
-                        .messages
-                        .iter()
-                        .all(|msg| matches!(msg.role, context_server::types::Role::User)),
-                    "Prompt contains non-user roles, which is not supported"
-                );
+                // Check that there are only user roles
+                if result
+                    .messages
+                    .iter()
+                    .any(|msg| !matches!(msg.role, context_server::types::Role::User))
+                {
+                    return Err(anyhow!(
+                        "Prompt contains non-user roles, which is not supported"
+                    ));
+                }

                // Extract text from user messages into a single prompt string
                let mut prompt = result
@@ -185,7 +192,9 @@ impl SlashCommand for ContextServerSlashCommand {
 }

 fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String, String)> {
-    anyhow::ensure!(!arguments.is_empty(), "No arguments given");
+    if arguments.is_empty() {
+        return Err(anyhow!("No arguments given"));
+    }

    match &prompt.arguments {
        Some(args) if args.len() == 1 => {
@@ -193,16 +202,16 @@ fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String,
            let arg_value = arguments.join(" ");
            Ok((arg_name, arg_value))
        }
-        Some(_) => anyhow::bail!("Prompt must have exactly one argument"),
-        None => anyhow::bail!("Prompt has no arguments"),
+        Some(_) => Err(anyhow!("Prompt must have exactly one argument")),
+        None => Err(anyhow!("Prompt has no arguments")),
    }
 }

 fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<String, String>> {
    match &prompt.arguments {
-        Some(args) if args.len() > 1 => {
-            anyhow::bail!("Prompt has more than one argument, which is not supported");
-        }
+        Some(args) if args.len() > 1 => Err(anyhow!(
+            "Prompt has more than one argument, which is not supported"
+        )),
        Some(args) if args.len() == 1 => {
            if !arguments.is_empty() {
                let mut map = HashMap::default();
@@ -211,15 +220,15 @@ fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<Str
            } else if arguments.is_empty() && args[0].required == Some(false) {
                Ok(HashMap::default())
            } else {
-                anyhow::bail!("Prompt expects argument but none given");
+                Err(anyhow!("Prompt expects argument but none given"))
            }
        }
        Some(_) | None => {
-            anyhow::ensure!(
-                arguments.is_empty(),
-                "Prompt expects no arguments but some were given"
-            );
-            Ok(HashMap::default())
+            if arguments.is_empty() {
+                Ok(HashMap::default())
+            } else {
+                Err(anyhow!("Prompt expects no arguments but some were given"))
+            }
        }
    }
 }
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -118,7 +118,10 @@ impl SlashCommand for DeltaSlashCommand {
                }
            }

-            anyhow::ensure!(changes_detected, "no new changes detected");
+            if !changes_detected {
+                return Err(anyhow!("no new changes detected"));
+            }
+
            Ok(output.to_event_stream())
        })
    }
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
    SlashCommandResult,
@@ -189,7 +189,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
        window.spawn(cx, async move |_| {
            task.await?
                .map(|output| output.to_event_stream())
-                .context("No diagnostics found")
+                .ok_or_else(|| anyhow!("No diagnostics found"))
        })
    }
 }
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ b/crates/assistant_slash_commands/src/docs_command.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use std::time::Duration;

-use anyhow::{Context as _, Result, anyhow, bail};
+use anyhow::{Result, anyhow, bail};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
    SlashCommandResult,
@@ -52,16 +52,15 @@ impl DocsSlashCommand {
            .is_none()
        {
            let index_provider_deps = maybe!({
+                let workspace = workspace.clone().ok_or_else(|| anyhow!("no workspace"))?;
                let workspace = workspace
-                    .as_ref()
-                    .context("no workspace")?
                    .upgrade()
-                    .context("workspace dropped")?;
+                    .ok_or_else(|| anyhow!("workspace was dropped"))?;
                let project = workspace.read(cx).project().clone();
                let fs = project.read(cx).fs().clone();
                let cargo_workspace_root = Self::path_to_cargo_toml(project, cx)
                    .and_then(|path| path.parent().map(|path| path.to_path_buf()))
-                    .context("no Cargo workspace root found")?;
+                    .ok_or_else(|| anyhow!("no Cargo workspace root found"))?;

                anyhow::Ok((fs, cargo_workspace_root))
            });
@@ -79,11 +78,10 @@ impl DocsSlashCommand {
            .is_none()
        {
            let http_client = maybe!({
+                let workspace = workspace.ok_or_else(|| anyhow!("no workspace"))?;
                let workspace = workspace
-                    .as_ref()
-                    .context("no workspace")?
                    .upgrade()
-                    .context("workspace was dropped")?;
+                    .ok_or_else(|| anyhow!("workspace was dropped"))?;
                let project = workspace.read(cx).project().clone();
                anyhow::Ok(project.read(cx).client().http_client())
            });
@@ -176,7 +174,7 @@ impl SlashCommand for DocsSlashCommand {
        let args = DocsSlashCommandArgs::parse(arguments);
        let store = args
            .provider()
-            .context("no docs provider specified")
+            .ok_or_else(|| anyhow!("no docs provider specified"))
            .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
        cx.background_spawn(async move {
            fn build_completions(items: Vec<String>) -> Vec<ArgumentCompletion> {
@@ -289,7 +287,7 @@ impl SlashCommand for DocsSlashCommand {
        let task = cx.background_spawn({
            let store = args
                .provider()
-                .context("no docs provider specified")
+                .ok_or_else(|| anyhow!("no docs provider specified"))
                .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
            async move {
                let (provider, key) = match args.clone() {
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

-use anyhow::{Context as _, Result, anyhow, bail};
+use anyhow::{Context, Result, anyhow, bail};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
    SlashCommandResult,
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -230,10 +230,7 @@ fn collect_files(
        })
        .collect::<anyhow::Result<Vec<custom_path_matcher::PathMatcher>>>()
    else {
-        return futures::stream::once(async {
-            anyhow::bail!("invalid path");
-        })
-        .boxed();
+        return futures::stream::once(async { Err(anyhow!("invalid path")) }).boxed();
    };

    let project_handle = project.downgrade();
--- a/crates/assistant_slash_commands/src/terminal_command.rs
+++ b/crates/assistant_slash_commands/src/terminal_command.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

-use crate::{TerminalView, terminal_panel::TerminalPanel};
 use anyhow::Result;
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
@@ -9,10 +8,11 @@ use assistant_slash_command::{
 };
 use gpui::{App, Entity, Task, WeakEntity};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
+use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use ui::prelude::*;
 use workspace::{Workspace, dock::Panel};

-use assistant_slash_command::create_label_for_command;
+use super::create_label_for_command;

 pub struct TerminalSlashCommand;

--- a/crates/assistant_tool/src/outline.rs
+++ b/crates/assistant_tool/src/outline.rs
@@ -1,5 +1,5 @@
 use crate::ActionLog;
-use anyhow::{Context as _, Result};
+use anyhow::{Result, anyhow};
 use gpui::{AsyncApp, Entity};
 use language::{OutlineItem, ParseStatus};
 use project::Project;
@@ -22,7 +22,7 @@ pub async fn file_outline(
        let project_path = project.read_with(cx, |project, cx| {
            project
                .find_project_path(&path, cx)
-                .with_context(|| format!("Path {path} not found in project"))
+                .ok_or_else(|| anyhow!("Path {path} not found in project"))
        })??;

        project
@@ -41,9 +41,9 @@ pub async fn file_outline(
    }

    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let outline = snapshot
-        .outline(None)
-        .context("No outline information available for this file at path {path}")?;
+    let Some(outline) = snapshot.outline(None) else {
+        return Err(anyhow!("No outline information available for this file."));
+    };

    render_outline(
        outline
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -27,10 +27,12 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
        const UNSUPPORTED_KEYS: [&str; 4] = ["if", "then", "else", "$ref"];

        for key in UNSUPPORTED_KEYS {
-            anyhow::ensure!(
-                !obj.contains_key(key),
-                "Schema cannot be made compatible because it contains \"{key}\""
-            );
+            if obj.contains_key(key) {
+                return Err(anyhow::anyhow!(
+                    "Schema cannot be made compatible because it contains \"{}\" ",
+                    key
+                ));
+            }
        }

        const KEYS_TO_REMOVE: [&str; 5] = [
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -35,13 +35,13 @@ indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
+linkme.workspace = true
 log.workspace = true
 markdown.workspace = true
 open.workspace = true
 paths.workspace = true
 portable-pty.workspace = true
 project.workspace = true
-prompt_store.workspace = true
 regex.workspace = true
 rust-embed.workspace = true
 schemars.workspace = true
@@ -59,12 +59,11 @@ ui.workspace = true
 util.workspace = true
 web_search.workspace = true
 which.workspace = true
-workspace.workspace = true
 workspace-hack.workspace = true
+workspace.workspace = true
 zed_llm_client.workspace = true

 [dev-dependencies]
-lsp = { workspace = true, features = ["test-support"] }
 client = { workspace = true, features = ["test-support"] }
 clock = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::AnyWindowHandle;
 use gpui::{App, AppContext, Entity, Task};
@@ -107,13 +107,17 @@ impl Tool for CopyPathTool {
        });

        cx.background_spawn(async move {
-            let _ = copy_task.await.with_context(|| {
-                format!(
-                    "Copying {} to {}",
-                    input.source_path, input.destination_path
-                )
-            })?;
-            Ok(format!("Copied {} to {}", input.source_path, input.destination_path).into())
+            match copy_task.await {
+                Ok(_) => Ok(
+                    format!("Copied {} to {}", input.source_path, input.destination_path).into(),
+                ),
+                Err(err) => Err(anyhow!(
+                    "Failed to copy {} to {}: {}",
+                    input.source_path,
+                    input.destination_path,
+                    err
+                )),
+            }
        })
        .into()
    }
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::AnyWindowHandle;
 use gpui::{App, Entity, Task};
@@ -86,7 +86,7 @@ impl Tool for CreateDirectoryTool {
                    project.create_entry(project_path.clone(), true, cx)
                })?
                .await
-                .with_context(|| format!("Creating directory {destination_path}"))?;
+                .map_err(|err| anyhow!("Unable to create directory {destination_path}: {err}"))?;

            Ok(format!("Created directory {destination_path}").into())
        })
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
@@ -122,17 +122,19 @@ impl Tool for DeletePathTool {
                }
            }

-            let deletion_task = project
-                .update(cx, |project, cx| {
-                    project.delete_file(project_path, false, cx)
-                })?
-                .with_context(|| {
-                    format!("Couldn't delete {path_str} because that path isn't in this project.")
-                })?;
-            deletion_task
-                .await
-                .with_context(|| format!("Deleting {path_str}"))?;
-            Ok(format!("Deleted {path_str}").into())
+            let delete = project.update(cx, |project, cx| {
+                project.delete_file(project_path, false, cx)
+            })?;
+
+            match delete {
+                Some(deletion_task) => match deletion_task.await {
+                    Ok(()) => Ok(format!("Deleted {path_str}").into()),
+                    Err(err) => Err(anyhow!("Failed to delete {path_str}: {err}")),
+                },
+                None => Err(anyhow!(
+                    "Couldn't delete {path_str} because that path isn't in this project."
+                )),
+            }
        })
        .into()
    }
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -24,7 +24,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::{cmp, iter, mem, ops::Range, path::PathBuf, sync::Arc, task::Poll};
 use streaming_diff::{CharOperation, StreamingDiff};
-use util::debug_panic;

 #[derive(Serialize)]
 struct CreateFilePromptTemplate {
@@ -544,11 +543,6 @@ impl EditAgent {
                if last_message.content.is_empty() {
                    conversation.messages.pop();
                }
-            } else {
-                debug_panic!(
-                    "Last message must be an Assistant tool calling! Got {:?}",
-                    last_message.content
-                );
            }
        }

--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -3,9 +3,9 @@ use crate::{
    ReadFileToolInput,
    edit_file_tool::{EditFileMode, EditFileToolInput},
    grep_tool::GrepToolInput,
-    list_directory_tool::ListDirectoryToolInput,
 };
 use Role::*;
+use anyhow::anyhow;
 use assistant_tool::ToolRegistry;
 use client::{Client, UserStore};
 use collections::HashMap;
@@ -15,10 +15,9 @@ use gpui::{AppContext, TestAppContext};
 use indoc::{formatdoc, indoc};
 use language_model::{
    LanguageModelRegistry, LanguageModelRequestTool, LanguageModelToolResult,
-    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, SelectedModel,
+    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId,
 };
 use project::Project;
-use prompt_store::{ModelContext, ProjectContext, PromptBuilder, WorktreeContext};
 use rand::prelude::*;
 use reqwest_client::ReqwestClient;
 use serde_json::json;
@@ -26,7 +25,6 @@ use std::{
    cmp::Reverse,
    fmt::{self, Display},
    io::Write as _,
-    str::FromStr,
    sync::mpsc,
 };
 use util::path;
@@ -34,39 +32,21 @@ use util::path;
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_extract_handle_command_output() {
-    // Test how well agent generates multiple edit hunks.
-    //
-    // Model                       | Pass rate
-    // ----------------------------|----------
-    // claude-3.7-sonnet           |  0.98
-    // gemini-2.5-pro              |  0.86
-    // gemini-2.5-flash            |  0.11
-    // gpt-4.1                     |  1.00
-
    let input_file_path = "root/blame.rs";
    let input_file_content = include_str!("evals/fixtures/extract_handle_command_output/before.rs");
-    let possible_diffs = vec![
-        include_str!("evals/fixtures/extract_handle_command_output/possible-01.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-02.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-03.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-04.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-05.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-06.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-07.diff"),
-    ];
+    let output_file_content = include_str!("evals/fixtures/extract_handle_command_output/after.rs");
    let edit_description = "Extract `handle_command_output` method from `run_git_blame`.";
    eval(
        100,
-        0.7, // Taking the lower bar for Gemini
-        EvalInput::from_conversation(
-            vec![
+        0.95,
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(formatdoc! {"
                        Read the `{input_file_path}` file and extract a method in
                        the final stanza of `run_git_blame` to deal with command failures,
                        call it `handle_command_output` and take the std::process::Output as the only parameter.
-                        Do not document the method and do not add any comments.

                        Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
                    "})],
@@ -100,9 +80,11 @@ fn eval_extract_handle_command_output() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::assert_diff_any(possible_diffs),
-        ),
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::assert_eq(output_file_content),
+        },
    );
 }

@@ -116,8 +98,8 @@ fn eval_delete_run_git_blame() {
    eval(
        100,
        0.95,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(formatdoc! {"
@@ -154,9 +136,11 @@ fn eval_delete_run_git_blame() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::assert_eq(output_file_content),
-        ),
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::assert_eq(output_file_content),
+        },
    );
 }

@@ -169,8 +153,8 @@ fn eval_translate_doc_comments() {
    eval(
        200,
        1.,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(formatdoc! {"
@@ -207,9 +191,11 @@ fn eval_translate_doc_comments() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff("Doc comments were translated to Italian"),
-        ),
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff("Doc comments were translated to Italian"),
+        },
    );
 }

@@ -223,8 +209,8 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
    eval(
        100,
        0.95,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(formatdoc! {"
@@ -320,12 +306,14 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(indoc! {"
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff(indoc! {"
                - The compile_parser_to_wasm method has been changed to use wasi-sdk
                - ureq is used to download the SDK for current platform and architecture
            "}),
-        ),
+        },
    );
 }

@@ -336,10 +324,10 @@ fn eval_disable_cursor_blinking() {
    let input_file_content = include_str!("evals/fixtures/disable_cursor_blinking/before.rs");
    let edit_description = "Comment out the call to `BlinkManager::enable`";
    eval(
-        100,
+        200,
        0.95,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(User, [text("Let's research how to cursor blinking works.")]),
                message(
                    Assistant,
@@ -393,13 +381,15 @@ fn eval_disable_cursor_blinking() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(indoc! {"
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff(indoc! {"
                - Calls to BlinkManager in `observe_window_activation` were commented out
                - The call to `blink_manager.enable` above the call to show_cursor_names was commented out
                - All the edits have valid indentation
            "}),
-        ),
+        },
    );
 }

@@ -412,8 +402,8 @@ fn eval_from_pixels_constructor() {
    eval(
        100,
        0.95,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(indoc! {"
@@ -585,12 +575,14 @@ fn eval_from_pixels_constructor() {
                    )],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(indoc! {"
-                    - The diff contains a new `from_pixels` constructor
-                    - The diff contains new tests for the `from_pixels` constructor
-                "}),
-        ),
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff(indoc! {"
+                - The diff contains a new `from_pixels` constructor
+                - The diff contains new tests for the `from_pixels` constructor
+            "}),
+        },
    );
 }

@@ -598,13 +590,12 @@ fn eval_from_pixels_constructor() {
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_zode() {
    let input_file_path = "root/zode.py";
-    let input_content = None;
    let edit_description = "Create the main Zode CLI script";
    eval(
        200,
        1.,
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(User, [text(include_str!("evals/fixtures/zode/prompt.md"))]),
                message(
                    Assistant,
@@ -662,12 +653,14 @@ fn eval_zode() {
                    ],
                ),
            ],
-            input_content,
-            EvalAssertion::new(async move |sample, _, _cx| {
+            input_path: input_file_path.into(),
+            input_content: None,
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::new(async move |sample, _, _cx| {
                let invalid_starts = [' ', '`', '\n'];
                let mut message = String::new();
                for start in invalid_starts {
-                    if sample.text_after.starts_with(start) {
+                    if sample.text.starts_with(start) {
                        message.push_str(&format!("The sample starts with a {:?}\n", start));
                        break;
                    }
@@ -687,7 +680,7 @@ fn eval_zode() {
                    })
                }
            }),
-        ),
+        },
    );
 }

@@ -700,8 +693,8 @@ fn eval_add_overwrite_test() {
    eval(
        200,
        0.5, // TODO: make this eval better
-        EvalInput::from_conversation(
-            vec![
+        EvalInput {
+            conversation: vec![
                message(
                    User,
                    [text(indoc! {"
@@ -905,93 +898,13 @@ fn eval_add_overwrite_test() {
                    ],
                ),
            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff(
                "A new test for overwritten files was created, without changing any previous test",
            ),
-        ),
-    );
-}
-
-#[test]
-#[cfg_attr(not(feature = "eval"), ignore)]
-fn eval_create_empty_file() {
-    // Check that Edit Agent can create a file without writing its
-    // thoughts into it. This issue is not specific to empty files, but
-    // it's easier to reproduce with them.
-    //
-    //
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    // --------------------------------------------
-    //           Prompt version: 2025-05-21
-    // --------------------------------------------
-    //
-    //  claude-3.7-sonnet              |  1.00
-    //  gemini-2.5-pro-preview-03-25   |  1.00
-    //  gemini-2.5-flash-preview-04-17 |  1.00
-    //  gpt-4.1                        |  1.00
-    //
-    //
-    // TODO: gpt-4.1-mini errored 38 times:
-    // "data did not match any variant of untagged enum ResponseStreamResult"
-    //
-    let input_file_content = None;
-    let expected_output_content = String::new();
-    eval(
-        100,
-        0.99,
-        EvalInput::from_conversation(
-            vec![
-                message(User, [text("Create a second empty todo file ")]),
-                message(
-                    Assistant,
-                    [
-                        text(formatdoc! {"
-                        I'll help you create a second empty todo file.
-                        First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
-                        "}),
-                        tool_use(
-                            "toolu_01GAF8TtsgpjKxCr8fgQLDgR",
-                            "list_directory",
-                            ListDirectoryToolInput {
-                                path: "root".to_string(),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "toolu_01GAF8TtsgpjKxCr8fgQLDgR",
-                        "list_directory",
-                        "root/TODO\nroot/TODO2\nroot/new.txt\n",
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(formatdoc! {"
-                        I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
-                    "}),
-                        tool_use(
-                            "toolu_01Tb3iQ9griqSYMmVuykQPWU",
-                            "edit_file",
-                            EditFileToolInput {
-                                display_description: "Create empty TODO3 file".to_string(),
-                                mode: EditFileMode::Create,
-                                path: "root/TODO3".into(),
-                            },
-                        ),
-                    ],
-                ),
-            ],
-            input_file_content,
-            // Bad behavior is to write something like
-            // "I'll create an empty TODO3 file as requested."
-            EvalAssertion::assert_eq(expected_output_content),
-        ),
+        },
    );
 }

@@ -1050,50 +963,15 @@ fn tool_result(
 #[derive(Clone)]
 struct EvalInput {
    conversation: Vec<LanguageModelRequestMessage>,
-    edit_file_input: EditFileToolInput,
+    input_path: PathBuf,
    input_content: Option<String>,
+    edit_description: String,
    assertion: EvalAssertion,
 }

-impl EvalInput {
-    fn from_conversation(
-        conversation: Vec<LanguageModelRequestMessage>,
-        input_content: Option<String>,
-        assertion: EvalAssertion,
-    ) -> Self {
-        let msg = conversation.last().expect("Conversation must not be empty");
-        if msg.role != Role::Assistant {
-            panic!("Conversation must end with an assistant message");
-        }
-        let tool_use = msg
-            .content
-            .iter()
-            .flat_map(|content| match content {
-                MessageContent::ToolUse(tool_use) if tool_use.name == "edit_file".into() => {
-                    Some(tool_use)
-                }
-                _ => None,
-            })
-            .next()
-            .expect("Conversation must end with an edit_file tool use")
-            .clone();
-
-        let edit_file_input: EditFileToolInput =
-            serde_json::from_value(tool_use.input.clone()).unwrap();
-
-        EvalInput {
-            conversation,
-            edit_file_input,
-            input_content,
-            assertion,
-        }
-    }
-}
-
 #[derive(Clone)]
 struct EvalSample {
-    text_before: String,
-    text_after: String,
+    text: String,
    edit_output: EditAgentOutput,
    diff: String,
 }
@@ -1150,7 +1028,7 @@ impl EvalAssertion {
        let expected = expected.into();
        Self::new(async move |sample, _judge, _cx| {
            Ok(EvalAssertionOutcome {
-                score: if strip_empty_lines(&sample.text_after) == strip_empty_lines(&expected) {
+                score: if strip_empty_lines(&sample.text) == strip_empty_lines(&expected) {
                    100
                } else {
                    0
@@ -1160,22 +1038,6 @@ impl EvalAssertion {
        })
    }

-    fn assert_diff_any(expected_diffs: Vec<impl Into<String>>) -> Self {
-        let expected_diffs: Vec<String> = expected_diffs.into_iter().map(Into::into).collect();
-        Self::new(async move |sample, _judge, _cx| {
-            let matches = expected_diffs.iter().any(|possible_diff| {
-                let expected =
-                    language::apply_diff_patch(&sample.text_before, possible_diff).unwrap();
-                strip_empty_lines(&expected) == strip_empty_lines(&sample.text_after)
-            });
-
-            Ok(EvalAssertionOutcome {
-                score: if matches { 100 } else { 0 },
-                message: None,
-            })
-        })
-    }
-
    fn judge_diff(assertions: &'static str) -> Self {
        Self::new(async move |sample, judge, cx| {
            let prompt = DiffJudgeTemplate {
@@ -1214,7 +1076,10 @@ impl EvalAssertion {
                }
            }

-            anyhow::bail!("No score found in response. Raw output: {output}");
+            Err(anyhow!(
+                "No score found in response. Raw output: {}",
+                output
+            ))
        })
    }

@@ -1260,7 +1125,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
                if output.assertion.score < 80 {
                    failed_count += 1;
                    failed_evals
-                        .entry(output.sample.text_after.clone())
+                        .entry(output.sample.text.clone())
                        .or_insert(Vec::new())
                        .push(output);
                }
@@ -1351,7 +1216,7 @@ fn report_progress(evaluated_count: usize, failed_count: usize, iterations: usiz
        passed_count as f64 / evaluated_count as f64
    };
    print!(
-        "\r\x1b[KEvaluated {}/{} ({:.2}% passed)",
+        "\r\x1b[KEvaluated {}/{} ({:.2}%)",
        evaluated_count,
        iterations,
        passed_ratio * 100.0
@@ -1390,21 +1255,13 @@ impl EditAgentTest {

        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let agent_model = SelectedModel::from_str(
-            &std::env::var("ZED_AGENT_MODEL")
-                .unwrap_or("anthropic/claude-3-7-sonnet-latest".into()),
-        )
-        .unwrap();
-        let judge_model = SelectedModel::from_str(
-            &std::env::var("ZED_JUDGE_MODEL")
-                .unwrap_or("anthropic/claude-3-7-sonnet-latest".into()),
-        )
-        .unwrap();
        let (agent_model, judge_model) = cx
            .update(|cx| {
                cx.spawn(async move |cx| {
-                    let agent_model = Self::load_model(&agent_model, cx).await;
-                    let judge_model = Self::load_model(&judge_model, cx).await;
+                    let agent_model =
+                        Self::load_model("anthropic", "claude-3-7-sonnet-latest", cx).await;
+                    let judge_model =
+                        Self::load_model("anthropic", "claude-3-7-sonnet-latest", cx).await;
                    (agent_model.unwrap(), judge_model.unwrap())
                })
            })
@@ -1419,17 +1276,15 @@ impl EditAgentTest {
    }

    async fn load_model(
-        selected_model: &SelectedModel,
+        provider: &str,
+        id: &str,
        cx: &mut AsyncApp,
    ) -> Result<Arc<dyn LanguageModel>> {
        let (provider, model) = cx.update(|cx| {
            let models = LanguageModelRegistry::read_global(cx);
            let model = models
                .available_models(cx)
-                .find(|model| {
-                    model.provider_id() == selected_model.provider
-                        && model.id() == selected_model.model
-                })
+                .find(|model| model.provider_id().0 == provider && model.id().0 == id)
                .unwrap();
            let provider = models.provider(&model.provider_id()).unwrap();
            (provider, model)
@@ -1442,7 +1297,7 @@ impl EditAgentTest {
        let path = self
            .project
            .read_with(cx, |project, cx| {
-                project.find_project_path(eval.edit_file_input.path, cx)
+                project.find_project_path(eval.input_path, cx)
            })
            .unwrap();
        let buffer = self
@@ -1450,69 +1305,31 @@ impl EditAgentTest {
            .update(cx, |project, cx| project.open_buffer(path, cx))
            .await
            .unwrap();
-        let tools = cx.update(|cx| {
-            ToolRegistry::default_global(cx)
-                .tools()
-                .into_iter()
-                .filter_map(|tool| {
-                    let input_schema = tool
-                        .input_schema(self.agent.model.tool_input_format())
-                        .ok()?;
-                    Some(LanguageModelRequestTool {
-                        name: tool.name(),
-                        description: tool.description(),
-                        input_schema,
-                    })
-                })
-                .collect::<Vec<_>>()
-        });
-        let tool_names = tools
-            .iter()
-            .map(|tool| tool.name.clone())
-            .collect::<Vec<_>>();
-        let worktrees = vec![WorktreeContext {
-            root_name: "root".to_string(),
-            rules_file: None,
-        }];
-        let prompt_builder = PromptBuilder::new(None)?;
-        let project_context = ProjectContext::new(worktrees, Vec::default());
-        let system_prompt = prompt_builder.generate_assistant_system_prompt(
-            &project_context,
-            &ModelContext {
-                available_tools: tool_names,
-            },
-        )?;
-
-        let has_system_prompt = eval
-            .conversation
-            .first()
-            .map_or(false, |msg| msg.role == Role::System);
-        let messages = if has_system_prompt {
-            eval.conversation
-        } else {
-            [LanguageModelRequestMessage {
-                role: Role::System,
-                content: vec![MessageContent::Text(system_prompt)],
-                cache: true,
-            }]
-            .into_iter()
-            .chain(eval.conversation)
-            .collect::<Vec<_>>()
-        };
-
        let conversation = LanguageModelRequest {
-            messages,
-            tools,
+            messages: eval.conversation,
+            tools: cx.update(|cx| {
+                ToolRegistry::default_global(cx)
+                    .tools()
+                    .into_iter()
+                    .filter_map(|tool| {
+                        let input_schema = tool
+                            .input_schema(self.agent.model.tool_input_format())
+                            .ok()?;
+                        Some(LanguageModelRequestTool {
+                            name: tool.name(),
+                            description: tool.description(),
+                            input_schema,
+                        })
+                    })
+                    .collect()
+            }),
            ..Default::default()
        };
-
-        let edit_output = if matches!(eval.edit_file_input.mode, EditFileMode::Edit) {
-            if let Some(input_content) = eval.input_content.as_deref() {
-                buffer.update(cx, |buffer, cx| buffer.set_text(input_content, cx));
-            }
+        let edit_output = if let Some(input_content) = eval.input_content.as_deref() {
+            buffer.update(cx, |buffer, cx| buffer.set_text(input_content, cx));
            let (edit_output, _) = self.agent.edit(
                buffer.clone(),
-                eval.edit_file_input.display_description,
+                eval.edit_description,
                &conversation,
                &mut cx.to_async(),
            );
@@ -1520,7 +1337,7 @@ impl EditAgentTest {
        } else {
            let (edit_output, _) = self.agent.overwrite(
                buffer.clone(),
-                eval.edit_file_input.display_description,
+                eval.edit_description,
                &conversation,
                &mut cx.to_async(),
            );
@@ -1534,8 +1351,7 @@ impl EditAgentTest {
                eval.input_content.as_deref().unwrap_or_default(),
                &buffer_text,
            ),
-            text_before: eval.input_content.unwrap_or_default(),
-            text_after: buffer_text,
+            text: buffer_text,
        };
        let assertion = eval
            .assertion
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/delete_run_git_blame/after.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/delete_run_git_blame/after.rs
@@ -98,21 +98,21 @@ impl BlameEntry {
        let sha = parts
            .next()
            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
+            .ok_or_else(|| anyhow!("failed to parse sha"))?;

        let original_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse original line number"))?;
        let final_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let line_count = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let start_line = final_line_number.saturating_sub(1);
        let end_line = start_line + line_count;
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/delete_run_git_blame/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/delete_run_git_blame/before.rs
@@ -80,7 +80,7 @@ async fn run_git_blame(
        .stdout(Stdio::piped())
        .stderr(Stdio::piped())
        .spawn()
-        .context("starting git blame process")?;
+        .map_err(|e| anyhow!("Failed to start git blame process: {}", e))?;

    let stdin = child
        .stdin
@@ -92,7 +92,10 @@ async fn run_git_blame(
    }
    stdin.flush().await?;

-    let output = child.output().await.context("reading git blame output")?;
+    let output = child
+        .output()
+        .await
+        .map_err(|e| anyhow!("Failed to read git blame output: {}", e))?;

    if !output.status.success() {
        let stderr = String::from_utf8_lossy(&output.stderr);
@@ -100,7 +103,7 @@ async fn run_git_blame(
        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
            return Ok(String::new());
        }
-        anyhow::bail!("git blame process failed: {stderr}");
+        return Err(anyhow!("git blame process failed: {}", stderr));
    }

    Ok(String::from_utf8(output.stdout)?)
@@ -141,21 +144,21 @@ impl BlameEntry {
        let sha = parts
            .next()
            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
+            .ok_or_else(|| anyhow!("failed to parse sha"))?;

        let original_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse original line number"))?;
        let final_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let line_count = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let start_line = final_line_number.saturating_sub(1);
        let end_line = start_line + line_count;
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
@@ -1249,7 +1249,7 @@ pub struct ActiveDiagnosticGroup {
 }

 #[derive(Debug, PartialEq, Eq)]
-
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum ActiveDiagnostic {
    None,
    All,
@@ -5272,7 +5272,7 @@ impl Editor {
                task.await?;
            }

-            anyhow::Ok(())
+            Ok::<_, anyhow::Error>(())
        })
        .detach_and_log_err(cx);
    }
@@ -10369,8 +10369,8 @@ impl Editor {
                .map(|line| {
                    line.strip_prefix(&line_prefix)
                        .or_else(|| line.trim_start().strip_prefix(&line_prefix.trim_start()))
-                        .with_context(|| {
-                            format!("line did not start with prefix {line_prefix:?}: {line:?}")
+                        .ok_or_else(|| {
+                            anyhow!("line did not start with prefix {line_prefix:?}: {line:?}")
                        })
                })
                .collect::<Result<Vec<_>, _>>()
@@ -16944,7 +16944,7 @@ impl Editor {
            Err(err) => {
                let message = format!("Failed to copy permalink: {err}");

-                anyhow::Result::<()>::Err(err).log_err();
+                Err::<(), anyhow::Error>(err).log_err();

                if let Some(workspace) = workspace {
                    workspace
@@ -16999,7 +16999,7 @@ impl Editor {
            Err(err) => {
                let message = format!("Failed to open permalink: {err}");

-                anyhow::Result::<()>::Err(err).log_err();
+                Err::<(), anyhow::Error>(err).log_err();

                if let Some(workspace) = workspace {
                    workspace
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/after.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/after.rs
@@ -0,0 +1,378 @@
+use crate::commit::get_messages;
+use crate::{GitRemote, Oid};
+use anyhow::{Context as _, Result, anyhow};
+use collections::{HashMap, HashSet};
+use futures::AsyncWriteExt;
+use gpui::SharedString;
+use serde::{Deserialize, Serialize};
+use std::process::Stdio;
+use std::{ops::Range, path::Path};
+use text::Rope;
+use time::OffsetDateTime;
+use time::UtcOffset;
+use time::macros::format_description;
+
+pub use git2 as libgit;
+
+#[derive(Debug, Clone, Default)]
+pub struct Blame {
+    pub entries: Vec<BlameEntry>,
+    pub messages: HashMap<Oid, String>,
+    pub remote_url: Option<String>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct ParsedCommitMessage {
+    pub message: SharedString,
+    pub permalink: Option<url::Url>,
+    pub pull_request: Option<crate::hosting_provider::PullRequest>,
+    pub remote: Option<GitRemote>,
+}
+
+impl Blame {
+    pub async fn for_path(
+        git_binary: &Path,
+        working_directory: &Path,
+        path: &Path,
+        content: &Rope,
+        remote_url: Option<String>,
+    ) -> Result<Self> {
+        let output = run_git_blame(git_binary, working_directory, path, content).await?;
+        let mut entries = parse_git_blame(&output)?;
+        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
+
+        let mut unique_shas = HashSet::default();
+
+        for entry in entries.iter_mut() {
+            unique_shas.insert(entry.sha);
+        }
+
+        let shas = unique_shas.into_iter().collect::<Vec<_>>();
+        let messages = get_messages(working_directory, &shas)
+            .await
+            .context("failed to get commit messages")?;
+
+        Ok(Self {
+            entries,
+            messages,
+            remote_url,
+        })
+    }
+}
+
+const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
+const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
+
+async fn run_git_blame(
+    git_binary: &Path,
+    working_directory: &Path,
+    path: &Path,
+    contents: &Rope,
+) -> Result<String> {
+    let mut child = util::command::new_smol_command(git_binary)
+        .current_dir(working_directory)
+        .arg("blame")
+        .arg("--incremental")
+        .arg("--contents")
+        .arg("-")
+        .arg(path.as_os_str())
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .map_err(|e| anyhow!("Failed to start git blame process: {}", e))?;
+
+    let stdin = child
+        .stdin
+        .as_mut()
+        .context("failed to get pipe to stdin of git blame command")?;
+
+    for chunk in contents.chunks() {
+        stdin.write_all(chunk.as_bytes()).await?;
+    }
+    stdin.flush().await?;
+
+    let output = child
+        .output()
+        .await
+        .map_err(|e| anyhow!("Failed to read git blame output: {}", e))?;
+
+    handle_command_output(output)
+}
+
+fn handle_command_output(output: std::process::Output) -> Result<String> {
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let trimmed = stderr.trim();
+        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
+            return Ok(String::new());
+        }
+        return Err(anyhow!("git blame process failed: {}", stderr));
+    }
+
+    Ok(String::from_utf8(output.stdout)?)
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
+pub struct BlameEntry {
+    pub sha: Oid,
+
+    pub range: Range<u32>,
+
+    pub original_line_number: u32,
+
+    pub author: Option<String>,
+    pub author_mail: Option<String>,
+    pub author_time: Option<i64>,
+    pub author_tz: Option<String>,
+
+    pub committer_name: Option<String>,
+    pub committer_email: Option<String>,
+    pub committer_time: Option<i64>,
+    pub committer_tz: Option<String>,
+
+    pub summary: Option<String>,
+
+    pub previous: Option<String>,
+    pub filename: String,
+}
+
+impl BlameEntry {
+    // Returns a BlameEntry by parsing the first line of a `git blame --incremental`
+    // entry. The line MUST have this format:
+    //
+    //     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
+    fn new_from_blame_line(line: &str) -> Result<BlameEntry> {
+        let mut parts = line.split_whitespace();
+
+        let sha = parts
+            .next()
+            .and_then(|line| line.parse::<Oid>().ok())
+            .ok_or_else(|| anyhow!("failed to parse sha"))?;
+
+        let original_line_number = parts
+            .next()
+            .and_then(|line| line.parse::<u32>().ok())
+            .ok_or_else(|| anyhow!("Failed to parse original line number"))?;
+        let final_line_number = parts
+            .next()
+            .and_then(|line| line.parse::<u32>().ok())
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;
+
+        let line_count = parts
+            .next()
+            .and_then(|line| line.parse::<u32>().ok())
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;
+
+        let start_line = final_line_number.saturating_sub(1);
+        let end_line = start_line + line_count;
+        let range = start_line..end_line;
+
+        Ok(Self {
+            sha,
+            range,
+            original_line_number,
+            ..Default::default()
+        })
+    }
+
+    pub fn author_offset_date_time(&self) -> Result<time::OffsetDateTime> {
+        if let (Some(author_time), Some(author_tz)) = (self.author_time, &self.author_tz) {
+            let format = format_description!("[offset_hour][offset_minute]");
+            let offset = UtcOffset::parse(author_tz, &format)?;
+            let date_time_utc = OffsetDateTime::from_unix_timestamp(author_time)?;
+
+            Ok(date_time_utc.to_offset(offset))
+        } else {
+            // Directly return current time in UTC if there's no committer time or timezone
+            Ok(time::OffsetDateTime::now_utc())
+        }
+    }
+}
+
+// parse_git_blame parses the output of `git blame --incremental`, which returns
+// all the blame-entries for a given path incrementally, as it finds them.
+//
+// Each entry *always* starts with:
+//
+//     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
+//
+// Each entry *always* ends with:
+//
+//     filename <whitespace-quoted-filename-goes-here>
+//
+// Line numbers are 1-indexed.
+//
+// A `git blame --incremental` entry looks like this:
+//
+//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
+//    author Joe Schmoe
+//    author-mail <joe.schmoe@example.com>
+//    author-time 1709741400
+//    author-tz +0100
+//    committer Joe Schmoe
+//    committer-mail <joe.schmoe@example.com>
+//    committer-time 1709741400
+//    committer-tz +0100
+//    summary Joe's cool commit
+//    previous 486c2409237a2c627230589e567024a96751d475 index.js
+//    filename index.js
+//
+// If the entry has the same SHA as an entry that was already printed then no
+// signature information is printed:
+//
+//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
+//    previous 486c2409237a2c627230589e567024a96751d475 index.js
+//    filename index.js
+//
+// More about `--incremental` output: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-blame.html
+fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
+    let mut entries: Vec<BlameEntry> = Vec::new();
+    let mut index: HashMap<Oid, usize> = HashMap::default();
+
+    let mut current_entry: Option<BlameEntry> = None;
+
+    for line in output.lines() {
+        let mut done = false;
+
+        match &mut current_entry {
+            None => {
+                let mut new_entry = BlameEntry::new_from_blame_line(line)?;
+
+                if let Some(existing_entry) = index
+                    .get(&new_entry.sha)
+                    .and_then(|slot| entries.get(*slot))
+                {
+                    new_entry.author.clone_from(&existing_entry.author);
+                    new_entry
+                        .author_mail
+                        .clone_from(&existing_entry.author_mail);
+                    new_entry.author_time = existing_entry.author_time;
+                    new_entry.author_tz.clone_from(&existing_entry.author_tz);
+                    new_entry
+                        .committer_name
+                        .clone_from(&existing_entry.committer_name);
+                    new_entry
+                        .committer_email
+                        .clone_from(&existing_entry.committer_email);
+                    new_entry.committer_time = existing_entry.committer_time;
+                    new_entry
+                        .committer_tz
+                        .clone_from(&existing_entry.committer_tz);
+                    new_entry.summary.clone_from(&existing_entry.summary);
+                }
+
+                current_entry.replace(new_entry);
+            }
+            Some(entry) => {
+                let Some((key, value)) = line.split_once(' ') else {
+                    continue;
+                };
+                let is_committed = !entry.sha.is_zero();
+                match key {
+                    "filename" => {
+                        entry.filename = value.into();
+                        done = true;
+                    }
+                    "previous" => entry.previous = Some(value.into()),
+
+                    "summary" if is_committed => entry.summary = Some(value.into()),
+                    "author" if is_committed => entry.author = Some(value.into()),
+                    "author-mail" if is_committed => entry.author_mail = Some(value.into()),
+                    "author-time" if is_committed => {
+                        entry.author_time = Some(value.parse::<i64>()?)
+                    }
+                    "author-tz" if is_committed => entry.author_tz = Some(value.into()),
+
+                    "committer" if is_committed => entry.committer_name = Some(value.into()),
+                    "committer-mail" if is_committed => entry.committer_email = Some(value.into()),
+                    "committer-time" if is_committed => {
+                        entry.committer_time = Some(value.parse::<i64>()?)
+                    }
+                    "committer-tz" if is_committed => entry.committer_tz = Some(value.into()),
+                    _ => {}
+                }
+            }
+        };
+
+        if done {
+            if let Some(entry) = current_entry.take() {
+                index.insert(entry.sha, entries.len());
+
+                // We only want annotations that have a commit.
+                if !entry.sha.is_zero() {
+                    entries.push(entry);
+                }
+            }
+        }
+    }
+
+    Ok(entries)
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use super::BlameEntry;
+    use super::parse_git_blame;
+
+    fn read_test_data(filename: &str) -> String {
+        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        path.push("test_data");
+        path.push(filename);
+
+        std::fs::read_to_string(&path)
+            .unwrap_or_else(|_| panic!("Could not read test data at {:?}. Is it generated?", path))
+    }
+
+    fn assert_eq_golden(entries: &Vec<BlameEntry>, golden_filename: &str) {
+        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        path.push("test_data");
+        path.push("golden");
+        path.push(format!("{}.json", golden_filename));
+
+        let mut have_json =
+            serde_json::to_string_pretty(&entries).expect("could not serialize entries to JSON");
+        // We always want to save with a trailing newline.
+        have_json.push('\n');
+
+        let update = std::env::var("UPDATE_GOLDEN")
+            .map(|val| val.eq_ignore_ascii_case("true"))
+            .unwrap_or(false);
+
+        if update {
+            std::fs::create_dir_all(path.parent().unwrap())
+                .expect("could not create golden test data directory");
+            std::fs::write(&path, have_json).expect("could not write out golden data");
+        } else {
+            let want_json =
+                std::fs::read_to_string(&path).unwrap_or_else(|_| {
+                    panic!("could not read golden test data file at {:?}. Did you run the test with UPDATE_GOLDEN=true before?", path);
+                }).replace("\r\n", "\n");
+
+            pretty_assertions::assert_eq!(have_json, want_json, "wrong blame entries");
+        }
+    }
+
+    #[test]
+    fn test_parse_git_blame_not_committed() {
+        let output = read_test_data("blame_incremental_not_committed");
+        let entries = parse_git_blame(&output).unwrap();
+        assert_eq_golden(&entries, "blame_incremental_not_committed");
+    }
+
+    #[test]
+    fn test_parse_git_blame_simple() {
+        let output = read_test_data("blame_incremental_simple");
+        let entries = parse_git_blame(&output).unwrap();
+        assert_eq_golden(&entries, "blame_incremental_simple");
+    }
+
+    #[test]
+    fn test_parse_git_blame_complex() {
+        let output = read_test_data("blame_incremental_complex");
+        let entries = parse_git_blame(&output).unwrap();
+        assert_eq_golden(&entries, "blame_incremental_complex");
+    }
+}
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/before.rs
@@ -80,7 +80,7 @@ async fn run_git_blame(
        .stdout(Stdio::piped())
        .stderr(Stdio::piped())
        .spawn()
-        .context("starting git blame process")?;
+        .map_err(|e| anyhow!("Failed to start git blame process: {}", e))?;

    let stdin = child
        .stdin
@@ -92,7 +92,10 @@ async fn run_git_blame(
    }
    stdin.flush().await?;

-    let output = child.output().await.context("reading git blame output")?;
+    let output = child
+        .output()
+        .await
+        .map_err(|e| anyhow!("Failed to read git blame output: {}", e))?;

    if !output.status.success() {
        let stderr = String::from_utf8_lossy(&output.stderr);
@@ -100,7 +103,7 @@ async fn run_git_blame(
        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
            return Ok(String::new());
        }
-        anyhow::bail!("git blame process failed: {stderr}");
+        return Err(anyhow!("git blame process failed: {}", stderr));
    }

    Ok(String::from_utf8(output.stdout)?)
@@ -141,21 +144,21 @@ impl BlameEntry {
        let sha = parts
            .next()
            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
+            .ok_or_else(|| anyhow!("failed to parse sha"))?;

        let original_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse original line number"))?;
        let final_line_number = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let line_count = parts
            .next()
            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
+            .ok_or_else(|| anyhow!("Failed to parse final line number"))?;

        let start_line = final_line_number.saturating_sub(1);
        let end_line = start_line + line_count;
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-01.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-01.diff
@@ -1,11 +0,0 @@
-@@ -94,6 +94,10 @@
- 
-     let output = child.output().await.context("reading git blame output")?;
- 
-+    handle_command_output(output)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-02.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-02.diff
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-03.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-03.diff
@@ -1,11 +0,0 @@
-@@ -93,7 +93,10 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(output)
-+}
-
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-04.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-04.diff
@@ -1,24 +0,0 @@
-@@ -93,17 +93,20 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(&output)?;
-+    Ok(String::from_utf8(output.stdout)?)
-+}
-
-+fn handle_command_output(output: &std::process::Output) -> Result<()> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
-         if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-+            return Ok(());
-         }
-         anyhow::bail!("git blame process failed: {stderr}");
-     }
-
-    Ok(String::from_utf8(output.stdout)?)
-+    Ok(())
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-05.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-05.diff
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(&output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: &std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-06.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-06.diff
@@ -1,23 +0,0 @@
-@@ -93,7 +93,12 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(&output)?;
-
-+    Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: &std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
-@@ -102,8 +107,7 @@
-         }
-         anyhow::bail!("git blame process failed: {stderr}");
-     }
-
-    Ok(String::from_utf8(output.stdout)?)
-+    Ok(String::from_utf8_lossy(&output.stdout).into_owned())
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-07.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-07.diff
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-+            return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-08.diff
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-08.diff
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}")
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
@@ -20,7 +20,7 @@ use std::{

 #[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
 use anyhow::Error;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context, Result, anyhow};
 use etcetera::BaseStrategy as _;
 use fs4::fs_std::FileExt;
 use indoc::indoc;
@@ -875,13 +875,16 @@ impl Loader {

        FileExt::unlock(lock_file)?;
        fs::remove_file(lock_path)?;
-        anyhow::ensure!(
-            output.status.success(),
-            "Parser compilation failed.\nStdout: {}\nStderr: {}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(())
+
+        if output.status.success() {
+            Ok(())
+        } else {
+            Err(anyhow!(
+                "Parser compilation failed.\nStdout: {}\nStderr: {}",
+                String::from_utf8_lossy(&output.stdout),
+                String::from_utf8_lossy(&output.stderr)
+            ))
+        }
    }

    #[cfg(unix)]
@@ -938,13 +941,17 @@ impl Loader {
                        .map(|f| format!("  `{f}`"))
                        .collect::<Vec<_>>()
                        .join("\n");
-                    anyhow::bail!(format!(indoc! {"
-                        Missing required functions in the external scanner, parsing won't work without these!

-                        {missing}
+                    return Err(anyhow!(format!(
+                        indoc! {"
+                            Missing required functions in the external scanner, parsing won't work without these!

-                        You can read more about this at https://tree-sitter.github.io/tree-sitter/creating-parsers/4-external-scanners
-                    "}));
+                            {}
+
+                            You can read more about this at https://tree-sitter.github.io/tree-sitter/creating-parsers/4-external-scanners
+                        "},
+                        missing,
+                    )));
                }
            }
        }
@@ -1001,9 +1008,9 @@ impl Loader {
        {
            EmccSource::Podman
        } else {
-            anyhow::bail!(
+            return Err(anyhow!(
                "You must have either emcc, docker, or podman on your PATH to run this command"
-            );
+            ));
        };

        let mut command = match source {
@@ -1096,11 +1103,12 @@ impl Loader {
            .spawn()
            .with_context(|| "Failed to run emcc command")?
            .wait()?;
-        anyhow::ensure!(status.success(), "emcc command failed");
-        let source_path = src_path.join(output_name);
-        fs::rename(&source_path, &output_path).with_context(|| {
-            format!("failed to rename wasm output file from {source_path:?} to {output_path:?}")
-        })?;
+        if !status.success() {
+            return Err(anyhow!("emcc command failed"));
+        }
+
+        fs::rename(src_path.join(output_name), output_path)
+            .context("failed to rename wasm output file")?;

        Ok(())
    }
@@ -1177,8 +1185,11 @@ impl Loader {
                                    .map(|path| {
                                       let path = parser_path.join(path);
                                        // prevent p being above/outside of parser_path
-                                        anyhow::ensure!(path.starts_with(parser_path), "External file path {path:?} is outside of parser directory {parser_path:?}");
-                                        Ok(path)
+                                        if path.starts_with(parser_path) {
+                                            Ok(path)
+                                        } else {
+                                            Err(anyhow!("External file path {path:?} is outside of parser directory {parser_path:?}"))
+                                        }
                                    })
                                    .collect::<Result<Vec<_>>>()
                            }).transpose()?,
@@ -1313,8 +1324,11 @@ impl Loader {
        let name = GRAMMAR_NAME_REGEX
            .captures(&first_three_lines)
            .and_then(|c| c.get(1))
-            .with_context(|| {
-                format!("Failed to parse the language name from grammar.json at {grammar_path:?}")
+            .ok_or_else(|| {
+                anyhow!(
+                    "Failed to parse the language name from grammar.json at {}",
+                    grammar_path.display()
+                )
            })?;

        Ok(name.as_str().to_string())
@@ -1333,7 +1347,7 @@ impl Loader {
            {
                Ok(config.0)
            } else {
-                anyhow::bail!("Unknown scope '{scope}'")
+                Err(anyhow!("Unknown scope '{scope}'"))
            }
        } else if let Some((lang, _)) = self
            .language_configuration_for_file_name(path)
@@ -1357,7 +1371,7 @@ impl Loader {
        } else if let Some(lang) = self.language_configuration_for_first_line_regex(path)? {
            Ok(lang.0)
        } else {
-            anyhow::bail!("No language found");
+            Err(anyhow!("No language found"))
        }
    }

--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -3,15 +3,11 @@ use crate::{
    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent},
    schema::json_schema_for,
 };
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{
    ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolResultContent, ToolResultOutput,
    ToolUseStatus,
 };
-use language::language_settings::{self, FormatOnSave};
-use project::lsp_store::{FormatTrigger, LspFormatTarget};
-use std::collections::HashSet;
-
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
 use editor::{Editor, EditorMode, MultiBuffer, PathKey};
 use futures::StreamExt;
@@ -26,7 +22,7 @@ use language::{
 };
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use project::{Project, ProjectPath};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -42,7 +38,7 @@ use workspace::Workspace;

 pub struct EditFileTool;

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct EditFileToolInput {
    /// A one-line, user-friendly markdown description of the edit. This will be
    /// shown in the UI and also passed to another model to perform the edit.
@@ -90,7 +86,7 @@ pub struct EditFileToolInput {
    pub mode: EditFileMode,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "lowercase")]
 pub enum EditFileMode {
    Edit,
@@ -175,9 +171,12 @@ impl Tool for EditFileTool {
            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
        };

-        let project_path = match resolve_path(&input, project.clone(), cx) {
-            Ok(path) => path,
-            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
+            return Task::ready(Err(anyhow!(
+                "Path {} not found in project",
+                input.path.display()
+            )))
+            .into();
        };

        let card = window.and_then(|window| {
@@ -200,6 +199,20 @@ impl Tool for EditFileTool {
                })?
                .await?;

+            let exists = buffer.read_with(cx, |buffer, _| {
+                buffer
+                    .file()
+                    .as_ref()
+                    .map_or(false, |file| file.disk_state().exists())
+            })?;
+            let create_or_overwrite = match input.mode {
+                EditFileMode::Create | EditFileMode::Overwrite => true,
+                _ => false,
+            };
+            if !create_or_overwrite && !exists {
+                return Err(anyhow!("{} not found", input.path.display()));
+            }
+
            let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
            let old_text = cx
                .background_spawn({
@@ -208,15 +221,15 @@ impl Tool for EditFileTool {
                })
                .await;

-            let (output, mut events) = if matches!(input.mode, EditFileMode::Edit) {
-                edit_agent.edit(
+            let (output, mut events) = if create_or_overwrite {
+                edit_agent.overwrite(
                    buffer.clone(),
                    input.display_description.clone(),
                    &request,
                    cx,
                )
            } else {
-                edit_agent.overwrite(
+                edit_agent.edit(
                    buffer.clone(),
                    input.display_description.clone(),
                    &request,
@@ -253,40 +266,6 @@ impl Tool for EditFileTool {
            }
            let agent_output = output.await?;

-            // Format buffer if format_on_save is enabled, before saving.
-            // If any part of the formatting operation fails, log an error but
-            // don't block the completion of the edit tool's work.
-            let should_format = buffer
-                .read_with(cx, |buffer, cx| {
-                    let settings = language_settings::language_settings(
-                        buffer.language().map(|l| l.name()),
-                        buffer.file(),
-                        cx,
-                    );
-                    !matches!(settings.format_on_save, FormatOnSave::Off)
-                })
-                .log_err()
-                .unwrap_or(false);
-
-            if should_format {
-                let buffers = HashSet::from_iter([buffer.clone()]);
-
-                if let Some(format_task) = project
-                    .update(cx, move |project, cx| {
-                        project.format(
-                            buffers,
-                            LspFormatTarget::Buffers,
-                            false, // Don't push to history since the tool did it.
-                            FormatTrigger::Save,
-                            cx,
-                        )
-                    })
-                    .log_err()
-                {
-                    format_task.await.log_err();
-                }
-            }
-
            project
                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
                .await?;
@@ -317,15 +296,15 @@ impl Tool for EditFileTool {

            let input_path = input.path.display();
            if diff.is_empty() {
-                anyhow::ensure!(
-                    !hallucinated_old_text,
-                    formatdoc! {"
-                    Some edits were produced but none of them could be applied.
-                    Read the relevant sections of {input_path} again so that
-                    I can perform the requested edits.
-                "}
-                );
-                Ok("No edits were made.".to_string().into())
+                if hallucinated_old_text {
+                    Err(anyhow!(formatdoc! {"
+                        Some edits were produced but none of them could be applied.
+                        Read the relevant sections of {input_path} again so that
+                        I can perform the requested edits.
+                    "}))
+                } else {
+                    Ok("No edits were made.".to_string().into())
+                }
            } else {
                Ok(ToolResultOutput {
                    content: ToolResultContent::Text(format!(
@@ -370,71 +349,6 @@ impl Tool for EditFileTool {
    }
 }

-/// Validate that the file path is valid, meaning:
-///
-/// - For `edit` and `overwrite`, the path must point to an existing file.
-/// - For `create`, the file must not already exist, but it's parent dir must exist.
-fn resolve_path(
-    input: &EditFileToolInput,
-    project: Entity<Project>,
-    cx: &mut App,
-) -> Result<ProjectPath> {
-    let project = project.read(cx);
-
-    match input.mode {
-        EditFileMode::Edit | EditFileMode::Overwrite => {
-            let path = project
-                .find_project_path(&input.path, cx)
-                .context("Can't edit file: path not found")?;
-
-            let entry = project
-                .entry_for_path(&path, cx)
-                .context("Can't edit file: path not found")?;
-
-            anyhow::ensure!(entry.is_file(), "Can't edit file: path is a directory");
-            Ok(path)
-        }
-
-        EditFileMode::Create => {
-            if let Some(path) = project.find_project_path(&input.path, cx) {
-                anyhow::ensure!(
-                    project.entry_for_path(&path, cx).is_none(),
-                    "Can't create file: file already exists"
-                );
-            }
-
-            let parent_path = input
-                .path
-                .parent()
-                .context("Can't create file: incorrect path")?;
-
-            let parent_project_path = project.find_project_path(&parent_path, cx);
-
-            let parent_entry = parent_project_path
-                .as_ref()
-                .and_then(|path| project.entry_for_path(&path, cx))
-                .context("Can't create file: parent directory doesn't exist")?;
-
-            anyhow::ensure!(
-                parent_entry.is_dir(),
-                "Can't create file: parent is not a directory"
-            );
-
-            let file_name = input
-                .path
-                .file_name()
-                .context("Can't create file: invalid filename")?;
-
-            let new_file_path = parent_project_path.map(|parent| ProjectPath {
-                path: Arc::from(parent.path.join(file_name)),
-                ..parent
-            });
-
-            new_file_path.context("Can't create file")
-        }
-    }
-}
-
 pub struct EditFileToolCard {
    path: PathBuf,
    editor: Entity<Editor>,
@@ -486,7 +400,7 @@ impl EditFileToolCard {
            diff_task: None,
            preview_expanded: true,
            error_expanded: None,
-            full_height_expanded: true,
+            full_height_expanded: false,
            total_lines: None,
        }
    }
@@ -955,16 +869,11 @@ async fn build_buffer_diff(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use client::TelemetrySettings;
-    use fs::{FakeFs, Fs};
-    use gpui::{TestAppContext, UpdateGlobal};
-    use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher};
+    use fs::FakeFs;
+    use gpui::TestAppContext;
    use language_model::fake_provider::FakeLanguageModel;
-    use language_settings::{AllLanguageSettings, Formatter, FormatterList, SelectedFormatter};
-    use lsp;
    use serde_json::json;
    use settings::SettingsStore;
-    use std::sync::Arc;
    use util::path;

    #[gpui::test]
@@ -999,102 +908,10 @@ mod tests {
            .await;
        assert_eq!(
            result.unwrap_err().to_string(),
-            "Can't edit file: path not found"
+            "root/nonexistent_file.txt not found"
        );
    }

-    #[gpui::test]
-    async fn test_resolve_path_for_creating_file(cx: &mut TestAppContext) {
-        let mode = &EditFileMode::Create;
-
-        let result = test_resolve_path(mode, "root/new.txt", cx);
-        assert_resolved_path_eq(result.await, "new.txt");
-
-        let result = test_resolve_path(mode, "new.txt", cx);
-        assert_resolved_path_eq(result.await, "new.txt");
-
-        let result = test_resolve_path(mode, "dir/new.txt", cx);
-        assert_resolved_path_eq(result.await, "dir/new.txt");
-
-        let result = test_resolve_path(mode, "root/dir/subdir/existing.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't create file: file already exists"
-        );
-
-        let result = test_resolve_path(mode, "root/dir/nonexistent_dir/new.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't create file: parent directory doesn't exist"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_resolve_path_for_editing_file(cx: &mut TestAppContext) {
-        let mode = &EditFileMode::Edit;
-
-        let path_with_root = "root/dir/subdir/existing.txt";
-        let path_without_root = "dir/subdir/existing.txt";
-        let result = test_resolve_path(mode, path_with_root, cx);
-        assert_resolved_path_eq(result.await, path_without_root);
-
-        let result = test_resolve_path(mode, path_without_root, cx);
-        assert_resolved_path_eq(result.await, path_without_root);
-
-        let result = test_resolve_path(mode, "root/nonexistent.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't edit file: path not found"
-        );
-
-        let result = test_resolve_path(mode, "root/dir", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't edit file: path is a directory"
-        );
-    }
-
-    async fn test_resolve_path(
-        mode: &EditFileMode,
-        path: &str,
-        cx: &mut TestAppContext,
-    ) -> anyhow::Result<ProjectPath> {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "dir": {
-                    "subdir": {
-                        "existing.txt": "hello"
-                    }
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        let input = EditFileToolInput {
-            display_description: "Some edit".into(),
-            path: path.into(),
-            mode: mode.clone(),
-        };
-
-        let result = cx.update(|cx| resolve_path(&input, project, cx));
-        result
-    }
-
-    fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &str) {
-        let actual = path
-            .expect("Should return valid path")
-            .path
-            .to_str()
-            .unwrap()
-            .replace("\\", "/"); // Naive Windows paths normalization
-        assert_eq!(actual, expected);
-    }
-
    #[test]
    fn still_streaming_ui_text_with_path() {
        let input = json!({
@@ -1167,380 +984,7 @@ mod tests {
            let settings_store = SettingsStore::test(cx);
            cx.set_global(settings_store);
            language::init(cx);
-            TelemetrySettings::register(cx);
            Project::init_settings(cx);
        });
    }
-
-    #[gpui::test]
-    async fn test_remove_trailing_whitespace(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({"src": {}})).await;
-
-        // Create a simple file with trailing whitespace
-        fs.save(
-            path!("/root/src/main.rs").as_ref(),
-            &"initial content".into(),
-            LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-
-        // First, test with remove_trailing_whitespace_on_save enabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
-                    settings.defaults.remove_trailing_whitespace_on_save = Some(true);
-                });
-            });
-        });
-
-        const CONTENT_WITH_TRAILING_WHITESPACE: &str =
-            "fn main() {  \n    println!(\"Hello!\");  \n}\n";
-
-        // Have the model stream content that contains trailing whitespace
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = serde_json::to_value(EditFileToolInput {
-                    display_description: "Create main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                })
-                .unwrap();
-                Arc::new(EditFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            });
-
-            // Stream the content with trailing whitespace
-            cx.executor().run_until_parked();
-            model.stream_last_completion_response(CONTENT_WITH_TRAILING_WHITESPACE.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Read the file to verify trailing whitespace was removed automatically
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            fs.load(path!("/root/src/main.rs").as_ref())
-                .await
-                .unwrap()
-                .replace("\r\n", "\n"),
-            "fn main() {\n    println!(\"Hello!\");\n}\n",
-            "Trailing whitespace should be removed when remove_trailing_whitespace_on_save is enabled"
-        );
-
-        // Next, test with remove_trailing_whitespace_on_save disabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
-                    settings.defaults.remove_trailing_whitespace_on_save = Some(false);
-                });
-            });
-        });
-
-        // Stream edits again with trailing whitespace
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = serde_json::to_value(EditFileToolInput {
-                    display_description: "Update main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                })
-                .unwrap();
-                Arc::new(EditFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            });
-
-            // Stream the content with trailing whitespace
-            cx.executor().run_until_parked();
-            model.stream_last_completion_response(CONTENT_WITH_TRAILING_WHITESPACE.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Verify the file still has trailing whitespace
-        // Read the file again - it should still have trailing whitespace
-        let final_content = fs.load(path!("/root/src/main.rs").as_ref()).await.unwrap();
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            final_content.replace("\r\n", "\n"),
-            CONTENT_WITH_TRAILING_WHITESPACE,
-            "Trailing whitespace should remain when remove_trailing_whitespace_on_save is disabled"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_format_on_save(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({"src": {}})).await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Set up a Rust language with LSP formatting support
-        let rust_language = Arc::new(Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["rs".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        ));
-
-        // Register the language and fake LSP
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_language);
-
-        let mut fake_language_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        // Create the file
-        fs.save(
-            path!("/root/src/main.rs").as_ref(),
-            &"initial content".into(),
-            LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-
-        // Open the buffer to trigger LSP initialization
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/root/src/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Register the buffer with language servers
-        let _handle = project.update(cx, |project, cx| {
-            project.register_buffer_with_language_servers(&buffer, cx)
-        });
-
-        const UNFORMATTED_CONTENT: &str = "fn main() {println!(\"Hello!\");}\n";
-        const FORMATTED_CONTENT: &str =
-            "This file was formatted by the fake formatter in the test.\n";
-
-        // Get the fake language server and set up formatting handler
-        let fake_language_server = fake_language_servers.next().await.unwrap();
-        fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>({
-            |_, _| async move {
-                Ok(Some(vec![lsp::TextEdit {
-                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(1, 0)),
-                    new_text: FORMATTED_CONTENT.to_string(),
-                }]))
-            }
-        });
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let model = Arc::new(FakeLanguageModel::default());
-
-        // First, test with format_on_save enabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
-                    settings.defaults.format_on_save = Some(FormatOnSave::On);
-                    settings.defaults.formatter = Some(SelectedFormatter::Auto);
-                });
-            });
-        });
-
-        // Have the model stream unformatted content
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = serde_json::to_value(EditFileToolInput {
-                    display_description: "Create main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                })
-                .unwrap();
-                Arc::new(EditFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            });
-
-            // Stream the unformatted content
-            cx.executor().run_until_parked();
-            model.stream_last_completion_response(UNFORMATTED_CONTENT.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Read the file to verify it was formatted automatically
-        let new_content = fs.load(path!("/root/src/main.rs").as_ref()).await.unwrap();
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            new_content.replace("\r\n", "\n"),
-            FORMATTED_CONTENT,
-            "Code should be formatted when format_on_save is enabled"
-        );
-
-        // Next, test with format_on_save disabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
-                    settings.defaults.format_on_save = Some(FormatOnSave::Off);
-                });
-            });
-        });
-
-        // Stream unformatted edits again
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = serde_json::to_value(EditFileToolInput {
-                    display_description: "Update main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                })
-                .unwrap();
-                Arc::new(EditFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            });
-
-            // Stream the unformatted content
-            cx.executor().run_until_parked();
-            model.stream_last_completion_response(UNFORMATTED_CONTENT.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Verify the file is still unformatted
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            fs.load(path!("/root/src/main.rs").as_ref())
-                .await
-                .unwrap()
-                .replace("\r\n", "\n"),
-            UNFORMATTED_CONTENT,
-            "Code should remain unformatted when format_on_save is disabled"
-        );
-
-        // Finally, test with format_on_save set to a list
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
-                    settings.defaults.format_on_save = Some(FormatOnSave::List(FormatterList(
-                        vec![Formatter::LanguageServer { name: None }].into(),
-                    )));
-                });
-            });
-        });
-
-        // Stream unformatted edits again
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = serde_json::to_value(EditFileToolInput {
-                    display_description: "Update main function with list formatter".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                })
-                .unwrap();
-                Arc::new(EditFileTool)
-                    .run(
-                        input,
-                        Arc::default(),
-                        project.clone(),
-                        action_log.clone(),
-                        model.clone(),
-                        None,
-                        cx,
-                    )
-                    .output
-            });
-
-            // Stream the unformatted content
-            cx.executor().run_until_parked();
-            model.stream_last_completion_response(UNFORMATTED_CONTENT.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Read the file to verify it was formatted with the specified formatter
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            fs.load(path!("/root/src/main.rs").as_ref())
-                .await
-                .unwrap()
-                .replace("\r\n", "\n"),
-            FORMATTED_CONTENT,
-            "Code should be formatted when format_on_save is set to a list"
-        );
-    }
 }
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -109,7 +109,7 @@ impl Tool for GrepTool {
        let input = match serde_json::from_value::<GrepToolInput>(input) {
            Ok(input) => input,
            Err(error) => {
-                return Task::ready(Err(anyhow!("Failed to parse input: {error}"))).into();
+                return Task::ready(Err(anyhow!("Failed to parse input: {}", error))).into();
            }
        };

@@ -122,7 +122,7 @@ impl Tool for GrepTool {
        ) {
            Ok(matcher) => matcher,
            Err(error) => {
-                return Task::ready(Err(anyhow!("invalid include glob pattern: {error}"))).into();
+                return Task::ready(Err(anyhow!("invalid include glob pattern: {}", error))).into();
            }
        };

--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
@@ -117,10 +117,17 @@ impl Tool for MovePathTool {
        });

        cx.background_spawn(async move {
-            let _ = rename_task.await.with_context(|| {
-                format!("Moving {} to {}", input.source_path, input.destination_path)
-            })?;
-            Ok(format!("Moved {} to {}", input.source_path, input.destination_path).into())
+            match rename_task.await {
+                Ok(_) => {
+                    Ok(format!("Moved {} to {}", input.source_path, input.destination_path).into())
+                }
+                Err(err) => Err(anyhow!(
+                    "Failed to move {} to {}: {}",
+                    input.source_path,
+                    input.destination_path,
+                    err
+                )),
+            }
        })
        .into()
    }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use assistant_tool::{ToolResultContent, outline};
 use gpui::{AnyWindowHandle, App, Entity, Task};
@@ -129,7 +129,7 @@ impl Tool for ReadFileTool {
                let language_model_image = cx
                    .update(|cx| LanguageModelImage::from_image(image, cx))?
                    .await
-                    .context("processing image")?;
+                    .ok_or_else(|| anyhow!("Failed to process image"))?;

                Ok(ToolResultOutput {
                    content: ToolResultContent::Image(language_model_image),
@@ -152,7 +152,7 @@ impl Tool for ReadFileTool {
                    .as_ref()
                    .map_or(true, |file| !file.disk_state().exists())
            })? {
-                anyhow::bail!("{file_path} not found");
+                return Err(anyhow!("{} not found", file_path));
            }

            project.update(cx, |project, cx| {
--- a/crates/assistant_tools/src/templates/create_file_prompt.hbs
+++ b/crates/assistant_tools/src/templates/create_file_prompt.hbs
@@ -1,13 +1,12 @@
 You are an expert engineer and your task is to write a new file from scratch.

-You MUST respond directly with the file's content, without explanations, additional text or triple backticks.
-The text you output will be saved verbatim as the content of the file.
-Tool calls have been disabled. You MUST start your response directly with the file's new content.
-
-<file_path>
+<file_to_edit>
 {{path}}
-</file_path>
+</file_to_edit>

 <edit_description>
 {{edit_description}}
 </edit_description>
+
+You MUST respond directly with the file's content, without explanations, additional text or triple backticks.
+The text you output will be saved verbatim as the content of the file.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joseph T. Lyons	8f9b217f79	zed 0.187.2	2025-05-15 12:44:38 +02:00
Cole Miller	de30643e74	debugger: Make the stack frame list and module list keyboard-navigable (#30682 ) - Switch stack frame list and module list to `UniformList` to access scrolling behavior - Implement `menu::` navigation actions Release Notes: - Debugger Beta: Added support for menu navigation actions (`ctrl-n`, `ctrl-p`, etc.) in the stack frame list and module list.	2025-05-15 11:53:55 +02:00
gcp-cherry-pick-bot[bot]	235fd06adc	workspace: Remove default keybindings for close active dock (cherry-pick #30691 ) (#30736 ) Cherry-picked workspace: Remove default keybindings for close active dock (#30691) Release Notes: - N/A Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>	2025-05-15 11:53:00 +02:00
gcp-cherry-pick-bot[bot]	c408200f9b	Fix rejecting overwritten files if the agent previously edited them (cherry-pick #30744 ) (#30745 ) Cherry-picked Fix rejecting overwritten files if the agent previously edited them (#30744) Release Notes: - Fixed rejecting overwritten files if the agent had previously edited them. Co-authored-by: Antonio Scandurra <me@as-cii.com>	2025-05-15 11:48:18 +02:00
Joseph T. Lyons	53faf0d78d	zed 0.187.1	2025-05-14 16:15:22 +02:00
Nate Butler	f2050dfe2b	debugger: Tidy up dropdown menus (#30679 ) Before ![CleanShot 2025-05-14 at 13 22 44@2x](https://github.com/user-attachments/assets/c6c06c5c-571d-4913-a691-161f44bba27c) After ![CleanShot 2025-05-14 at 13 22 17@2x](https://github.com/user-attachments/assets/0a25a053-81a3-4b96-8963-4b770b1e5b45) Release Notes: - N/A	2025-05-14 16:13:53 +02:00
Danilo Leal	4cfc49e2d4	agent: Fix Markdown codeblock header buttons (#30645 ) Closes https://github.com/zed-industries/zed/issues/30592 Release Notes: - agent: Fixed Markdown codeblock header buttons being pushed by long paths/file names.	2025-05-14 16:00:01 +02:00
Oleksiy Syvokon	72426a9608	agent: Fix tool use in Gemini (#30689 ) Thread doesn't run pending tools when `stop_reason` is not `ToolUse`. Perhaps we should change that so that it always runs pending tools if there are some, but for now this change just fixes setting `stop_reason` for Google models. Release Notes: - N/A	2025-05-14 15:59:18 +02:00
Oleksiy Syvokon	1c638a1309	agent: Don't duplicate recommended models in all models list (#30692 ) Release Notes: - N/A	2025-05-14 15:58:58 +02:00
Joseph T. Lyons	249597a4a8	v0.187.x preview	2025-05-14 12:18:41 +02:00