Use diagnostic updates in trailing user messages

Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Michael Sloan <mgsloan@gmail.com>
Do not use tag for "Using tool" marker
2025-04-19 12:58:21 +02:00 · 2025-04-19 12:57:12 +02:00 · 2025-04-19 12:57:09 +02:00 · 2025-04-19 12:57:05 +02:00 · 2025-04-19 12:57:01 +02:00 · 2025-04-19 12:56:56 +02:00
328 changed files with 5483 additions and 8344 deletions
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -1,77 +0,0 @@
-name: Run Agent Eval
-
-on:
-  schedule:
-    - cron: "0 * * * *"
-  push:
-    branches:
-      - main
-      - "v[0-9]+.[0-9]+.x"
-    tags:
-      - "v*"
-
-  pull_request:
-    branches:
-      - "**"
-    types: [opened, synchronize, reopened, labeled]
-
-  workflow_dispatch:
-
-concurrency:
-  # Allow only one workflow per any non-`main` branch.
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-  ZED_EVAL_TELEMETRY: 1
-
-jobs:
-  run_eval:
-    timeout-minutes: 60
-    name: Run Agent Eval
-    if: >
-      github.repository_owner == 'zed-industries' &&
-      (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-eval'))
-    runs-on:
-      - buildjet-16vcpu-ubuntu-2204
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-provider: "buildjet"
-
-      - name: Install Linux dependencies
-        run: ./script/linux
-
-      - name: Configure CI
-        run: |
-          mkdir -p ./../.cargo
-          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
-      - name: Compile eval
-        run: cargo build --package=eval
-
-      - name: Run eval
-        run: cargo run --package=eval -- --repetitions=3 --concurrency=1
-
-      # Even the Linux runner is not stateful, in theory there is no need to do this cleanup.
-      # But, to avoid potential issues in the future if we choose to use a stateful Linux runner and forget to add code
-      # to clean up the config file, I’ve included the cleanup code here as a precaution.
-      # While it’s not strictly necessary at this moment, I believe it’s better to err on the side of caution.
-      - name: Clean CI config file
-        if: always()
-        run: rm -rf ./../.cargo
--- a/.github/workflows/run_agent_eval_daily.yml
+++ b/.github/workflows/run_agent_eval_daily.yml
@@ -0,0 +1,28 @@
+name: Run Eval Daily
+
+on:
+  schedule:
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+  RUST_BACKTRACE: 1
+
+jobs:
+  run_eval:
+    name: Run Eval
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run cargo eval
+        run: cargo run -p eval
--- a/.rules
+++ b/.rules
@@ -5,7 +5,6 @@
 * Prefer implementing functionality in existing files unless it is a new logical component. Avoid creating many small files.
 * Avoid using functions that panic like `unwrap()`, instead use mechanisms like `?` to propagate errors.
 * Be careful with operations like indexing which may panic if the indexes are out of bounds.
-* Never create files with `mod.rs` paths - prefer `src/some_module.rs` instead of `src/some_module/mod.rs`.

 # GPUI

@@ -109,13 +108,3 @@ When a view's state has changed in a way that may affect its rendering, it shoul
 While updating an entity (`cx: Context<T>`), it can emit an event using `cx.emit(event)`. Entities register which events they can emit by declaring `impl EventEmittor<EventType> for EntityType {}`.

 Other entities can then register a callback to handle these events by doing `cx.subscribe(other_entity, |this, other_entity, event, cx| ...)`. This will return a `Subscription` which deregisters the callback when dropped.  Typically `cx.subscribe` happens when creating a new entity and the subscriptions are stored in a `_subscriptions: Vec<Subscription>` field.
-
-## Recent API changes
-
-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 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/settings.json
+++ b/.zed/settings.json
@@ -45,6 +45,5 @@
  "hard_tabs": false,
  "formatter": "auto",
  "remove_trailing_whitespace_on_save": true,
-  "ensure_final_newline_on_save": true,
-  "file_scan_exclusions": ["crates/eval/worktrees/", "crates/eval/repos/"]
+  "ensure_final_newline_on_save": true
 }
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4013,7 +4013,6 @@ dependencies = [
 "node_runtime",
 "parking_lot",
 "paths",
- "proto",
 "schemars",
 "serde",
 "serde_json",
@@ -4898,6 +4897,7 @@ dependencies = [
 "client",
 "collections",
 "context_server",
+ "dap",
 "dirs 5.0.1",
 "env_logger 0.11.8",
 "extension",
@@ -4912,7 +4912,6 @@ dependencies = [
 "language_models",
 "languages",
 "node_runtime",
- "parking_lot",
 "paths",
 "project",
 "prompt_store",
@@ -4921,7 +4920,6 @@ dependencies = [
 "serde",
 "settings",
 "shellexpand 2.1.2",
- "smol",
 "telemetry",
 "toml 0.8.20",
 "unindent",
@@ -6173,7 +6171,6 @@ dependencies = [
 "windows 0.61.1",
 "windows-core 0.61.0",
 "windows-numerics",
- "windows-registry 0.5.1",
 "workspace-hack",
 "x11-clipboard",
 "x11rb",
@@ -7715,7 +7712,6 @@ dependencies = [
 "mistral",
 "ollama",
 "open_ai",
- "partial-json-fixer",
 "project",
 "proto",
 "schemars",
@@ -9831,12 +9827,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

-[[package]]
-name = "partial-json-fixer"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ffd90b3f3b6477db7478016b9efb1b7e9d38eafd095f0542fe0ec2ea884a13"
-
 [[package]]
 name = "password-hash"
 version = "0.4.2"
@@ -11752,7 +11742,6 @@ dependencies = [
 "client",
 "clock",
 "dap",
- "dap_adapters",
 "env_logger 0.11.8",
 "extension",
 "extension_host",
@@ -11941,7 +11930,7 @@ dependencies = [
 "wasm-bindgen-futures",
 "wasm-streams",
 "web-sys",
- "windows-registry 0.2.0",
+ "windows-registry",
 ]

 [[package]]
@@ -14224,12 +14213,11 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
+ "dap-types",
 "futures 0.3.31",
 "gpui",
 "hex",
 "parking_lot",
- "pretty_assertions",
- "proto",
 "schemars",
 "serde",
 "serde_json",
@@ -17056,17 +17044,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

-[[package]]
-name = "windows-registry"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1da3e436dc7653dfdf3da67332e22bff09bb0e28b0239e1624499c7830842e"
-dependencies = [
- "windows-link",
- "windows-result 0.3.2",
- "windows-strings 0.4.0",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.2"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -480,7 +480,6 @@ num-format = "0.4.4"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
-partial-json-fixer = "0.5.3"
 pathdiff = "0.2"
 pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
--- a/assets/icons/image.svg
+++ b/assets/icons/image.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-image-icon lucide-image"><rect width="18" height="18" x="3" y="3" rx="2" ry="2"/><circle cx="9" cy="9" r="2"/><path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -49,6 +49,15 @@
      "down": "menu::SelectNext"
    }
  },
+  {
+    "context": "Prompt",
+    "bindings": {
+      "left": "menu::SelectPrevious",
+      "right": "menu::SelectNext",
+      "h": "menu::SelectPrevious",
+      "l": "menu::SelectNext"
+    }
+  },
  {
    "context": "Editor",
    "bindings": {
@@ -130,6 +139,24 @@
      "ctrl-shift-alt-backspace": "editor::GoToNextChange"
    }
  },
+  {
+    "context": "Editor && !agent_diff",
+    "bindings": {
+      "ctrl-k ctrl-r": "git::Restore",
+      "ctrl-alt-y": "git::ToggleStaged",
+      "alt-y": "git::StageAndNext",
+      "alt-shift-y": "git::UnstageAndNext"
+    }
+  },
+  {
+    "context": "AgentDiff",
+    "bindings": {
+      "ctrl-y": "agent::Keep",
+      "ctrl-n": "agent::Reject",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
+    }
+  },
  {
    "context": "Editor && mode == full",
    "bindings": {
@@ -178,31 +205,6 @@
      "ctrl-c": "markdown::Copy"
    }
  },
-  {
-    "context": "Editor && jupyter && !ContextEditor",
-    "bindings": {
-      "ctrl-shift-enter": "repl::Run",
-      "ctrl-alt-enter": "repl::RunInPlace"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff",
-    "bindings": {
-      "ctrl-k ctrl-r": "git::Restore",
-      "ctrl-alt-y": "git::ToggleStaged",
-      "alt-y": "git::StageAndNext",
-      "alt-shift-y": "git::UnstageAndNext"
-    }
-  },
-  {
-    "context": "AgentDiff",
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
  {
    "context": "AssistantPanel",
    "bindings": {
@@ -218,93 +220,6 @@
      "ctrl-n": "assistant::NewChat"
    }
  },
-  {
-    "context": "ContextEditor > Editor",
-    "bindings": {
-      "ctrl-enter": "assistant::Assist",
-      "ctrl-shift-enter": "assistant::Edit",
-      "ctrl-s": "workspace::Save",
-      "save": "workspace::Save",
-      "ctrl->": "assistant::QuoteSelection",
-      "ctrl-<": "assistant::InsertIntoEditor",
-      "ctrl-alt-/": "assistant::ToggleModelSelector",
-      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentPanel",
-    "bindings": {
-      "ctrl-n": "agent::NewThread",
-      "ctrl-alt-n": "agent::NewTextThread",
-      "ctrl-shift-h": "agent::OpenHistory",
-      "ctrl-alt-c": "agent::OpenConfiguration",
-      "ctrl-alt-p": "assistant::OpenPromptLibrary",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "ctrl-alt-/": "assistant::ToggleModelSelector",
-      "ctrl-shift-a": "agent::ToggleContextPicker",
-      "shift-escape": "agent::ExpandMessageEditor",
-      "ctrl-e": "agent::ChatMode",
-      "ctrl-alt-e": "agent::RemoveAllContext"
-    }
-  },
-  {
-    "context": "AgentPanel > Markdown",
-    "bindings": {
-      "copy": "markdown::CopyAsMarkdown",
-      "ctrl-c": "markdown::CopyAsMarkdown"
-    }
-  },
-  {
-    "context": "AgentPanel && prompt_editor",
-    "bindings": {
-      "cmd-n": "agent::NewTextThread",
-      "cmd-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "MessageEditor > Editor",
-    "bindings": {
-      "enter": "agent::Chat",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
-  {
-    "context": "EditMessageEditor > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "ContextStrip",
-    "bindings": {
-      "up": "agent::FocusUp",
-      "right": "agent::FocusRight",
-      "left": "agent::FocusLeft",
-      "down": "agent::FocusDown",
-      "backspace": "agent::RemoveFocusedContext",
-      "enter": "agent::AcceptSuggestedContext"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "bindings": {
-      "backspace": "agent::RemoveSelectedThread"
-    }
-  },
  {
    "context": "PromptLibrary",
    "bindings": {
@@ -687,6 +602,100 @@
      "ctrl-:": "editor::ToggleInlayHints"
    }
  },
+  {
+    "context": "Editor && jupyter && !ContextEditor",
+    "bindings": {
+      "ctrl-shift-enter": "repl::Run",
+      "ctrl-alt-enter": "repl::RunInPlace"
+    }
+  },
+  {
+    "context": "ContextEditor > Editor",
+    "bindings": {
+      "ctrl-enter": "assistant::Assist",
+      "ctrl-shift-enter": "assistant::Edit",
+      "ctrl-s": "workspace::Save",
+      "save": "workspace::Save",
+      "ctrl->": "assistant::QuoteSelection",
+      "ctrl-<": "assistant::InsertIntoEditor",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
+      "shift-enter": "assistant::Split",
+      "ctrl-r": "assistant::CycleMessageRole",
+      "enter": "assistant::ConfirmCommand",
+      "alt-enter": "editor::Newline"
+    }
+  },
+  {
+    "context": "AgentPanel",
+    "bindings": {
+      "ctrl-n": "agent::NewThread",
+      "ctrl-alt-n": "agent::NewTextThread",
+      "ctrl-shift-h": "agent::OpenHistory",
+      "ctrl-alt-c": "agent::OpenConfiguration",
+      "ctrl-alt-p": "assistant::OpenPromptLibrary",
+      "ctrl-i": "agent::ToggleProfileSelector",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
+      "ctrl-shift-a": "agent::ToggleContextPicker",
+      "shift-escape": "agent::ExpandMessageEditor",
+      "ctrl-e": "agent::ChatMode",
+      "ctrl-alt-e": "agent::RemoveAllContext"
+    }
+  },
+  {
+    "context": "AgentPanel > Markdown",
+    "bindings": {
+      "copy": "markdown::CopyAsMarkdown",
+      "ctrl-c": "markdown::CopyAsMarkdown"
+    }
+  },
+  {
+    "context": "AgentPanel && prompt_editor",
+    "bindings": {
+      "cmd-n": "agent::NewTextThread",
+      "cmd-alt-t": "agent::NewThread"
+    }
+  },
+  {
+    "context": "MessageEditor > Editor",
+    "bindings": {
+      "enter": "agent::Chat",
+      "ctrl-i": "agent::ToggleProfileSelector",
+      "shift-ctrl-r": "agent::OpenAgentDiff"
+    }
+  },
+  {
+    "context": "EditMessageEditor > Editor",
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
+  {
+    "context": "AgentFeedbackMessageEditor > Editor",
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
+  {
+    "context": "ContextStrip",
+    "bindings": {
+      "up": "agent::FocusUp",
+      "right": "agent::FocusRight",
+      "left": "agent::FocusLeft",
+      "down": "agent::FocusDown",
+      "backspace": "agent::RemoveFocusedContext",
+      "enter": "agent::AcceptSuggestedContext"
+    }
+  },
+  {
+    "context": "ThreadHistory",
+    "bindings": {
+      "backspace": "agent::RemoveSelectedThread"
+    }
+  },
  {
    "context": "PromptEditor",
    "bindings": {
@@ -695,15 +704,6 @@
      "ctrl-alt-e": "agent::RemoveAllContext"
    }
  },
-  {
-    "context": "Prompt",
-    "bindings": {
-      "left": "menu::SelectPrevious",
-      "right": "menu::SelectNext",
-      "h": "menu::SelectPrevious",
-      "l": "menu::SelectNext"
-    }
-  },
  {
    "context": "ProjectSearchBar && !in_replace",
    "bindings": {
@@ -920,7 +920,6 @@
      "ctrl-enter": "assistant::InlineAssist",
      "alt-b": ["terminal::SendText", "\u001bb"],
      "alt-f": ["terminal::SendText", "\u001bf"],
-      "alt-.": ["terminal::SendText", "\u001b."],
      // 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
@@ -1005,7 +1005,6 @@
      "alt-right": ["terminal::SendText", "\u001bf"],
      "alt-b": ["terminal::SendText", "\u001bb"],
      "alt-f": ["terminal::SendText", "\u001bf"],
-      "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"],
@@ -1028,10 +1027,10 @@
      // Using `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-alt-up": "pane::SplitUp",
-      "ctrl-alt-down": "pane::SplitDown",
-      "ctrl-alt-left": "pane::SplitLeft",
-      "ctrl-alt-right": "pane::SplitRight"
+      "ctrl-k up": "pane::SplitUp",
+      "ctrl-k down": "pane::SplitDown",
+      "ctrl-k left": "pane::SplitLeft",
+      "ctrl-k right": "pane::SplitRight"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -830,13 +830,5 @@
      // 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/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -8,6 +8,16 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 4. NEVER lie or make things up.
 5. Refrain from apologizing all the time when results are unexpected. Instead, just try your best to proceed or explain the circumstances to the user without apologizing.

+## Searching and Reading
+
+If you are unsure about the answer to the user's request or how to satiate their request, you should gather more information.
+This can be done with additional tool calls, asking clarifying questions, etc.
+
+For example, if you've performed a semantic search, and the results may not fully answer the user's request, or merit gathering more information, feel free to call more tools. Similarly, if you've performed an edit that may partially
+satiate the user's query, but you're not confident, gather more information or use more tools before ending your turn.
+
+Bias towards not asking the user for help if you can find the answer yourself.
+
 ## Tool Use

 1. Make sure to adhere to the tools schema.
@@ -16,22 +26,6 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 4. Use only the tools that are currently available.
 5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.

-## Searching and Reading
-
-If you are unsure how to fulfill the user's request, gather more information with tool calls and/or clarifying questions.
-
-{{! TODO: If there are files, we should mention it but otherwise omit that fact }}
-If appropriate, use tool calls to explore the current project, which contains the following root directories:
-
-{{#each worktrees}}
- `{{root_name}}`
-{{/each}}
-
- When providing paths to tools, the path should always begin with a path that starts with a project root directory listed above.
- When looking for symbols in the project, prefer the `grep` tool.
- As you learn about the structure of the project, use that information to scope `grep` searches to targeted subtrees of the project.
- Bias towards not asking the user for help if you can find the answer yourself.
-
 ## Fixing Diagnostics

 1. Make 1-2 attempts at fixing diagnostics, then defer to the user.
@@ -56,6 +50,12 @@ Otherwise, follow debugging best practices:
 Operating System: {{os}}
 Default Shell: {{shell}}

+The user has opened a project that contains the following root directories/files. Whenever you specify a path in the project, it must be a relative path which begins with one of these root directories/files:
+
+{{#each worktrees}}
+- `{{root_name}}`
+{{/each}}
+
 {{#if (or has_rules has_default_user_rules)}}
 ## User's Custom Instructions

@@ -73,9 +73,9 @@ There are project rules that apply to these root directories:
 {{/each}}
 {{/if}}

-{{#if has_user_rules}}
+{{#if has_default_user_rules}}
 The user has specified the following rules that should be applied:
-{{#each user_rules}}
+{{#each default_user_rules}}

 {{#if title}}
 Rules title: {{title}}
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -181,6 +181,8 @@
  "current_line_highlight": "all",
  // Whether to highlight all occurrences of the selected text in an editor.
  "selection_highlight": true,
+  // The debounce delay before querying highlights based on the selected text.
+  "selection_highlight_debounce": 50,
  // The debounce delay before querying highlights from the language
  // server based on the current cursor location.
  "lsp_highlight_debounce": 75,
@@ -212,7 +214,14 @@
  // The default number of lines to expand excerpts in the multibuffer by.
  "expand_excerpt_lines": 3,
  // Globs to match against file paths to determine if a file is private.
-  "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
+  "private_files": [
+    "**/.env*",
+    "**/*.pem",
+    "**/*.key",
+    "**/*.cert",
+    "**/*.crt",
+    "**/secrets.yml"
+  ],
  // Whether to use additional LSP queries to format (and amend) the code after
  // every "trigger" symbol input, defined by LSP server capabilities.
  "use_on_type_format": true,
@@ -648,7 +657,7 @@
          "now": true,
          "path_search": true,
          "read_file": true,
-          "grep": true,
+          "regex_search": true,
          "thinking": true,
          "web_search": true
        }
@@ -672,7 +681,7 @@
          "now": false,
          "path_search": true,
          "read_file": true,
-          "grep": true,
+          "regex_search": true,
          "rename": false,
          "symbol_info": false,
          "terminal": true,
@@ -712,7 +721,9 @@
  // The list of language servers to use (or disable) for all languages.
  //
  // This is typically customized on a per-language basis.
-  "language_servers": ["..."],
+  "language_servers": [
+    "..."
+  ],
  // When to automatically save edited buffers. This setting can
  // take four values.
  //
@@ -908,7 +919,9 @@
  // for files that are not tracked by git, but are still important to your project. Note that globs
  // that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes
  // precedence over these inclusions.
-  "file_scan_inclusions": [".env*"],
+  "file_scan_inclusions": [
+    ".env*"
+  ],
  // Git gutter behavior configuration.
  "git": {
    // Control whether the git gutter is shown. May take 2 values:
@@ -960,7 +973,15 @@
    // Any addition to this list will be merged with the default list.
    // Globs are matched relative to the worktree root,
    // except when starting with a slash (/) or equivalent in Windows.
-    "disabled_globs": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/.dev.vars", "**/secrets.yml"],
+    "disabled_globs": [
+      "**/.env*",
+      "**/*.pem",
+      "**/*.key",
+      "**/*.cert",
+      "**/*.crt",
+      "**/.dev.vars",
+      "**/secrets.yml"
+    ],
    // When to show edit predictions previews in buffer.
    // This setting takes two possible values:
    // 1. Display predictions inline when there are no language server completions available.
@@ -1093,7 +1114,12 @@
        // Default directories to search for virtual environments, relative
        // to the current working directory. We recommend overriding this
        // in your project's settings, rather than globally.
-        "directories": [".env", "env", ".venv", "venv"],
+        "directories": [
+          ".env",
+          "env",
+          ".venv",
+          "venv"
+        ],
        // Can also be `csh`, `fish`, `nushell` and `power_shell`
        "activate_script": "default"
      }
@@ -1157,8 +1183,15 @@
  // }
  //
  "file_types": {
-    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
-    "Shell Script": [".env.*"]
+    "JSONC": [
+      "**/.zed/**/*.json",
+      "**/zed/**/*.json",
+      "**/Zed/**/*.json",
+      "**/.vscode/**/*.json"
+    ],
+    "Shell Script": [
+      ".env.*"
+    ]
  },
  // By default use a recent system version of node, or install our own.
  // You can override this to use a version of node that is not in $PATH with:
@@ -1231,10 +1264,15 @@
  // Different settings for specific languages.
  "languages": {
    "Astro": {
-      "language_servers": ["astro-language-server", "..."],
+      "language_servers": [
+        "astro-language-server",
+        "..."
+      ],
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-astro"]
+        "plugins": [
+          "prettier-plugin-astro"
+        ]
      }
    },
    "Blade": {
@@ -1270,10 +1308,19 @@
      "ensure_final_newline_on_save": false
    },
    "Elixir": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+      "language_servers": [
+        "elixir-ls",
+        "!next-ls",
+        "!lexical",
+        "..."
+      ]
    },
    "Erlang": {
-      "language_servers": ["erlang-ls", "!elp", "..."]
+      "language_servers": [
+        "erlang-ls",
+        "!elp",
+        "..."
+      ]
    },
    "Git Commit": {
      "allow_rewrap": "anywhere"
@@ -1289,7 +1336,12 @@
      }
    },
    "HEEX": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+      "language_servers": [
+        "elixir-ls",
+        "!next-ls",
+        "!lexical",
+        "..."
+      ]
    },
    "HTML": {
      "prettier": {
@@ -1299,11 +1351,17 @@
    "Java": {
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-java"]
+        "plugins": [
+          "prettier-plugin-java"
+        ]
      }
    },
    "JavaScript": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
+      "language_servers": [
+        "!typescript-language-server",
+        "vtsls",
+        "..."
+      ],
      "prettier": {
        "allowed": true
      }
@@ -1321,7 +1379,10 @@
    "LaTeX": {
      "format_on_save": "on",
      "formatter": "language_server",
-      "language_servers": ["texlab", "..."],
+      "language_servers": [
+        "texlab",
+        "..."
+      ],
      "prettier": {
        "allowed": false
      }
@@ -1336,10 +1397,16 @@
      }
    },
    "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "..."],
+      "language_servers": [
+        "phpactor",
+        "!intelephense",
+        "..."
+      ],
      "prettier": {
        "allowed": true,
-        "plugins": ["@prettier/plugin-php"],
+        "plugins": [
+          "@prettier/plugin-php"
+        ],
        "parser": "php"
      }
    },
@@ -1347,7 +1414,12 @@
      "allow_rewrap": "anywhere"
    },
    "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
+      "language_servers": [
+        "solargraph",
+        "!ruby-lsp",
+        "!rubocop",
+        "..."
+      ]
    },
    "SCSS": {
      "prettier": {
@@ -1357,21 +1429,36 @@
    "SQL": {
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-sql"]
+        "plugins": [
+          "prettier-plugin-sql"
+        ]
      }
    },
    "Starlark": {
-      "language_servers": ["starpls", "!buck2-lsp", "..."]
+      "language_servers": [
+        "starpls",
+        "!buck2-lsp",
+        "..."
+      ]
    },
    "Svelte": {
-      "language_servers": ["svelte-language-server", "..."],
+      "language_servers": [
+        "svelte-language-server",
+        "..."
+      ],
      "prettier": {
        "allowed": true,
-        "plugins": ["prettier-plugin-svelte"]
+        "plugins": [
+          "prettier-plugin-svelte"
+        ]
      }
    },
    "TSX": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
+      "language_servers": [
+        "!typescript-language-server",
+        "vtsls",
+        "..."
+      ],
      "prettier": {
        "allowed": true
      }
@@ -1382,13 +1469,20 @@
      }
    },
    "TypeScript": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
+      "language_servers": [
+        "!typescript-language-server",
+        "vtsls",
+        "..."
+      ],
      "prettier": {
        "allowed": true
      }
    },
    "Vue.js": {
-      "language_servers": ["vue-language-server", "..."],
+      "language_servers": [
+        "vue-language-server",
+        "..."
+      ],
      "prettier": {
        "allowed": true
      }
@@ -1396,7 +1490,9 @@
    "XML": {
      "prettier": {
        "allowed": true,
-        "plugins": ["@prettier/plugin-xml"]
+        "plugins": [
+          "@prettier/plugin-xml"
+        ]
      }
    },
    "YAML": {
@@ -1405,7 +1501,10 @@
      }
    },
    "Zig": {
-      "language_servers": ["zls", "..."]
+      "language_servers": [
+        "zls",
+        "..."
+      ]
    }
  },
  // Different settings for specific language models.
@@ -1489,12 +1588,7 @@
    "use_multiline_find": false,
    "use_smartcase_find": false,
    "highlight_on_yank_duration": 200,
-    "custom_digraphs": {},
-    // Cursor shape for the each mode.
-    // Specify the mode as the key and the shape as the value.
-    // The mode can be one of the following: "normal", "replace", "insert", "visual".
-    // The shape can be one of the following: "block", "bar", "underline", "hollow".
-    "cursor_shape": {}
+    "custom_digraphs": {}
  },
  // The server to connect to. If the environment variable
  // ZED_SERVER_URL is set, it will override this setting.
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1,8 +1,8 @@
-use crate::context::{AssistantContext, ContextId, RULES_ICON, format_context_as_string};
+use crate::context::{AssistantContext, ContextId, format_context_as_string};
 use crate::context_picker::MentionLink;
 use crate::thread::{
-    LastRestoreCheckpoint, MessageId, MessageSegment, Thread, ThreadError, ThreadEvent,
-    ThreadFeedback,
+    LastRestoreCheckpoint, MessageId, MessageSegment, RequestKind, Thread, ThreadError,
+    ThreadEvent, ThreadFeedback,
 };
 use crate::thread_store::{RulesLoadingError, ThreadStore};
 use crate::tool_use::{PendingToolUseStatus, ToolUse};
@@ -133,23 +133,18 @@ impl RenderedMessage {
    }

    fn push_segment(&mut self, segment: &MessageSegment, cx: &mut App) {
-        match segment {
-            MessageSegment::Thinking { text, .. } => {
-                self.segments.push(RenderedMessageSegment::Thinking {
-                    content: parse_markdown(text.into(), self.language_registry.clone(), cx),
-                    scroll_handle: ScrollHandle::default(),
-                })
-            }
-            MessageSegment::Text(text) => {
-                self.segments
-                    .push(RenderedMessageSegment::Text(parse_markdown(
-                        text.into(),
-                        self.language_registry.clone(),
-                        cx,
-                    )))
-            }
-            MessageSegment::RedactedThinking(_) => {}
+        let rendered_segment = match segment {
+            MessageSegment::Thinking(text) => RenderedMessageSegment::Thinking {
+                content: parse_markdown(text.into(), self.language_registry.clone(), cx),
+                scroll_handle: ScrollHandle::default(),
+            },
+            MessageSegment::Text(text) => RenderedMessageSegment::Text(parse_markdown(
+                text.into(),
+                self.language_registry.clone(),
+                cx,
+            )),
        };
+        self.segments.push(rendered_segment);
    }
 }

@@ -266,6 +261,14 @@ fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
    }
 }

+fn render_tool_use_markdown(
+    text: SharedString,
+    language_registry: Arc<LanguageRegistry>,
+    cx: &mut App,
+) -> Entity<Markdown> {
+    cx.new(|cx| Markdown::new(text, Some(language_registry), None, cx))
+}
+
 fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
    let theme_settings = ThemeSettings::get_global(cx);
    let colors = cx.theme().colors();
@@ -670,26 +673,6 @@ fn open_markdown_link(
                })
                .detach_and_log_err(cx);
        }
-        Some(MentionLink::Selection(path, line_range)) => {
-            let open_task = workspace.update(cx, |workspace, cx| {
-                workspace.open_path(path, None, true, window, cx)
-            });
-            window
-                .spawn(cx, async move |cx| {
-                    let active_editor = open_task
-                        .await?
-                        .downcast::<Editor>()
-                        .context("Item is not an editor")?;
-                    active_editor.update_in(cx, |editor, window, cx| {
-                        editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
-                            s.select_ranges([Point::new(line_range.start as u32, 0)
-                                ..Point::new(line_range.start as u32, 0)])
-                        });
-                        anyhow::Ok(())
-                    })
-                })
-                .detach_and_log_err(cx);
-        }
        Some(MentionLink::Thread(thread_id)) => workspace.update(cx, |workspace, cx| {
            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                panel.update(cx, |panel, cx| {
@@ -700,12 +683,6 @@ fn open_markdown_link(
            }
        }),
        Some(MentionLink::Fetch(url)) => cx.open_url(&url),
-        Some(MentionLink::Rules(prompt_id)) => window.dispatch_action(
-            Box::new(OpenPromptLibrary {
-                prompt_to_select: Some(prompt_id.0),
-            }),
-            cx,
-        ),
        None => cx.open_url(&text),
    }
 }
@@ -879,34 +856,21 @@ impl ActiveThread {
        tool_output: SharedString,
        cx: &mut Context<Self>,
    ) {
-        let rendered = self
-            .rendered_tool_uses
-            .entry(tool_use_id.clone())
-            .or_insert_with(|| RenderedToolUse {
-                label: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-                input: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-                output: cx.new(|cx| {
-                    Markdown::new("".into(), Some(self.language_registry.clone()), None, cx)
-                }),
-            });
-
-        rendered.label.update(cx, |this, cx| {
-            this.replace(tool_label, cx);
-        });
-        rendered.input.update(cx, |this, cx| {
-            let input = format!(
-                "```json\n{}\n```",
-                serde_json::to_string_pretty(tool_input).unwrap_or_default()
-            );
-            this.replace(input, cx);
-        });
-        rendered.output.update(cx, |this, cx| {
-            this.replace(tool_output, cx);
-        });
+        let rendered = RenderedToolUse {
+            label: render_tool_use_markdown(tool_label.into(), self.language_registry.clone(), cx),
+            input: render_tool_use_markdown(
+                format!(
+                    "```json\n{}\n```",
+                    serde_json::to_string_pretty(tool_input).unwrap_or_default()
+                )
+                .into(),
+                self.language_registry.clone(),
+                cx,
+            ),
+            output: render_tool_use_markdown(tool_output, self.language_registry.clone(), cx),
+        };
+        self.rendered_tool_uses
+            .insert(tool_use_id.clone(), rendered);
    }

    fn handle_thread_event(
@@ -999,19 +963,6 @@ impl ActiveThread {
                    );
                }
            }
-            ThreadEvent::StreamedToolUse {
-                tool_use_id,
-                ui_text,
-                input,
-            } => {
-                self.render_tool_use_markdown(
-                    tool_use_id.clone(),
-                    ui_text.clone(),
-                    input,
-                    "".into(),
-                    cx,
-                );
-            }
            ThreadEvent::ToolFinished {
                pending_tool_use, ..
            } => {
@@ -1030,7 +981,6 @@ impl ActiveThread {
                }
            }
            ThreadEvent::CheckpointChanged => cx.notify(),
-            ThreadEvent::ReceivedTextChunk => {}
        }
    }

@@ -1093,21 +1043,9 @@ impl ActiveThread {
    ) {
        let options = AgentNotification::window_options(screen, cx);

-        let project_name = self.workspace.upgrade().and_then(|workspace| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .next()
-                .map(|worktree| worktree.read(cx).root_name().to_string())
-        });
-
        if let Some(screen_window) = cx
            .open_window(options, |_, cx| {
-                cx.new(|_| {
-                    AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
-                })
+                cx.new(|_| AgentNotification::new(title.clone(), caption.clone(), icon))
            })
            .log_err()
        {
@@ -1342,7 +1280,7 @@ impl ActiveThread {

        self.thread.update(cx, |thread, cx| {
            thread.advance_prompt_id();
-            thread.send_to_model(model.model, cx)
+            thread.send_to_model(model.model, RequestKind::Chat, cx)
        });
        cx.notify();
    }
@@ -1569,7 +1507,9 @@ impl ActiveThread {
            .map(|(_, state)| state.editor.clone());

        let colors = cx.theme().colors();
+        let active_color = colors.element_active;
        let editor_bg_color = colors.editor_background;
+        let bg_user_message_header = editor_bg_color.blend(active_color.opacity(0.25));

        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::FileCode)
            .shape(ui::IconButtonShape::Square)
@@ -1734,6 +1674,7 @@ impl ActiveThread {
                            } else {
                                div()
                                    .min_h_6()
+                                    .text_ui(cx)
                                    .child(self.render_message_content(
                                        message_id,
                                        rendered_message,
@@ -1792,18 +1733,35 @@ impl ActiveThread {
                .pb_4()
                .child(
                    v_flex()
-                        .bg(editor_bg_color)
+                        .bg(colors.editor_background)
                        .rounded_lg()
                        .border_1()
                        .border_color(colors.border)
                        .shadow_md()
-                        .child(div().py_2().px_2p5().children(message_content))
                        .child(
                            h_flex()
-                                .p_1()
-                                .border_t_1()
-                                .border_color(colors.border_variant)
-                                .justify_end()
+                                .py_1()
+                                .pl_2()
+                                .pr_1()
+                                .bg(bg_user_message_header)
+                                .border_b_1()
+                                .border_color(colors.border)
+                                .justify_between()
+                                .rounded_t_md()
+                                .child(
+                                    h_flex()
+                                        .gap_1p5()
+                                        .child(
+                                            Icon::new(IconName::PersonCircle)
+                                                .size(IconSize::XSmall)
+                                                .color(Color::Muted),
+                                        )
+                                        .child(
+                                            Label::new("You")
+                                                .size(LabelSize::Small)
+                                                .color(Color::Muted),
+                                        ),
+                                )
                                .child(
                                    h_flex()
                                        .gap_1()
@@ -1856,12 +1814,8 @@ impl ActiveThread {
                                            edit_message_editor.is_none() && allow_editing_message,
                                            |this| {
                                                this.child(
-                                                    Button::new("edit-message", "Edit Message")
+                                                    Button::new("edit-message", "Edit")
                                                        .label_size(LabelSize::Small)
-                                                        .icon(IconName::Pencil)
-                                                        .icon_size(IconSize::XSmall)
-                                                        .icon_color(Color::Muted)
-                                                        .icon_position(IconPosition::Start)
                                                        .on_click(cx.listener({
                                                            let message_segments =
                                                                message.segments.clone();
@@ -1878,7 +1832,8 @@ impl ActiveThread {
                                            },
                                        ),
                                ),
-                        ),
+                        )
+                        .child(div().p_2().children(message_content)),
                ),
            Role::Assistant => v_flex()
                .id(("message-container", ix))
@@ -2117,13 +2072,11 @@ impl ActiveThread {
            .map(|m| m.role)
            .unwrap_or(Role::User);

-        let is_assistant_message = message_role == Role::Assistant;
-        let is_user_message = message_role == Role::User;
+        let is_assistant = message_role == Role::Assistant;

        v_flex()
            .text_ui(cx)
            .gap_2()
-            .when(is_user_message, |this| this.text_xs())
            .children(
                rendered_message.segments.iter().enumerate().map(
                    |(index, segment)| match segment {
@@ -2144,28 +2097,10 @@ impl ActiveThread {
                        RenderedMessageSegment::Text(markdown) => {
                            let markdown_element = MarkdownElement::new(
                                markdown.clone(),
-                                if is_user_message {
-                                    let mut style = default_markdown_style(window, cx);
-                                    let mut text_style = window.text_style();
-                                    let theme_settings = ThemeSettings::get_global(cx);
-
-                                    let buffer_font = theme_settings.buffer_font.family.clone();
-                                    let buffer_font_size = TextSize::Small.rems(cx);
-
-                                    text_style.refine(&TextStyleRefinement {
-                                        font_family: Some(buffer_font),
-                                        font_size: Some(buffer_font_size.into()),
-                                        ..Default::default()
-                                    });
-
-                                    style.base_text_style = text_style;
-                                    style
-                                } else {
-                                    default_markdown_style(window, cx)
-                                },
+                                default_markdown_style(window, cx),
                            );

-                            let markdown_element = if is_assistant_message {
+                            let markdown_element = if is_assistant {
                                markdown_element.code_block_renderer(
                                    markdown::CodeBlockRenderer::Custom {
                                        render: Arc::new({
@@ -2532,15 +2467,13 @@ impl ActiveThread {
        let edit_tools = tool_use.needs_confirmation;

        let status_icons = div().child(match &tool_use.status {
-            ToolUseStatus::NeedsConfirmation => {
+            ToolUseStatus::Pending | ToolUseStatus::NeedsConfirmation => {
                let icon = Icon::new(IconName::Warning)
                    .color(Color::Warning)
                    .size(IconSize::Small);
                icon.into_any_element()
            }
-            ToolUseStatus::Pending
-            | ToolUseStatus::InputStillStreaming
-            | ToolUseStatus::Running => {
+            ToolUseStatus::Running => {
                let icon = Icon::new(IconName::ArrowCircle)
                    .color(Color::Accent)
                    .size(IconSize::Small);
@@ -2626,7 +2559,7 @@ impl ActiveThread {
                            }),
                        )),
                ),
-                ToolUseStatus::InputStillStreaming | ToolUseStatus::Running => container.child(
+                ToolUseStatus::Running => container.child(
                    results_content_container().child(
                        h_flex()
                            .gap_1()
@@ -3019,10 +2952,10 @@ impl ActiveThread {
            return div().into_any();
        };

-        let user_rules_text = if project_context.user_rules.is_empty() {
+        let default_user_rules_text = if project_context.default_user_rules.is_empty() {
            None
-        } else if project_context.user_rules.len() == 1 {
-            let user_rules = &project_context.user_rules[0];
+        } else if project_context.default_user_rules.len() == 1 {
+            let user_rules = &project_context.default_user_rules[0];

            match user_rules.title.as_ref() {
                Some(title) => Some(format!("Using \"{title}\" user rule")),
@@ -3031,14 +2964,14 @@ impl ActiveThread {
        } else {
            Some(format!(
                "Using {} user rules",
-                project_context.user_rules.len()
+                project_context.default_user_rules.len()
            ))
        };

-        let first_user_rules_id = project_context
-            .user_rules
+        let first_default_user_rules_id = project_context
+            .default_user_rules
            .first()
-            .map(|user_rules| user_rules.uuid.0);
+            .map(|user_rules| user_rules.uuid);

        let rules_files = project_context
            .worktrees
@@ -3055,7 +2988,7 @@ impl ActiveThread {
            rules_files => Some(format!("Using {} project rules files", rules_files.len())),
        };

-        if user_rules_text.is_none() && rules_file_text.is_none() {
+        if default_user_rules_text.is_none() && rules_file_text.is_none() {
            return div().into_any();
        }

@@ -3063,42 +2996,45 @@ impl ActiveThread {
            .pt_2()
            .px_2p5()
            .gap_1()
-            .when_some(user_rules_text, |parent, user_rules_text| {
-                parent.child(
-                    h_flex()
-                        .w_full()
-                        .child(
-                            Icon::new(RULES_ICON)
-                                .size(IconSize::XSmall)
-                                .color(Color::Disabled),
-                        )
-                        .child(
-                            Label::new(user_rules_text)
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                                .truncate()
-                                .buffer_font(cx)
-                                .ml_1p5()
-                                .mr_0p5(),
-                        )
-                        .child(
-                            IconButton::new("open-prompt-library", IconName::ArrowUpRightAlt)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Ignored)
-                                // TODO: Figure out a way to pass focus handle here so we can display the `OpenPromptLibrary`  keybinding
-                                .tooltip(Tooltip::text("View User Rules"))
-                                .on_click(move |_event, window, cx| {
-                                    window.dispatch_action(
-                                        Box::new(OpenPromptLibrary {
-                                            prompt_to_select: first_user_rules_id,
-                                        }),
-                                        cx,
-                                    )
-                                }),
-                        ),
-                )
-            })
+            .when_some(
+                default_user_rules_text,
+                |parent, default_user_rules_text| {
+                    parent.child(
+                        h_flex()
+                            .w_full()
+                            .child(
+                                Icon::new(IconName::File)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Disabled),
+                            )
+                            .child(
+                                Label::new(default_user_rules_text)
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted)
+                                    .truncate()
+                                    .buffer_font(cx)
+                                    .ml_1p5()
+                                    .mr_0p5(),
+                            )
+                            .child(
+                                IconButton::new("open-prompt-library", IconName::ArrowUpRightAlt)
+                                    .shape(ui::IconButtonShape::Square)
+                                    .icon_size(IconSize::XSmall)
+                                    .icon_color(Color::Ignored)
+                                    // TODO: Figure out a way to pass focus handle here so we can display the `OpenPromptLibrary`  keybinding
+                                    .tooltip(Tooltip::text("View User Rules"))
+                                    .on_click(move |_event, window, cx| {
+                                        window.dispatch_action(
+                                            Box::new(OpenPromptLibrary {
+                                                prompt_to_focus: first_default_user_rules_id,
+                                            }),
+                                            cx,
+                                        )
+                                    }),
+                            ),
+                    )
+                },
+            )
            .when_some(rules_file_text, |parent, rules_file_text| {
                parent.child(
                    h_flex()
@@ -3318,10 +3254,12 @@ pub(crate) fn open_context(
            }
        }
        AssistantContext::Directory(directory_context) => {
-            let entry_id = directory_context.entry_id;
+            let project_path = directory_context.project_path(cx);
            workspace.update(cx, |workspace, cx| {
-                workspace.project().update(cx, |_project, cx| {
-                    cx.emit(project::Event::RevealInProjectPanel(entry_id));
+                workspace.project().update(cx, |project, cx| {
+                    if let Some(entry) = project.entry_for_path(&project_path, cx) {
+                        cx.emit(project::Event::RevealInProjectPanel(entry.id));
+                    }
                })
            })
        }
@@ -3344,15 +3282,15 @@ pub(crate) fn open_context(
                    .detach();
            }
        }
-        AssistantContext::Selection(selection_context) => {
-            if let Some(project_path) = selection_context
+        AssistantContext::Excerpt(excerpt_context) => {
+            if let Some(project_path) = excerpt_context
                .context_buffer
                .buffer
                .read(cx)
                .project_path(cx)
            {
-                let snapshot = selection_context.context_buffer.buffer.read(cx).snapshot();
-                let target_position = selection_context.range.start.to_point(&snapshot);
+                let snapshot = excerpt_context.context_buffer.buffer.read(cx).snapshot();
+                let target_position = excerpt_context.range.start.to_point(&snapshot);

                open_editor_at_position(project_path, target_position, &workspace, window, cx)
                    .detach();
@@ -3373,13 +3311,6 @@ pub(crate) fn open_context(
                }
            })
        }
-        AssistantContext::Rules(rules_context) => window.dispatch_action(
-            Box::new(OpenPromptLibrary {
-                prompt_to_select: Some(rules_context.prompt_id.0),
-            }),
-            cx,
-        ),
-        AssistantContext::Image(_) => {}
    }
 }

--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -984,8 +984,10 @@ mod tests {
                    )
                    .unwrap()
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();

        // When opening the assistant diff, the cursor is positioned on the first hunk.
--- a/crates/agent/src/assistant.rs
+++ b/crates/agent/src/assistant.rs
@@ -40,7 +40,7 @@ pub use crate::active_thread::ActiveThread;
 use crate::assistant_configuration::{AddContextServerModal, ManageProfilesModal};
 pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate};
 pub use crate::inline_assistant::InlineAssistant;
-pub use crate::thread::{Message, Thread, ThreadEvent};
+pub use crate::thread::{Message, RequestKind, Thread, ThreadEvent};
 pub use crate::thread_store::ThreadStore;
 pub use agent_diff::{AgentDiff, AgentDiffToolbar};

--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -16,7 +16,7 @@ use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageMod
 use settings::{Settings, update_settings_file};
 use ui::{
    Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Scrollbar, ScrollbarState,
-    Switch, SwitchColor, Tooltip, prelude::*,
+    Switch, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
 use zed_actions::ExtensionCategoryFilter;
@@ -236,7 +236,6 @@ impl AssistantConfiguration {
                            "always-allow-tool-actions-switch",
                            always_allow_tool_actions.into(),
                        )
-                        .color(SwitchColor::Accent)
                        .on_click({
                            let fs = self.fs.clone();
                            move |state, _window, cx| {
@@ -333,44 +332,41 @@ impl AssistantConfiguration {
                                    ),
                            )
                            .child(
-                                Switch::new("context-server-switch", is_running.into())
-                                    .color(SwitchColor::Accent)
-                                    .on_click({
-                                        let context_server_manager =
-                                            self.context_server_manager.clone();
-                                        let context_server = context_server.clone();
-                                        move |state, _window, cx| match state {
-                                            ToggleState::Unselected
-                                            | ToggleState::Indeterminate => {
-                                                context_server_manager.update(cx, |this, cx| {
-                                                    this.stop_server(context_server.clone(), cx)
-                                                        .log_err();
-                                                });
-                                            }
-                                            ToggleState::Selected => {
-                                                cx.spawn({
-                                                    let context_server_manager =
-                                                        context_server_manager.clone();
-                                                    let context_server = context_server.clone();
-                                                    async move |cx| {
-                                                        if let Some(start_server_task) =
-                                                            context_server_manager
-                                                                .update(cx, |this, cx| {
-                                                                    this.start_server(
-                                                                        context_server,
-                                                                        cx,
-                                                                    )
-                                                                })
-                                                                .log_err()
-                                                        {
-                                                            start_server_task.await.log_err();
-                                                        }
-                                                    }
-                                                })
-                                                .detach();
-                                            }
+                                Switch::new("context-server-switch", is_running.into()).on_click({
+                                    let context_server_manager =
+                                        self.context_server_manager.clone();
+                                    let context_server = context_server.clone();
+                                    move |state, _window, cx| match state {
+                                        ToggleState::Unselected | ToggleState::Indeterminate => {
+                                            context_server_manager.update(cx, |this, cx| {
+                                                this.stop_server(context_server.clone(), cx)
+                                                    .log_err();
+                                            });
                                        }
-                                    }),
+                                        ToggleState::Selected => {
+                                            cx.spawn({
+                                                let context_server_manager =
+                                                    context_server_manager.clone();
+                                                let context_server = context_server.clone();
+                                                async move |cx| {
+                                                    if let Some(start_server_task) =
+                                                        context_server_manager
+                                                            .update(cx, |this, cx| {
+                                                                this.start_server(
+                                                                    context_server,
+                                                                    cx,
+                                                                )
+                                                            })
+                                                            .log_err()
+                                                    {
+                                                        start_server_task.await.log_err();
+                                                    }
+                                                }
+                                            })
+                                            .detach();
+                                        }
+                                    }
+                                }),
                            ),
                    )
                    .map(|parent| {
@@ -408,7 +404,7 @@ impl AssistantConfiguration {
                    .gap_2()
                    .child(
                        h_flex().w_full().child(
-                            Button::new("add-context-server", "Add Custom Server")
+                            Button::new("add-context-server", "Add MCPs Directly")
                                .style(ButtonStyle::Filled)
                                .layer(ElevationIndex::ModalSurface)
                                .full_width()
--- a/crates/agent/src/assistant_configuration/add_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/add_context_server_modal.rs
@@ -2,7 +2,7 @@ use context_server::{ContextServerSettings, ServerCommand, ServerConfig};
 use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, WeakEntity, prelude::*};
 use serde_json::json;
 use settings::update_settings_file;
-use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
+use ui::{Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
 use ui_input::SingleLineInput;
 use workspace::{ModalView, Workspace};

@@ -34,9 +34,9 @@ impl AddContextServerModal {
        cx: &mut Context<Self>,
    ) -> Self {
        let name_editor =
-            cx.new(|cx| SingleLineInput::new(window, cx, "my-custom-server").label("Name"));
+            cx.new(|cx| SingleLineInput::new(window, cx, "Your server name").label("Name"));
        let command_editor = cx.new(|cx| {
-            SingleLineInput::new(window, cx, "Command").label("Command to run the MCP server")
+            SingleLineInput::new(window, cx, "Command").label("Command to run the context server")
        });

        Self {
@@ -46,7 +46,7 @@ impl AddContextServerModal {
        }
    }

-    fn confirm(&mut self, _: &menu::Confirm, cx: &mut Context<Self>) {
+    fn confirm(&mut self, cx: &mut Context<Self>) {
        let name = self
            .name_editor
            .read(cx)
@@ -96,7 +96,7 @@ impl AddContextServerModal {
        cx.emit(DismissEvent);
    }

-    fn cancel(&mut self, _: &menu::Cancel, cx: &mut Context<Self>) {
+    fn cancel(&mut self, cx: &mut Context<Self>) {
        cx.emit(DismissEvent);
    }
 }
@@ -112,68 +112,38 @@ impl Focusable for AddContextServerModal {
 impl EventEmitter<DismissEvent> for AddContextServerModal {}

 impl Render for AddContextServerModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let is_name_empty = self.name_editor.read(cx).is_empty(cx);
        let is_command_empty = self.command_editor.read(cx).is_empty(cx);

-        let focus_handle = self.focus_handle(cx);
-
        div()
            .elevation_3(cx)
            .w(rems(34.))
            .key_context("AddContextServerModal")
-            .on_action(
-                cx.listener(|this, _: &menu::Cancel, _window, cx| this.cancel(&menu::Cancel, cx)),
-            )
-            .on_action(
-                cx.listener(|this, _: &menu::Confirm, _window, cx| {
-                    this.confirm(&menu::Confirm, cx)
-                }),
-            )
+            .on_action(cx.listener(|this, _: &menu::Cancel, _window, cx| this.cancel(cx)))
+            .on_action(cx.listener(|this, _: &menu::Confirm, _window, cx| this.confirm(cx)))
            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
                this.focus_handle(cx).focus(window);
            }))
            .on_mouse_down_out(cx.listener(|_this, _, _, cx| cx.emit(DismissEvent)))
            .child(
                Modal::new("add-context-server", None)
-                    .header(ModalHeader::new().headline("Add MCP Server"))
+                    .header(ModalHeader::new().headline("Add Context Server"))
                    .section(
-                        Section::new().child(
-                            v_flex()
-                                .gap_2()
-                                .child(self.name_editor.clone())
-                                .child(self.command_editor.clone()),
-                        ),
+                        Section::new()
+                            .child(self.name_editor.clone())
+                            .child(self.command_editor.clone()),
                    )
                    .footer(
                        ModalFooter::new()
                            .start_slot(
-                                Button::new("cancel", "Cancel")
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &menu::Cancel,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                    )
-                                    .on_click(cx.listener(|this, _event, _window, cx| {
-                                        this.cancel(&menu::Cancel, cx)
-                                    })),
+                                Button::new("cancel", "Cancel").on_click(
+                                    cx.listener(|this, _event, _window, cx| this.cancel(cx)),
+                                ),
                            )
                            .end_slot(
                                Button::new("add-server", "Add Server")
                                    .disabled(is_name_empty || is_command_empty)
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &menu::Confirm,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                    )
                                    .map(|button| {
                                        if is_name_empty {
                                            button.tooltip(Tooltip::text("Name is required"))
@@ -183,9 +153,9 @@ impl Render for AddContextServerModal {
                                            button
                                        }
                                    })
-                                    .on_click(cx.listener(|this, _event, _window, cx| {
-                                        this.confirm(&menu::Confirm, cx)
-                                    })),
+                                    .on_click(
+                                        cx.listener(|this, _event, _window, cx| this.confirm(cx)),
+                                    ),
                            ),
                    ),
            )
--- a/crates/agent/src/assistant_model_selector.rs
+++ b/crates/agent/src/assistant_model_selector.rs
@@ -1,7 +1,7 @@
 use assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
-
+use language_model::LanguageModelRegistry;
 use language_model_selector::{
    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
 };
@@ -9,12 +9,17 @@ use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{ButtonLike, PopoverMenuHandle, Tooltip, prelude::*};

-pub use language_model_selector::ModelType;
+#[derive(Clone, Copy)]
+pub enum ModelType {
+    Default,
+    InlineAssistant,
+}

 pub struct AssistantModelSelector {
    selector: Entity<LanguageModelSelector>,
    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    focus_handle: FocusHandle,
+    model_type: ModelType,
 }

 impl AssistantModelSelector {
@@ -58,13 +63,13 @@ impl AssistantModelSelector {
                            }
                        }
                    },
-                    model_type,
                    window,
                    cx,
                )
            }),
            menu_handle,
            focus_handle,
+            model_type,
        }
    }

@@ -77,7 +82,11 @@ impl Render for AssistantModelSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let focus_handle = self.focus_handle.clone();

-        let model = self.selector.read(cx).active_model(cx);
+        let model_registry = LanguageModelRegistry::read_global(cx);
+        let model = match self.model_type {
+            ModelType::Default => model_registry.default_model(),
+            ModelType::InlineAssistant => model_registry.inline_assistant_model(),
+        };
        let (model_name, model_icon) = match model {
            Some(model) => (model.model.name().0, Some(model.provider.icon())),
            _ => (SharedString::from("No model selected"), None),
--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
@@ -25,7 +25,7 @@ use language_model::{LanguageModelProviderTosView, LanguageModelRegistry};
 use language_model_selector::ToggleModelSelector;
 use project::Project;
 use prompt_library::{PromptLibrary, open_prompt_library};
-use prompt_store::{PromptBuilder, PromptId, UserPromptId};
+use prompt_store::{PromptBuilder, PromptId};
 use proto::Plan;
 use settings::{Settings, update_settings_file};
 use time::UtcOffset;
@@ -47,7 +47,7 @@ use crate::thread_history::{PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::ui::UsageBanner;
 use crate::{
-    AddContextServer, AgentDiff, ExpandMessageEditor, InlineAssistant, NewTextThread, NewThread,
+    AgentDiff, ExpandMessageEditor, InlineAssistant, NewTextThread, NewThread,
    OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ThreadEvent, ToggleContextPicker,
 };

@@ -79,11 +79,11 @@ pub fn init(cx: &mut App) {
                        panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx));
                    }
                })
-                .register_action(|workspace, action: &OpenPromptLibrary, window, cx| {
+                .register_action(|workspace, _: &OpenPromptLibrary, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.deploy_prompt_library(action, window, cx)
+                            panel.deploy_prompt_library(&OpenPromptLibrary::default(), window, cx)
                        });
                    }
                })
@@ -502,9 +502,7 @@ impl AssistantPanel {
                    None,
                ))
            }),
-            action.prompt_to_select.map(|uuid| PromptId::User {
-                uuid: UserPromptId(uuid),
-            }),
+            action.prompt_to_focus.map(|uuid| PromptId::User { uuid }),
            cx,
        )
        .detach_and_log_err(cx);
@@ -1125,16 +1123,14 @@ impl AssistantPanel {
                                                .action("Prompt Library", Box::new(OpenPromptLibrary::default()))
                                                .action("Settings", Box::new(OpenConfiguration))
                                                .separator()
-                                                .header("MCPs")
                                                .action(
-                                                    "View Server Extensions",
+                                                    "Install MCPs",
                                                    Box::new(zed_actions::Extensions {
                                                        category_filter: Some(
                                                            zed_actions::ExtensionCategoryFilter::ContextServers,
                                                        ),
                                                        }),
                                                )
-                                                .action("Add Custom Server", Box::new(AddContextServer))
                                            },
                                        ))
                                    }),
@@ -1951,9 +1947,7 @@ impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
                                .collect::<Vec<_>>();

                            for (buffer, range) in selection_ranges {
-                                store
-                                    .add_selection(buffer, range, cx)
-                                    .detach_and_log_err(cx);
+                                store.add_excerpt(range, buffer, cx).detach_and_log_err(cx);
                            }
                        })
                    })
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -1,7 +1,7 @@
 use crate::context::attach_context_to_message;
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::CodegenStatus;
-use anyhow::Result;
+use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
@@ -131,12 +131,7 @@ impl BufferCodegen {
        cx.notify();
    }

-    pub fn start(
-        &mut self,
-        primary_model: Arc<dyn LanguageModel>,
-        user_prompt: String,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
+    pub fn start(&mut self, user_prompt: String, cx: &mut Context<Self>) -> Result<()> {
        let alternative_models = LanguageModelRegistry::read_global(cx)
            .inline_alternative_models()
            .to_vec();
@@ -160,6 +155,11 @@ impl BufferCodegen {
            }));
        }

+        let primary_model = LanguageModelRegistry::read_global(cx)
+            .default_model()
+            .context("no active model")?
+            .model;
+
        for (model, alternative) in iter::once(primary_model)
            .chain(alternative_models)
            .zip(&self.alternatives)
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -1,15 +1,9 @@
-use std::{
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
+use std::{ops::Range, path::Path, sync::Arc};

-use futures::{FutureExt, future::Shared};
-use gpui::{App, Entity, SharedString, Task};
-use language::Buffer;
-use language_model::{LanguageModelImage, LanguageModelRequestMessage};
-use project::{ProjectEntryId, ProjectPath, Worktree};
-use prompt_store::UserPromptId;
+use gpui::{App, Entity, SharedString};
+use language::{Buffer, File};
+use language_model::LanguageModelRequestMessage;
+use project::{ProjectPath, Worktree};
 use rope::Point;
 use serde::{Deserialize, Serialize};
 use text::{Anchor, BufferId};
@@ -18,8 +12,6 @@ use util::post_inc;

 use crate::thread::Thread;

-pub const RULES_ICON: IconName = IconName::Context;
-
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
 pub struct ContextId(pub(crate) usize);

@@ -28,16 +20,13 @@ impl ContextId {
        Self(post_inc(&mut self.0))
    }
 }
-
 pub enum ContextKind {
    File,
    Directory,
    Symbol,
-    Selection,
+    Excerpt,
    FetchedUrl,
    Thread,
-    Rules,
-    Image,
 }

 impl ContextKind {
@@ -46,11 +35,9 @@ impl ContextKind {
            ContextKind::File => IconName::File,
            ContextKind::Directory => IconName::Folder,
            ContextKind::Symbol => IconName::Code,
-            ContextKind::Selection => IconName::Context,
+            ContextKind::Excerpt => IconName::Code,
            ContextKind::FetchedUrl => IconName::Globe,
            ContextKind::Thread => IconName::MessageBubbles,
-            ContextKind::Rules => RULES_ICON,
-            ContextKind::Image => IconName::Image,
        }
    }
 }
@@ -62,9 +49,7 @@ pub enum AssistantContext {
    Symbol(SymbolContext),
    FetchedUrl(FetchedUrlContext),
    Thread(ThreadContext),
-    Selection(SelectionContext),
-    Rules(RulesContext),
-    Image(ImageContext),
+    Excerpt(ExcerptContext),
 }

 impl AssistantContext {
@@ -75,9 +60,7 @@ impl AssistantContext {
            Self::Symbol(symbol) => symbol.id,
            Self::FetchedUrl(url) => url.id,
            Self::Thread(thread) => thread.id,
-            Self::Selection(selection) => selection.id,
-            Self::Rules(rules) => rules.id,
-            Self::Image(image) => image.id,
+            Self::Excerpt(excerpt) => excerpt.id,
        }
    }
 }
@@ -92,25 +75,17 @@ pub struct FileContext {
 pub struct DirectoryContext {
    pub id: ContextId,
    pub worktree: Entity<Worktree>,
-    pub entry_id: ProjectEntryId,
-    pub last_path: Arc<Path>,
+    pub path: Arc<Path>,
    /// Buffers of the files within the directory.
    pub context_buffers: Vec<ContextBuffer>,
 }

 impl DirectoryContext {
-    pub fn entry<'a>(&self, cx: &'a App) -> Option<&'a project::Entry> {
-        self.worktree.read(cx).entry_for_id(self.entry_id)
-    }
-
-    pub fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        let worktree = self.worktree.read(cx);
-        worktree
-            .entry_for_id(self.entry_id)
-            .map(|entry| ProjectPath {
-                worktree_id: worktree.id(),
-                path: entry.path.clone(),
-            })
+    pub fn project_path(&self, cx: &App) -> ProjectPath {
+        ProjectPath {
+            worktree_id: self.worktree.read(cx).id(),
+            path: self.path.clone(),
+        }
    }
 }

@@ -145,51 +120,17 @@ impl ThreadContext {
    }
 }

-#[derive(Debug, Clone)]
-pub struct ImageContext {
-    pub id: ContextId,
-    pub original_image: Arc<gpui::Image>,
-    pub image_task: Shared<Task<Option<LanguageModelImage>>>,
-}
-
-impl ImageContext {
-    pub fn image(&self) -> Option<LanguageModelImage> {
-        self.image_task.clone().now_or_never().flatten()
-    }
-
-    pub fn is_loading(&self) -> bool {
-        self.image_task.clone().now_or_never().is_none()
-    }
-
-    pub fn is_error(&self) -> bool {
-        self.image_task
-            .clone()
-            .now_or_never()
-            .map(|result| result.is_none())
-            .unwrap_or(false)
-    }
-}
-
 #[derive(Clone)]
 pub struct ContextBuffer {
    pub id: BufferId,
-    // TODO: Entity<Buffer> holds onto the buffer even if the buffer is deleted. Should probably be
+    // TODO: Entity<Buffer> holds onto the thread even if the thread is deleted. Should probably be
    // a WeakEntity and handle removal from the UI when it has dropped.
    pub buffer: Entity<Buffer>,
-    pub last_full_path: Arc<Path>,
+    pub file: Arc<dyn File>,
    pub version: clock::Global,
    pub text: SharedString,
 }

-impl ContextBuffer {
-    pub fn full_path(&self, cx: &App) -> PathBuf {
-        let file = self.buffer.read(cx).file();
-        // Note that in practice file can't be `None` because it is present when this is created and
-        // there's no way for buffers to go from having a file to not.
-        file.map_or(self.last_full_path.to_path_buf(), |file| file.full_path(cx))
-    }
-}
-
 impl std::fmt::Debug for ContextBuffer {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        f.debug_struct("ContextBuffer")
@@ -220,21 +161,13 @@ pub struct ContextSymbolId {
 }

 #[derive(Debug, Clone)]
-pub struct SelectionContext {
+pub struct ExcerptContext {
    pub id: ContextId,
    pub range: Range<Anchor>,
    pub line_range: Range<Point>,
    pub context_buffer: ContextBuffer,
 }

-#[derive(Debug, Clone)]
-pub struct RulesContext {
-    pub id: ContextId,
-    pub prompt_id: UserPromptId,
-    pub title: SharedString,
-    pub text: SharedString,
-}
-
 /// Formats a collection of contexts into a string representation
 pub fn format_context_as_string<'a>(
    contexts: impl Iterator<Item = &'a AssistantContext>,
@@ -243,31 +176,27 @@ pub fn format_context_as_string<'a>(
    let mut file_context = Vec::new();
    let mut directory_context = Vec::new();
    let mut symbol_context = Vec::new();
-    let mut selection_context = Vec::new();
+    let mut excerpt_context = Vec::new();
    let mut fetch_context = Vec::new();
    let mut thread_context = Vec::new();
-    let mut rules_context = Vec::new();

    for context in contexts {
        match context {
            AssistantContext::File(context) => file_context.push(context),
            AssistantContext::Directory(context) => directory_context.push(context),
            AssistantContext::Symbol(context) => symbol_context.push(context),
-            AssistantContext::Selection(context) => selection_context.push(context),
+            AssistantContext::Excerpt(context) => excerpt_context.push(context),
            AssistantContext::FetchedUrl(context) => fetch_context.push(context),
            AssistantContext::Thread(context) => thread_context.push(context),
-            AssistantContext::Rules(context) => rules_context.push(context),
-            AssistantContext::Image(_) => {}
        }
    }

    if file_context.is_empty()
        && directory_context.is_empty()
        && symbol_context.is_empty()
-        && selection_context.is_empty()
+        && excerpt_context.is_empty()
        && fetch_context.is_empty()
        && thread_context.is_empty()
-        && rules_context.is_empty()
    {
        return None;
    }
@@ -303,13 +232,13 @@ pub fn format_context_as_string<'a>(
        result.push_str("</symbols>\n");
    }

-    if !selection_context.is_empty() {
-        result.push_str("<selections>\n");
-        for context in selection_context {
+    if !excerpt_context.is_empty() {
+        result.push_str("<excerpts>\n");
+        for context in excerpt_context {
            result.push_str(&context.context_buffer.text);
            result.push('\n');
        }
-        result.push_str("</selections>\n");
+        result.push_str("</excerpts>\n");
    }

    if !fetch_context.is_empty() {
@@ -334,18 +263,6 @@ pub fn format_context_as_string<'a>(
        result.push_str("</conversation_threads>\n");
    }

-    if !rules_context.is_empty() {
-        result.push_str(
-            "<user_rules>\n\
-            The user has specified the following rules that should be applied:\n\n",
-        );
-        for context in &rules_context {
-            result.push_str(&context.text);
-            result.push('\n');
-        }
-        result.push_str("</user_rules>\n");
-    }
-
    result.push_str("</context>\n");
    Some(result)
 }
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -1,7 +1,6 @@
 mod completion_provider;
 mod fetch_context_picker;
 mod file_context_picker;
-mod rules_context_picker;
 mod symbol_context_picker;
 mod thread_context_picker;

@@ -17,91 +16,30 @@ use gpui::{
    App, DismissEvent, Empty, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task,
    WeakEntity,
 };
-use language::Buffer;
 use multi_buffer::MultiBufferRow;
 use project::{Entry, ProjectPath};
-use prompt_store::UserPromptId;
-use rules_context_picker::RulesContextEntry;
 use symbol_context_picker::SymbolContextPicker;
 use thread_context_picker::{ThreadContextEntry, render_thread_context_entry};
 use ui::{
    ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
 };
-use uuid::Uuid;
 use workspace::{Workspace, notifications::NotifyResultExt};

 use crate::AssistantPanel;
-use crate::context::RULES_ICON;
 pub use crate::context_picker::completion_provider::ContextPickerCompletionProvider;
 use crate::context_picker::fetch_context_picker::FetchContextPicker;
 use crate::context_picker::file_context_picker::FileContextPicker;
-use crate::context_picker::rules_context_picker::RulesContextPicker;
 use crate::context_picker::thread_context_picker::ThreadContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;

-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum ContextPickerEntry {
-    Mode(ContextPickerMode),
-    Action(ContextPickerAction),
-}
-
-impl ContextPickerEntry {
-    pub fn keyword(&self) -> &'static str {
-        match self {
-            Self::Mode(mode) => mode.keyword(),
-            Self::Action(action) => action.keyword(),
-        }
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            Self::Mode(mode) => mode.label(),
-            Self::Action(action) => action.label(),
-        }
-    }
-
-    pub fn icon(&self) -> IconName {
-        match self {
-            Self::Mode(mode) => mode.icon(),
-            Self::Action(action) => action.icon(),
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum ContextPickerMode {
    File,
    Symbol,
    Fetch,
    Thread,
-    Rules,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum ContextPickerAction {
-    AddSelections,
-}
-
-impl ContextPickerAction {
-    pub fn keyword(&self) -> &'static str {
-        match self {
-            Self::AddSelections => "selection",
-        }
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            Self::AddSelections => "Selection",
-        }
-    }
-
-    pub fn icon(&self) -> IconName {
-        match self {
-            Self::AddSelections => IconName::Context,
-        }
-    }
 }

 impl TryFrom<&str> for ContextPickerMode {
@@ -113,20 +51,18 @@ impl TryFrom<&str> for ContextPickerMode {
            "symbol" => Ok(Self::Symbol),
            "fetch" => Ok(Self::Fetch),
            "thread" => Ok(Self::Thread),
-            "rules" => Ok(Self::Rules),
            _ => Err(format!("Invalid context picker mode: {}", value)),
        }
    }
 }

 impl ContextPickerMode {
-    pub fn keyword(&self) -> &'static str {
+    pub fn mention_prefix(&self) -> &'static str {
        match self {
            Self::File => "file",
            Self::Symbol => "symbol",
            Self::Fetch => "fetch",
            Self::Thread => "thread",
-            Self::Rules => "rules",
        }
    }

@@ -136,7 +72,6 @@ impl ContextPickerMode {
            Self::Symbol => "Symbols",
            Self::Fetch => "Fetch",
            Self::Thread => "Threads",
-            Self::Rules => "Rules",
        }
    }

@@ -146,7 +81,6 @@ impl ContextPickerMode {
            Self::Symbol => IconName::Code,
            Self::Fetch => IconName::Globe,
            Self::Thread => IconName::MessageBubbles,
-            Self::Rules => RULES_ICON,
        }
    }
 }
@@ -158,7 +92,6 @@ enum ContextPickerState {
    Symbol(Entity<SymbolContextPicker>),
    Fetch(Entity<FetchContextPicker>),
    Thread(Entity<ThreadContextPicker>),
-    Rules(Entity<RulesContextPicker>),
 }

 pub(super) struct ContextPicker {
@@ -222,13 +155,7 @@ impl ContextPicker {
                .enumerate()
                .map(|(ix, entry)| self.recent_menu_item(context_picker.clone(), ix, entry));

-            let entries = self
-                .workspace
-                .upgrade()
-                .map(|workspace| {
-                    available_context_picker_entries(&self.thread_store, &workspace, cx)
-                })
-                .unwrap_or_default();
+            let modes = supported_context_picker_modes(&self.thread_store);

            menu.when(has_recent, |menu| {
                menu.custom_row(|_, _| {
@@ -244,15 +171,15 @@ impl ContextPicker {
            })
            .extend(recent_entries)
            .when(has_recent, |menu| menu.separator())
-            .extend(entries.into_iter().map(|entry| {
+            .extend(modes.into_iter().map(|mode| {
                let context_picker = context_picker.clone();

-                ContextMenuEntry::new(entry.label())
-                    .icon(entry.icon())
+                ContextMenuEntry::new(mode.label())
+                    .icon(mode.icon())
                    .icon_size(IconSize::XSmall)
                    .icon_color(Color::Muted)
                    .handler(move |window, cx| {
-                        context_picker.update(cx, |this, cx| this.select_entry(entry, window, cx))
+                        context_picker.update(cx, |this, cx| this.select_mode(mode, window, cx))
                    })
            }))
            .keep_open_on_confirm()
@@ -271,87 +198,61 @@ impl ContextPicker {
        self.thread_store.is_some()
    }

-    fn select_entry(
+    fn select_mode(
        &mut self,
-        entry: ContextPickerEntry,
+        mode: ContextPickerMode,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let context_picker = cx.entity().downgrade();

-        match entry {
-            ContextPickerEntry::Mode(mode) => match mode {
-                ContextPickerMode::File => {
-                    self.mode = ContextPickerState::File(cx.new(|cx| {
-                        FileContextPicker::new(
+        match mode {
+            ContextPickerMode::File => {
+                self.mode = ContextPickerState::File(cx.new(|cx| {
+                    FileContextPicker::new(
+                        context_picker.clone(),
+                        self.workspace.clone(),
+                        self.context_store.clone(),
+                        window,
+                        cx,
+                    )
+                }));
+            }
+            ContextPickerMode::Symbol => {
+                self.mode = ContextPickerState::Symbol(cx.new(|cx| {
+                    SymbolContextPicker::new(
+                        context_picker.clone(),
+                        self.workspace.clone(),
+                        self.context_store.clone(),
+                        window,
+                        cx,
+                    )
+                }));
+            }
+            ContextPickerMode::Fetch => {
+                self.mode = ContextPickerState::Fetch(cx.new(|cx| {
+                    FetchContextPicker::new(
+                        context_picker.clone(),
+                        self.workspace.clone(),
+                        self.context_store.clone(),
+                        window,
+                        cx,
+                    )
+                }));
+            }
+            ContextPickerMode::Thread => {
+                if let Some(thread_store) = self.thread_store.as_ref() {
+                    self.mode = ContextPickerState::Thread(cx.new(|cx| {
+                        ThreadContextPicker::new(
+                            thread_store.clone(),
                            context_picker.clone(),
-                            self.workspace.clone(),
                            self.context_store.clone(),
                            window,
                            cx,
                        )
                    }));
                }
-                ContextPickerMode::Symbol => {
-                    self.mode = ContextPickerState::Symbol(cx.new(|cx| {
-                        SymbolContextPicker::new(
-                            context_picker.clone(),
-                            self.workspace.clone(),
-                            self.context_store.clone(),
-                            window,
-                            cx,
-                        )
-                    }));
-                }
-                ContextPickerMode::Rules => {
-                    if let Some(thread_store) = self.thread_store.as_ref() {
-                        self.mode = ContextPickerState::Rules(cx.new(|cx| {
-                            RulesContextPicker::new(
-                                thread_store.clone(),
-                                context_picker.clone(),
-                                self.context_store.clone(),
-                                window,
-                                cx,
-                            )
-                        }));
-                    }
-                }
-                ContextPickerMode::Fetch => {
-                    self.mode = ContextPickerState::Fetch(cx.new(|cx| {
-                        FetchContextPicker::new(
-                            context_picker.clone(),
-                            self.workspace.clone(),
-                            self.context_store.clone(),
-                            window,
-                            cx,
-                        )
-                    }));
-                }
-                ContextPickerMode::Thread => {
-                    if let Some(thread_store) = self.thread_store.as_ref() {
-                        self.mode = ContextPickerState::Thread(cx.new(|cx| {
-                            ThreadContextPicker::new(
-                                thread_store.clone(),
-                                context_picker.clone(),
-                                self.context_store.clone(),
-                                window,
-                                cx,
-                            )
-                        }));
-                    }
-                }
-            },
-            ContextPickerEntry::Action(action) => match action {
-                ContextPickerAction::AddSelections => {
-                    if let Some((context_store, workspace)) =
-                        self.context_store.upgrade().zip(self.workspace.upgrade())
-                    {
-                        add_selections_as_context(&context_store, &workspace, cx);
-                    }
-
-                    cx.emit(DismissEvent);
-                }
-            },
+            }
        }

        cx.notify();
@@ -480,7 +381,6 @@ impl ContextPicker {
            ContextPickerState::Symbol(entity) => entity.update(cx, |_, cx| cx.notify()),
            ContextPickerState::Fetch(entity) => entity.update(cx, |_, cx| cx.notify()),
            ContextPickerState::Thread(entity) => entity.update(cx, |_, cx| cx.notify()),
-            ContextPickerState::Rules(entity) => entity.update(cx, |_, cx| cx.notify()),
        }
    }
 }
@@ -495,7 +395,6 @@ impl Focusable for ContextPicker {
            ContextPickerState::Symbol(symbol_picker) => symbol_picker.focus_handle(cx),
            ContextPickerState::Fetch(fetch_picker) => fetch_picker.focus_handle(cx),
            ContextPickerState::Thread(thread_picker) => thread_picker.focus_handle(cx),
-            ContextPickerState::Rules(user_rules_picker) => user_rules_picker.focus_handle(cx),
        }
    }
 }
@@ -511,9 +410,6 @@ impl Render for ContextPicker {
                ContextPickerState::Symbol(symbol_picker) => parent.child(symbol_picker.clone()),
                ContextPickerState::Fetch(fetch_picker) => parent.child(fetch_picker.clone()),
                ContextPickerState::Thread(thread_picker) => parent.child(thread_picker.clone()),
-                ContextPickerState::Rules(user_rules_picker) => {
-                    parent.child(user_rules_picker.clone())
-                }
            })
    }
 }
@@ -525,37 +421,18 @@ enum RecentEntry {
    Thread(ThreadContextEntry),
 }

-fn available_context_picker_entries(
+fn supported_context_picker_modes(
    thread_store: &Option<WeakEntity<ThreadStore>>,
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) -> Vec<ContextPickerEntry> {
-    let mut entries = vec![
-        ContextPickerEntry::Mode(ContextPickerMode::File),
-        ContextPickerEntry::Mode(ContextPickerMode::Symbol),
+) -> Vec<ContextPickerMode> {
+    let mut modes = vec![
+        ContextPickerMode::File,
+        ContextPickerMode::Symbol,
+        ContextPickerMode::Fetch,
    ];
-
-    let has_selection = workspace
-        .read(cx)
-        .active_item(cx)
-        .and_then(|item| item.downcast::<Editor>())
-        .map_or(false, |editor| {
-            editor.update(cx, |editor, cx| editor.has_non_empty_selection(cx))
-        });
-    if has_selection {
-        entries.push(ContextPickerEntry::Action(
-            ContextPickerAction::AddSelections,
-        ));
-    }
-
    if thread_store.is_some() {
-        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Thread));
-        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Rules));
+        modes.push(ContextPickerMode::Thread);
    }
-
-    entries.push(ContextPickerEntry::Mode(ContextPickerMode::Fetch));
-
-    entries
+    modes
 }

 fn recent_context_picker_entries(
@@ -614,54 +491,6 @@ fn recent_context_picker_entries(
    recent
 }

-fn add_selections_as_context(
-    context_store: &Entity<ContextStore>,
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) {
-    let selection_ranges = selection_ranges(workspace, cx);
-    context_store.update(cx, |context_store, cx| {
-        for (buffer, range) in selection_ranges {
-            context_store
-                .add_selection(buffer, range, cx)
-                .detach_and_log_err(cx);
-        }
-    })
-}
-
-fn selection_ranges(
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) -> Vec<(Entity<Buffer>, Range<text::Anchor>)> {
-    let Some(editor) = workspace
-        .read(cx)
-        .active_item(cx)
-        .and_then(|item| item.act_as::<Editor>(cx))
-    else {
-        return Vec::new();
-    };
-
-    editor.update(cx, |editor, cx| {
-        let selections = editor.selections.all_adjusted(cx);
-
-        let buffer = editor.buffer().clone().read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        selections
-            .into_iter()
-            .map(|s| snapshot.anchor_after(s.start)..snapshot.anchor_before(s.end))
-            .flat_map(|range| {
-                let (start_buffer, start) = buffer.text_anchor_for_position(range.start, cx)?;
-                let (end_buffer, end) = buffer.text_anchor_for_position(range.end, cx)?;
-                if start_buffer != end_buffer {
-                    return None;
-                }
-                Some((start_buffer, start..end))
-            })
-            .collect::<Vec<_>>()
-    })
-}
-
 pub(crate) fn insert_fold_for_mention(
    excerpt_id: ExcerptId,
    crease_start: text::Anchor,
@@ -681,11 +510,24 @@ pub(crate) fn insert_fold_for_mention(
        let start = start.bias_right(&snapshot);
        let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);

-        let crease = crease_for_mention(
-            crease_label,
-            crease_icon_path,
+        let placeholder = FoldPlaceholder {
+            render: render_fold_icon_button(
+                crease_icon_path,
+                crease_label,
+                editor_entity.downgrade(),
+            ),
+            merge_adjacent: false,
+            ..Default::default()
+        };
+
+        let render_trailer =
+            move |_row, _unfold, _window: &mut Window, _cx: &mut App| Empty.into_any();
+
+        let crease = Crease::inline(
            start..end,
-            editor_entity.downgrade(),
+            placeholder.clone(),
+            fold_toggle("mention"),
+            render_trailer,
        );

        editor.display_map.update(cx, |display_map, cx| {
@@ -694,29 +536,6 @@ pub(crate) fn insert_fold_for_mention(
    });
 }

-pub fn crease_for_mention(
-    label: SharedString,
-    icon_path: SharedString,
-    range: Range<Anchor>,
-    editor_entity: WeakEntity<Editor>,
-) -> Crease<Anchor> {
-    let placeholder = FoldPlaceholder {
-        render: render_fold_icon_button(icon_path, label, editor_entity),
-        merge_adjacent: false,
-        ..Default::default()
-    };
-
-    let render_trailer = move |_row, _unfold, _window: &mut Window, _cx: &mut App| Empty.into_any();
-
-    let crease = Crease::inline(
-        range,
-        placeholder.clone(),
-        fold_toggle("mention"),
-        render_trailer,
-    );
-    crease
-}
-
 fn render_fold_icon_button(
    icon_path: SharedString,
    label: SharedString,
@@ -805,19 +624,15 @@ fn fold_toggle(
 pub enum MentionLink {
    File(ProjectPath, Entry),
    Symbol(ProjectPath, String),
-    Selection(ProjectPath, Range<usize>),
    Fetch(String),
    Thread(ThreadId),
-    Rules(UserPromptId),
 }

 impl MentionLink {
    const FILE: &str = "@file";
    const SYMBOL: &str = "@symbol";
-    const SELECTION: &str = "@selection";
    const THREAD: &str = "@thread";
    const FETCH: &str = "@fetch";
-    const RULES: &str = "@rules";

    const SEPARATOR: &str = ":";

@@ -825,9 +640,7 @@ impl MentionLink {
        url.starts_with(Self::FILE)
            || url.starts_with(Self::SYMBOL)
            || url.starts_with(Self::FETCH)
-            || url.starts_with(Self::SELECTION)
            || url.starts_with(Self::THREAD)
-            || url.starts_with(Self::RULES)
    }

    pub fn for_file(file_name: &str, full_path: &str) -> String {
@@ -844,29 +657,12 @@ impl MentionLink {
        )
    }

-    pub fn for_selection(file_name: &str, full_path: &str, line_range: Range<usize>) -> String {
-        format!(
-            "[@{} ({}-{})]({}:{}:{}-{})",
-            file_name,
-            line_range.start,
-            line_range.end,
-            Self::SELECTION,
-            full_path,
-            line_range.start,
-            line_range.end
-        )
-    }
-
-    pub fn for_thread(thread: &ThreadContextEntry) -> String {
-        format!("[@{}]({}:{})", thread.summary, Self::THREAD, thread.id)
-    }
-
    pub fn for_fetch(url: &str) -> String {
        format!("[@{}]({}:{})", url, Self::FETCH, url)
    }

-    pub fn for_rules(rules: &RulesContextEntry) -> String {
-        format!("[@{}]({}:{})", rules.title, Self::RULES, rules.prompt_id.0)
+    pub fn for_thread(thread: &ThreadContextEntry) -> String {
+        format!("[@{}]({}:{})", thread.summary, Self::THREAD, thread.id)
    }

    pub fn try_parse(link: &str, workspace: &Entity<Workspace>, cx: &App) -> Option<Self> {
@@ -905,29 +701,11 @@ impl MentionLink {
                let project_path = extract_project_path_from_link(path, workspace, cx)?;
                Some(MentionLink::Symbol(project_path, symbol.to_string()))
            }
-            Self::SELECTION => {
-                let (path, line_args) = argument.split_once(Self::SEPARATOR)?;
-                let project_path = extract_project_path_from_link(path, workspace, cx)?;
-
-                let line_range = {
-                    let (start, end) = line_args
-                        .trim_start_matches('(')
-                        .trim_end_matches(')')
-                        .split_once('-')?;
-                    start.parse::<usize>().ok()?..end.parse::<usize>().ok()?
-                };
-
-                Some(MentionLink::Selection(project_path, line_range))
-            }
            Self::THREAD => {
                let thread_id = ThreadId::from(argument);
                Some(MentionLink::Thread(thread_id))
            }
            Self::FETCH => Some(MentionLink::Fetch(argument.to_string())),
-            Self::RULES => {
-                let prompt_id = UserPromptId(Uuid::try_parse(argument).ok()?);
-                Some(MentionLink::Rules(prompt_id))
-            }
            _ => None,
        }
    }
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -1,27 +1,24 @@
 use std::cell::RefCell;
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

 use anyhow::Result;
-use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
+use editor::{CompletionProvider, Editor, ExcerptId};
 use file_icons::FileIcons;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{App, Entity, Task, WeakEntity};
 use http_client::HttpClientWithUrl;
-use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
 use project::{Completion, CompletionIntent, ProjectPath, Symbol, WorktreeId};
-use prompt_store::PromptId;
 use rope::Point;
-use text::{Anchor, OffsetRangeExt, ToPoint};
+use text::{Anchor, ToPoint};
 use ui::prelude::*;
 use workspace::Workspace;

-use crate::context::RULES_ICON;
 use crate::context_picker::file_context_picker::search_files;
 use crate::context_picker::symbol_context_picker::search_symbols;
 use crate::context_store::ContextStore;
@@ -29,12 +26,11 @@ use crate::thread_store::ThreadStore;

 use super::fetch_context_picker::fetch_url_content;
 use super::file_context_picker::FileMatch;
-use super::rules_context_picker::{RulesContextEntry, search_rules};
 use super::symbol_context_picker::SymbolMatch;
 use super::thread_context_picker::{ThreadContextEntry, ThreadMatch, search_threads};
 use super::{
-    ContextPickerAction, ContextPickerEntry, ContextPickerMode, MentionLink, RecentEntry,
-    available_context_picker_entries, recent_context_picker_entries, selection_ranges,
+    ContextPickerMode, MentionLink, RecentEntry, recent_context_picker_entries,
+    supported_context_picker_modes,
 };

 pub(crate) enum Match {
@@ -42,24 +38,22 @@ pub(crate) enum Match {
    File(FileMatch),
    Thread(ThreadMatch),
    Fetch(SharedString),
-    Rules(RulesContextEntry),
-    Entry(EntryMatch),
+    Mode(ModeMatch),
 }

-pub struct EntryMatch {
+pub struct ModeMatch {
    mat: Option<StringMatch>,
-    entry: ContextPickerEntry,
+    mode: ContextPickerMode,
 }

 impl Match {
    pub fn score(&self) -> f64 {
        match self {
            Match::File(file) => file.mat.score,
-            Match::Entry(mode) => mode.mat.as_ref().map(|mat| mat.score).unwrap_or(1.),
+            Match::Mode(mode) => mode.mat.as_ref().map(|mat| mat.score).unwrap_or(1.),
            Match::Thread(_) => 1.,
            Match::Symbol(_) => 1.,
            Match::Fetch(_) => 1.,
-            Match::Rules(_) => 1.,
        }
    }
 }
@@ -118,21 +112,6 @@ fn search(
                Task::ready(Vec::new())
            }
        }
-        Some(ContextPickerMode::Rules) => {
-            if let Some(thread_store) = thread_store.as_ref().and_then(|t| t.upgrade()) {
-                let search_rules_task =
-                    search_rules(query.clone(), cancellation_flag.clone(), thread_store, cx);
-                cx.background_spawn(async move {
-                    search_rules_task
-                        .await
-                        .into_iter()
-                        .map(Match::Rules)
-                        .collect::<Vec<_>>()
-                })
-            } else {
-                Task::ready(Vec::new())
-            }
-        }
        None => {
            if query.is_empty() {
                let mut matches = recent_entries
@@ -163,14 +142,9 @@ fn search(
                    .collect::<Vec<_>>();

                matches.extend(
-                    available_context_picker_entries(&thread_store, &workspace, cx)
+                    supported_context_picker_modes(&thread_store)
                        .into_iter()
-                        .map(|mode| {
-                            Match::Entry(EntryMatch {
-                                entry: mode,
-                                mat: None,
-                            })
-                        }),
+                        .map(|mode| Match::Mode(ModeMatch { mode, mat: None })),
                );

                Task::ready(matches)
@@ -180,11 +154,11 @@ fn search(
                let search_files_task =
                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);

-                let entries = available_context_picker_entries(&thread_store, &workspace, cx);
-                let entry_candidates = entries
+                let modes = supported_context_picker_modes(&thread_store);
+                let mode_candidates = modes
                    .iter()
                    .enumerate()
-                    .map(|(ix, entry)| StringMatchCandidate::new(ix, entry.keyword()))
+                    .map(|(ix, mode)| StringMatchCandidate::new(ix, mode.mention_prefix()))
                    .collect::<Vec<_>>();

                cx.background_spawn(async move {
@@ -194,8 +168,8 @@ fn search(
                        .map(Match::File)
                        .collect::<Vec<_>>();

-                    let entry_matches = fuzzy::match_strings(
-                        &entry_candidates,
+                    let mode_matches = fuzzy::match_strings(
+                        &mode_candidates,
                        &query,
                        false,
                        100,
@@ -204,9 +178,9 @@ fn search(
                    )
                    .await;

-                    matches.extend(entry_matches.into_iter().map(|mat| {
-                        Match::Entry(EntryMatch {
-                            entry: entries[mat.candidate_id],
+                    matches.extend(mode_matches.into_iter().map(|mat| {
+                        Match::Mode(ModeMatch {
+                            mode: modes[mat.candidate_id],
                            mat: Some(mat),
                        })
                    }));
@@ -246,137 +220,19 @@ impl ContextPickerCompletionProvider {
        }
    }

-    fn completion_for_entry(
-        entry: ContextPickerEntry,
-        excerpt_id: ExcerptId,
-        source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        context_store: Entity<ContextStore>,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        match entry {
-            ContextPickerEntry::Mode(mode) => Some(Completion {
-                replace_range: source_range.clone(),
-                new_text: format!("@{} ", mode.keyword()),
-                label: CodeLabel::plain(mode.label().to_string(), None),
-                icon_path: Some(mode.icon().path().into()),
-                documentation: None,
-                source: project::CompletionSource::Custom,
-                insert_text_mode: None,
-                // This ensures that when a user accepts this completion, the
-                // completion menu will still be shown after "@category " is
-                // inserted
-                confirm: Some(Arc::new(|_, _, _| true)),
-            }),
-            ContextPickerEntry::Action(action) => {
-                let (new_text, on_action) = match action {
-                    ContextPickerAction::AddSelections => {
-                        let selections = selection_ranges(workspace, cx);
-
-                        let selection_infos = selections
-                            .iter()
-                            .map(|(buffer, range)| {
-                                let full_path = buffer
-                                    .read(cx)
-                                    .file()
-                                    .map(|file| file.full_path(cx))
-                                    .unwrap_or_else(|| PathBuf::from("untitled"));
-                                let file_name = full_path
-                                    .file_name()
-                                    .unwrap_or_default()
-                                    .to_string_lossy()
-                                    .to_string();
-                                let line_range = range.to_point(&buffer.read(cx).snapshot());
-
-                                let link = MentionLink::for_selection(
-                                    &file_name,
-                                    &full_path.to_string_lossy(),
-                                    line_range.start.row as usize..line_range.end.row as usize,
-                                );
-                                (file_name, link, line_range)
-                            })
-                            .collect::<Vec<_>>();
-
-                        let new_text = selection_infos.iter().map(|(_, link, _)| link).join(" ");
-
-                        let callback = Arc::new({
-                            let context_store = context_store.clone();
-                            let selections = selections.clone();
-                            let selection_infos = selection_infos.clone();
-                            move |_, _: &mut Window, cx: &mut App| {
-                                context_store.update(cx, |context_store, cx| {
-                                    for (buffer, range) in &selections {
-                                        context_store
-                                            .add_selection(buffer.clone(), range.clone(), cx)
-                                            .detach_and_log_err(cx)
-                                    }
-                                });
-
-                                let editor = editor.clone();
-                                let selection_infos = selection_infos.clone();
-                                cx.defer(move |cx| {
-                                    let mut current_offset = 0;
-                                    for (file_name, link, line_range) in selection_infos.iter() {
-                                        let snapshot =
-                                            editor.read(cx).buffer().read(cx).snapshot(cx);
-                                        let Some(start) = snapshot
-                                            .anchor_in_excerpt(excerpt_id, source_range.start)
-                                        else {
-                                            return;
-                                        };
-
-                                        let offset = start.to_offset(&snapshot) + current_offset;
-                                        let text_len = link.len();
-
-                                        let range = snapshot.anchor_after(offset)
-                                            ..snapshot.anchor_after(offset + text_len);
-
-                                        let crease = super::crease_for_mention(
-                                            format!(
-                                                "{} ({}-{})",
-                                                file_name,
-                                                line_range.start.row + 1,
-                                                line_range.end.row + 1
-                                            )
-                                            .into(),
-                                            IconName::Context.path().into(),
-                                            range,
-                                            editor.downgrade(),
-                                        );
-
-                                        editor.update(cx, |editor, cx| {
-                                            editor.display_map.update(cx, |display_map, cx| {
-                                                display_map.fold(vec![crease], cx);
-                                            });
-                                        });
-
-                                        current_offset += text_len + 1;
-                                    }
-                                });
-
-                                false
-                            }
-                        });
-
-                        (new_text, callback)
-                    }
-                };
-
-                Some(Completion {
-                    replace_range: source_range.clone(),
-                    new_text,
-                    label: CodeLabel::plain(action.label().to_string(), None),
-                    icon_path: Some(action.icon().path().into()),
-                    documentation: None,
-                    source: project::CompletionSource::Custom,
-                    insert_text_mode: None,
-                    // This ensures that when a user accepts this completion, the
-                    // completion menu will still be shown after "@category " is
-                    // inserted
-                    confirm: Some(on_action),
-                })
-            }
+    fn completion_for_mode(source_range: Range<Anchor>, mode: ContextPickerMode) -> Completion {
+        Completion {
+            replace_range: source_range.clone(),
+            new_text: format!("@{} ", mode.mention_prefix()),
+            label: CodeLabel::plain(mode.label().to_string(), None),
+            icon_path: Some(mode.icon().path().into()),
+            documentation: None,
+            source: project::CompletionSource::Custom,
+            insert_text_mode: None,
+            // This ensures that when a user accepts this completion, the
+            // completion menu will still be shown after "@category " is
+            // inserted
+            confirm: Some(Arc::new(|_, _, _| true)),
        }
    }

@@ -431,60 +287,6 @@ impl ContextPickerCompletionProvider {
        }
    }

-    fn completion_for_rules(
-        rules: RulesContextEntry,
-        excerpt_id: ExcerptId,
-        source_range: Range<Anchor>,
-        editor: Entity<Editor>,
-        context_store: Entity<ContextStore>,
-        thread_store: Entity<ThreadStore>,
-    ) -> Completion {
-        let new_text = MentionLink::for_rules(&rules);
-        let new_text_len = new_text.len();
-        Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label: CodeLabel::plain(rules.title.to_string(), None),
-            documentation: None,
-            insert_text_mode: None,
-            source: project::CompletionSource::Custom,
-            icon_path: Some(RULES_ICON.path().into()),
-            confirm: Some(confirm_completion_callback(
-                RULES_ICON.path().into(),
-                rules.title.clone(),
-                excerpt_id,
-                source_range.start,
-                new_text_len,
-                editor.clone(),
-                move |cx| {
-                    let prompt_uuid = rules.prompt_id;
-                    let prompt_id = PromptId::User { uuid: prompt_uuid };
-                    let context_store = context_store.clone();
-                    let Some(prompt_store) = thread_store.read(cx).prompt_store() else {
-                        log::error!("Can't add user rules as prompt store is missing.");
-                        return;
-                    };
-                    let prompt_store = prompt_store.read(cx);
-                    let Some(metadata) = prompt_store.metadata(prompt_id) else {
-                        return;
-                    };
-                    let Some(title) = metadata.title else {
-                        return;
-                    };
-                    let text_task = prompt_store.load(prompt_id, cx);
-
-                    cx.spawn(async move |cx| {
-                        let text = text_task.await?;
-                        context_store.update(cx, |context_store, cx| {
-                            context_store.add_rules(prompt_uuid, title, text, false, cx)
-                        })
-                    })
-                    .detach_and_log_err(cx);
-                },
-            )),
-        }
-    }
-
    fn completion_for_fetch(
        source_range: Range<Anchor>,
        url_to_fetch: SharedString,
@@ -791,17 +593,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                thread_store,
                            ))
                        }
-                        Match::Rules(user_rules) => {
-                            let thread_store = thread_store.as_ref().and_then(|t| t.upgrade())?;
-                            Some(Self::completion_for_rules(
-                                user_rules,
-                                excerpt_id,
-                                source_range.clone(),
-                                editor.clone(),
-                                context_store.clone(),
-                                thread_store,
-                            ))
-                        }
                        Match::Fetch(url) => Some(Self::completion_for_fetch(
                            source_range.clone(),
                            url,
@@ -810,15 +601,9 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                            context_store.clone(),
                            http_client.clone(),
                        )),
-                        Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
-                            entry,
-                            excerpt_id,
-                            source_range.clone(),
-                            editor.clone(),
-                            context_store.clone(),
-                            &workspace,
-                            cx,
-                        ),
+                        Match::Mode(ModeMatch { mode, .. }) => {
+                            Some(Self::completion_for_mode(source_range.clone(), mode))
+                        }
                    })
                    .collect()
            })?))
--- a/crates/agent/src/context_picker/rules_context_picker.rs
+++ b/crates/agent/src/context_picker/rules_context_picker.rs
@@ -1,248 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use anyhow::anyhow;
-use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
-use picker::{Picker, PickerDelegate};
-use prompt_store::{PromptId, UserPromptId};
-use ui::{ListItem, prelude::*};
-
-use crate::context::RULES_ICON;
-use crate::context_picker::ContextPicker;
-use crate::context_store::{self, ContextStore};
-use crate::thread_store::ThreadStore;
-
-pub struct RulesContextPicker {
-    picker: Entity<Picker<RulesContextPickerDelegate>>,
-}
-
-impl RulesContextPicker {
-    pub fn new(
-        thread_store: WeakEntity<ThreadStore>,
-        context_picker: WeakEntity<ContextPicker>,
-        context_store: WeakEntity<context_store::ContextStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let delegate = RulesContextPickerDelegate::new(thread_store, context_picker, context_store);
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-
-        RulesContextPicker { picker }
-    }
-}
-
-impl Focusable for RulesContextPicker {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for RulesContextPicker {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        self.picker.clone()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct RulesContextEntry {
-    pub prompt_id: UserPromptId,
-    pub title: SharedString,
-}
-
-pub struct RulesContextPickerDelegate {
-    thread_store: WeakEntity<ThreadStore>,
-    context_picker: WeakEntity<ContextPicker>,
-    context_store: WeakEntity<context_store::ContextStore>,
-    matches: Vec<RulesContextEntry>,
-    selected_index: usize,
-}
-
-impl RulesContextPickerDelegate {
-    pub fn new(
-        thread_store: WeakEntity<ThreadStore>,
-        context_picker: WeakEntity<ContextPicker>,
-        context_store: WeakEntity<context_store::ContextStore>,
-    ) -> Self {
-        RulesContextPickerDelegate {
-            thread_store,
-            context_picker,
-            context_store,
-            matches: Vec::new(),
-            selected_index: 0,
-        }
-    }
-}
-
-impl PickerDelegate for RulesContextPickerDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search available rules…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let Some(thread_store) = self.thread_store.upgrade() else {
-            return Task::ready(());
-        };
-
-        let search_task = search_rules(query, Arc::new(AtomicBool::default()), thread_store, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = search_task.await;
-            this.update(cx, |this, cx| {
-                this.delegate.matches = matches;
-                this.delegate.selected_index = 0;
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry) = self.matches.get(self.selected_index) else {
-            return;
-        };
-
-        let Some(thread_store) = self.thread_store.upgrade() else {
-            return;
-        };
-
-        let prompt_id = entry.prompt_id;
-
-        let load_rules_task = thread_store.update(cx, |thread_store, cx| {
-            thread_store.load_rules(prompt_id, cx)
-        });
-
-        cx.spawn(async move |this, cx| {
-            let (metadata, text) = load_rules_task.await?;
-            let Some(title) = metadata.title else {
-                return Err(anyhow!("Encountered user rule with no title when attempting to add it to agent context."));
-            };
-            this.update(cx, |this, cx| {
-                this.delegate
-                    .context_store
-                    .update(cx, |context_store, cx| {
-                        context_store.add_rules(prompt_id, title, text, true, cx)
-                    })
-                    .ok();
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.context_picker
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let thread = &self.matches[ix];
-
-        Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
-            render_thread_context_entry(thread, self.context_store.clone(), cx),
-        ))
-    }
-}
-
-pub fn render_thread_context_entry(
-    user_rules: &RulesContextEntry,
-    context_store: WeakEntity<ContextStore>,
-    cx: &mut App,
-) -> Div {
-    let added = context_store.upgrade().map_or(false, |ctx_store| {
-        ctx_store
-            .read(cx)
-            .includes_user_rules(&user_rules.prompt_id)
-            .is_some()
-    });
-
-    h_flex()
-        .gap_1p5()
-        .w_full()
-        .justify_between()
-        .child(
-            h_flex()
-                .gap_1p5()
-                .max_w_72()
-                .child(
-                    Icon::new(RULES_ICON)
-                        .size(IconSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .child(Label::new(user_rules.title.clone()).truncate()),
-        )
-        .when(added, |el| {
-            el.child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::Check)
-                            .size(IconSize::Small)
-                            .color(Color::Success),
-                    )
-                    .child(Label::new("Added").size(LabelSize::Small)),
-            )
-        })
-}
-
-pub(crate) fn search_rules(
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    thread_store: Entity<ThreadStore>,
-    cx: &mut App,
-) -> Task<Vec<RulesContextEntry>> {
-    let Some(prompt_store) = thread_store.read(cx).prompt_store() else {
-        return Task::ready(vec![]);
-    };
-    let search_task = prompt_store.read(cx).search(query, cancellation_flag, cx);
-    cx.background_spawn(async move {
-        search_task
-            .await
-            .into_iter()
-            .flat_map(|metadata| {
-                // Default prompts are filtered out as they are automatically included.
-                if metadata.default {
-                    None
-                } else {
-                    match metadata.id {
-                        PromptId::EditWorkflow => None,
-                        PromptId::User { uuid } => Some(RulesContextEntry {
-                            prompt_id: uuid,
-                            title: metadata.title?,
-                        }),
-                    }
-                }
-            })
-            .collect::<Vec<_>>()
-    })
-}
--- a/crates/agent/src/context_picker/thread_context_picker.rs
+++ b/crates/agent/src/context_picker/thread_context_picker.rs
@@ -103,11 +103,11 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
-        let Some(thread_store) = self.thread_store.upgrade() else {
+        let Some(threads) = self.thread_store.upgrade() else {
            return Task::ready(());
        };

-        let search_task = search_threads(query, Arc::new(AtomicBool::default()), thread_store, cx);
+        let search_task = search_threads(query, Arc::new(AtomicBool::default()), threads, cx);
        cx.spawn_in(window, async move |this, cx| {
            let matches = search_task.await;
            this.update(cx, |this, cx| {
@@ -217,15 +217,15 @@ pub(crate) fn search_threads(
    thread_store: Entity<ThreadStore>,
    cx: &mut App,
 ) -> Task<Vec<ThreadMatch>> {
-    let threads = thread_store
-        .read(cx)
-        .threads()
-        .into_iter()
-        .map(|thread| ThreadContextEntry {
-            id: thread.id,
-            summary: thread.summary,
-        })
-        .collect::<Vec<_>>();
+    let threads = thread_store.update(cx, |this, _cx| {
+        this.threads()
+            .into_iter()
+            .map(|thread| ThreadContextEntry {
+                id: thread.id,
+                summary: thread.summary,
+            })
+            .collect::<Vec<_>>()
+    });

    let executor = cx.background_executor().clone();
    cx.background_spawn(async move {
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -6,11 +6,9 @@ use anyhow::{Context as _, Result, anyhow};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::future::join_all;
 use futures::{self, Future, FutureExt, future};
-use gpui::{App, AppContext as _, Context, Entity, Image, SharedString, Task, WeakEntity};
-use language::Buffer;
-use language_model::LanguageModelImage;
-use project::{Project, ProjectEntryId, ProjectItem, ProjectPath, Worktree};
-use prompt_store::UserPromptId;
+use gpui::{App, AppContext as _, Context, Entity, SharedString, Task, WeakEntity};
+use language::{Buffer, File};
+use project::{Project, ProjectItem, ProjectPath, Worktree};
 use rope::{Point, Rope};
 use text::{Anchor, BufferId, OffsetRangeExt};
 use util::{ResultExt as _, maybe};
@@ -18,8 +16,7 @@ use util::{ResultExt as _, maybe};
 use crate::ThreadStore;
 use crate::context::{
    AssistantContext, ContextBuffer, ContextId, ContextSymbol, ContextSymbolId, DirectoryContext,
-    FetchedUrlContext, FileContext, ImageContext, RulesContext, SelectionContext, SymbolContext,
-    ThreadContext,
+    ExcerptContext, FetchedUrlContext, FileContext, SymbolContext, ThreadContext,
 };
 use crate::context_strip::SuggestedContext;
 use crate::thread::{Thread, ThreadId};
@@ -28,6 +25,7 @@ pub struct ContextStore {
    project: WeakEntity<Project>,
    context: Vec<AssistantContext>,
    thread_store: Option<WeakEntity<ThreadStore>>,
+    // TODO: If an EntityId is used for all context types (like BufferId), can remove ContextId.
    next_context_id: ContextId,
    files: BTreeMap<BufferId, ContextId>,
    directories: HashMap<ProjectPath, ContextId>,
@@ -37,7 +35,6 @@ pub struct ContextStore {
    threads: HashMap<ThreadId, ContextId>,
    thread_summary_tasks: Vec<Task<()>>,
    fetched_urls: HashMap<String, ContextId>,
-    user_rules: HashMap<UserPromptId, ContextId>,
 }

 impl ContextStore {
@@ -58,7 +55,6 @@ impl ContextStore {
            threads: HashMap::default(),
            thread_summary_tasks: Vec::new(),
            fetched_urls: HashMap::default(),
-            user_rules: HashMap::default(),
        }
    }

@@ -76,7 +72,6 @@ impl ContextStore {
        self.directories.clear();
        self.threads.clear();
        self.fetched_urls.clear();
-        self.user_rules.clear();
    }

    pub fn add_file_from_path(
@@ -114,12 +109,13 @@ impl ContextStore {
                return anyhow::Ok(());
            }

-            let context_buffer = this
-                .update(cx, |_, cx| load_context_buffer(buffer, cx))??
-                .await;
+            let (buffer_info, text_task) =
+                this.update(cx, |_, cx| collect_buffer_info_and_text(buffer, cx))??;
+
+            let text = text_task.await;

            this.update(cx, |this, cx| {
-                this.insert_file(context_buffer, cx);
+                this.insert_file(make_context_buffer(buffer_info, text), cx);
            })?;

            anyhow::Ok(())
@@ -132,11 +128,14 @@ impl ContextStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        cx.spawn(async move |this, cx| {
-            let context_buffer = this
-                .update(cx, |_, cx| load_context_buffer(buffer, cx))??
-                .await;
+            let (buffer_info, text_task) =
+                this.update(cx, |_, cx| collect_buffer_info_and_text(buffer, cx))??;

-            this.update(cx, |this, cx| this.insert_file(context_buffer, cx))?;
+            let text = text_task.await;
+
+            this.update(cx, |this, cx| {
+                this.insert_file(make_context_buffer(buffer_info, text), cx)
+            })?;

            anyhow::Ok(())
        })
@@ -160,14 +159,6 @@ impl ContextStore {
            return Task::ready(Err(anyhow!("failed to read project")));
        };

-        let Some(entry_id) = project
-            .read(cx)
-            .entry_for_path(&project_path, cx)
-            .map(|entry| entry.id)
-        else {
-            return Task::ready(Err(anyhow!("no entry found for directory context")));
-        };
-
        let already_included = match self.includes_directory(&project_path) {
            Some(FileInclusion::Direct(context_id)) => {
                if remove_if_exists {
@@ -209,15 +200,27 @@ impl ContextStore {

            let buffers = open_buffers_task.await;

-            let context_buffer_tasks = this.update(cx, |_, cx| {
-                buffers
-                    .into_iter()
-                    .flatten()
-                    .flat_map(move |buffer| load_context_buffer(buffer, cx).log_err())
-                    .collect::<Vec<_>>()
-            })?;
+            let mut buffer_infos = Vec::new();
+            let mut text_tasks = Vec::new();
+            this.update(cx, |_, cx| {
+                // Skip all binary files and other non-UTF8 files
+                for buffer in buffers.into_iter().flatten() {
+                    if let Some((buffer_info, text_task)) =
+                        collect_buffer_info_and_text(buffer, cx).log_err()
+                    {
+                        buffer_infos.push(buffer_info);
+                        text_tasks.push(text_task);
+                    }
+                }
+                anyhow::Ok(())
+            })??;

-            let context_buffers = future::join_all(context_buffer_tasks).await;
+            let buffer_texts = future::join_all(text_tasks).await;
+            let context_buffers = buffer_infos
+                .into_iter()
+                .zip(buffer_texts)
+                .map(|(info, text)| make_context_buffer(info, text))
+                .collect::<Vec<_>>();

            if context_buffers.is_empty() {
                let full_path = cx.update(|cx| worktree.read(cx).full_path(&project_path.path))?;
@@ -225,7 +228,7 @@ impl ContextStore {
            }

            this.update(cx, |this, cx| {
-                this.insert_directory(worktree, entry_id, project_path, context_buffers, cx);
+                this.insert_directory(worktree, project_path, context_buffers, cx);
            })?;

            anyhow::Ok(())
@@ -235,21 +238,19 @@ impl ContextStore {
    fn insert_directory(
        &mut self,
        worktree: Entity<Worktree>,
-        entry_id: ProjectEntryId,
        project_path: ProjectPath,
        context_buffers: Vec<ContextBuffer>,
        cx: &mut Context<Self>,
    ) {
        let id = self.next_context_id.post_inc();
-        let last_path = project_path.path.clone();
+        let path = project_path.path.clone();
        self.directories.insert(project_path, id);

        self.context
            .push(AssistantContext::Directory(DirectoryContext {
                id,
                worktree,
-                entry_id,
-                last_path,
+                path,
                context_buffers,
            }));
        cx.notify();
@@ -289,23 +290,27 @@ impl ContextStore {
            }
        }

-        let context_buffer_task =
-            match load_context_buffer_range(buffer, symbol_enclosing_range.clone(), cx) {
-                Ok((_line_range, context_buffer_task)) => context_buffer_task,
-                Err(err) => return Task::ready(Err(err)),
-            };
+        let (buffer_info, collect_content_task) = match collect_buffer_info_and_text_for_range(
+            buffer,
+            symbol_enclosing_range.clone(),
+            cx,
+        ) {
+            Ok((_, buffer_info, collect_context_task)) => (buffer_info, collect_context_task),
+            Err(err) => return Task::ready(Err(err)),
+        };

        cx.spawn(async move |this, cx| {
-            let context_buffer = context_buffer_task.await;
+            let content = collect_content_task.await;

            this.update(cx, |this, cx| {
                this.insert_symbol(
                    make_context_symbol(
-                        context_buffer,
+                        buffer_info,
                        project_path,
                        symbol_name,
                        symbol_range,
                        symbol_enclosing_range,
+                        content,
                    ),
                    cx,
                )
@@ -385,42 +390,6 @@ impl ContextStore {
        cx.notify();
    }

-    pub fn add_rules(
-        &mut self,
-        prompt_id: UserPromptId,
-        title: impl Into<SharedString>,
-        text: impl Into<SharedString>,
-        remove_if_exists: bool,
-        cx: &mut Context<ContextStore>,
-    ) {
-        if let Some(context_id) = self.includes_user_rules(&prompt_id) {
-            if remove_if_exists {
-                self.remove_context(context_id, cx);
-            }
-        } else {
-            self.insert_user_rules(prompt_id, title, text, cx);
-        }
-    }
-
-    pub fn insert_user_rules(
-        &mut self,
-        prompt_id: UserPromptId,
-        title: impl Into<SharedString>,
-        text: impl Into<SharedString>,
-        cx: &mut Context<ContextStore>,
-    ) {
-        let id = self.next_context_id.post_inc();
-
-        self.user_rules.insert(prompt_id, id);
-        self.context.push(AssistantContext::Rules(RulesContext {
-            id,
-            prompt_id,
-            title: title.into(),
-            text: text.into(),
-        }));
-        cx.notify();
-    }
-
    pub fn add_fetched_url(
        &mut self,
        url: String,
@@ -450,54 +419,33 @@ impl ContextStore {
        cx.notify();
    }

-    pub fn add_image(&mut self, image: Arc<Image>, cx: &mut Context<ContextStore>) {
-        let image_task = LanguageModelImage::from_image(image.clone(), cx).shared();
-        let id = self.next_context_id.post_inc();
-        self.context.push(AssistantContext::Image(ImageContext {
-            id,
-            original_image: image,
-            image_task,
-        }));
-        cx.notify();
-    }
-
-    pub fn wait_for_images(&self, cx: &App) -> Task<()> {
-        let tasks = self
-            .context
-            .iter()
-            .filter_map(|ctx| match ctx {
-                AssistantContext::Image(ctx) => Some(ctx.image_task.clone()),
-                _ => None,
-            })
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |_cx| {
-            join_all(tasks).await;
-        })
-    }
-
-    pub fn add_selection(
+    pub fn add_excerpt(
        &mut self,
-        buffer: Entity<Buffer>,
        range: Range<Anchor>,
+        buffer: Entity<Buffer>,
        cx: &mut Context<ContextStore>,
    ) -> Task<Result<()>> {
        cx.spawn(async move |this, cx| {
-            let (line_range, context_buffer_task) = this.update(cx, |_, cx| {
-                load_context_buffer_range(buffer, range.clone(), cx)
+            let (line_range, buffer_info, text_task) = this.update(cx, |_, cx| {
+                collect_buffer_info_and_text_for_range(buffer, range.clone(), cx)
            })??;

-            let context_buffer = context_buffer_task.await;
+            let text = text_task.await;

            this.update(cx, |this, cx| {
-                this.insert_selection(context_buffer, range, line_range, cx)
+                this.insert_excerpt(
+                    make_context_buffer(buffer_info, text),
+                    range,
+                    line_range,
+                    cx,
+                )
            })?;

            anyhow::Ok(())
        })
    }

-    fn insert_selection(
+    fn insert_excerpt(
        &mut self,
        context_buffer: ContextBuffer,
        range: Range<Anchor>,
@@ -505,13 +453,12 @@ impl ContextStore {
        cx: &mut Context<Self>,
    ) {
        let id = self.next_context_id.post_inc();
-        self.context
-            .push(AssistantContext::Selection(SelectionContext {
-                id,
-                range,
-                line_range,
-                context_buffer,
-            }));
+        self.context.push(AssistantContext::Excerpt(ExcerptContext {
+            id,
+            range,
+            line_range,
+            context_buffer,
+        }));
        cx.notify();
    }

@@ -564,17 +511,13 @@ impl ContextStore {
                self.symbol_buffers.remove(&symbol.context_symbol.id);
                self.symbols.retain(|_, context_id| *context_id != id);
            }
-            AssistantContext::Selection(_) => {}
+            AssistantContext::Excerpt(_) => {}
            AssistantContext::FetchedUrl(_) => {
                self.fetched_urls.retain(|_, context_id| *context_id != id);
            }
            AssistantContext::Thread(_) => {
                self.threads.retain(|_, context_id| *context_id != id);
            }
-            AssistantContext::Rules(RulesContext { prompt_id, .. }) => {
-                self.user_rules.remove(&prompt_id);
-            }
-            AssistantContext::Image(_) => {}
        }

        cx.notify();
@@ -671,10 +614,6 @@ impl ContextStore {
        self.threads.get(thread_id).copied()
    }

-    pub fn includes_user_rules(&self, prompt_id: &UserPromptId) -> Option<ContextId> {
-        self.user_rules.get(prompt_id).copied()
-    }
-
    pub fn includes_url(&self, url: &str) -> Option<ContextId> {
        self.fetched_urls.get(url).copied()
    }
@@ -700,11 +639,9 @@ impl ContextStore {
                }
                AssistantContext::Directory(_)
                | AssistantContext::Symbol(_)
-                | AssistantContext::Selection(_)
+                | AssistantContext::Excerpt(_)
                | AssistantContext::FetchedUrl(_)
-                | AssistantContext::Thread(_)
-                | AssistantContext::Rules(_)
-                | AssistantContext::Image(_) => None,
+                | AssistantContext::Thread(_) => None,
            })
            .collect()
    }
@@ -719,78 +656,92 @@ pub enum FileInclusion {
    InDirectory(ProjectPath),
 }

+// ContextBuffer without text.
+struct BufferInfo {
+    id: BufferId,
+    buffer: Entity<Buffer>,
+    file: Arc<dyn File>,
+    version: clock::Global,
+}
+
+fn make_context_buffer(info: BufferInfo, text: SharedString) -> ContextBuffer {
+    ContextBuffer {
+        id: info.id,
+        buffer: info.buffer,
+        file: info.file,
+        version: info.version,
+        text,
+    }
+}
+
 fn make_context_symbol(
-    context_buffer: ContextBuffer,
+    info: BufferInfo,
    path: ProjectPath,
    name: SharedString,
    range: Range<Anchor>,
    enclosing_range: Range<Anchor>,
+    text: SharedString,
 ) -> ContextSymbol {
    ContextSymbol {
        id: ContextSymbolId { name, range, path },
-        buffer_version: context_buffer.version,
+        buffer_version: info.version,
        enclosing_range,
-        buffer: context_buffer.buffer,
-        text: context_buffer.text,
+        buffer: info.buffer,
+        text,
    }
 }

-fn load_context_buffer_range(
+fn collect_buffer_info_and_text_for_range(
    buffer: Entity<Buffer>,
    range: Range<Anchor>,
    cx: &App,
-) -> Result<(Range<Point>, Task<ContextBuffer>)> {
-    let buffer_ref = buffer.read(cx);
-    let id = buffer_ref.remote_id();
+) -> Result<(Range<Point>, BufferInfo, Task<SharedString>)> {
+    let content = buffer
+        .read(cx)
+        .text_for_range(range.clone())
+        .collect::<Rope>();

-    let file = buffer_ref.file().context("context buffer missing path")?;
-    let full_path = file.full_path(cx);
+    let line_range = range.to_point(&buffer.read(cx).snapshot());

-    // Important to collect version at the same time as content so that staleness logic is correct.
-    let version = buffer_ref.version();
-    let content = buffer_ref.text_for_range(range.clone()).collect::<Rope>();
-    let line_range = range.to_point(&buffer_ref.snapshot());
+    let buffer_info = collect_buffer_info(buffer, cx)?;
+    let full_path = buffer_info.file.full_path(cx);

-    // Build the text on a background thread.
-    let task = cx.background_spawn({
+    let text_task = cx.background_spawn({
        let line_range = line_range.clone();
-        async move {
-            let text = to_fenced_codeblock(&full_path, content, Some(line_range));
-            ContextBuffer {
-                id,
-                buffer,
-                last_full_path: full_path.into(),
-                version,
-                text,
-            }
-        }
+        async move { to_fenced_codeblock(&full_path, content, Some(line_range)) }
    });

-    Ok((line_range, task))
+    Ok((line_range, buffer_info, text_task))
 }

-fn load_context_buffer(buffer: Entity<Buffer>, cx: &App) -> Result<Task<ContextBuffer>> {
-    let buffer_ref = buffer.read(cx);
-    let id = buffer_ref.remote_id();
+fn collect_buffer_info_and_text(
+    buffer: Entity<Buffer>,
+    cx: &App,
+) -> Result<(BufferInfo, Task<SharedString>)> {
+    let content = buffer.read(cx).as_rope().clone();

-    let file = buffer_ref.file().context("context buffer missing path")?;
-    let full_path = file.full_path(cx);
+    let buffer_info = collect_buffer_info(buffer, cx)?;
+    let full_path = buffer_info.file.full_path(cx);
+
+    let text_task =
+        cx.background_spawn(async move { to_fenced_codeblock(&full_path, content, None) });
+
+    Ok((buffer_info, text_task))
+}
+
+fn collect_buffer_info(buffer: Entity<Buffer>, cx: &App) -> Result<BufferInfo> {
+    let buffer_ref = buffer.read(cx);
+    let file = buffer_ref.file().context("file context must have a path")?;

    // Important to collect version at the same time as content so that staleness logic is correct.
    let version = buffer_ref.version();
-    let content = buffer_ref.as_rope().clone();

-    // Build the text on a background thread.
-    Ok(cx.background_spawn(async move {
-        let text = to_fenced_codeblock(&full_path, content, None);
-        ContextBuffer {
-            id,
-            buffer,
-            last_full_path: full_path.into(),
-            version,
-            text,
-        }
-    }))
+    Ok(BufferInfo {
+        buffer,
+        id: buffer_ref.remote_id(),
+        file: file.clone(),
+        version,
+    })
 }

 fn to_fenced_codeblock(
@@ -877,7 +828,6 @@ pub fn refresh_context_store_text(
        let task = maybe!({
            match context {
                AssistantContext::File(file_context) => {
-                    // TODO: Should refresh if the path has changed, as it's in the text.
                    if changed_buffers.is_empty()
                        || changed_buffers.contains(&file_context.context_buffer.buffer)
                    {
@@ -886,9 +836,8 @@ pub fn refresh_context_store_text(
                    }
                }
                AssistantContext::Directory(directory_context) => {
-                    let directory_path = directory_context.project_path(cx)?;
-                    let should_refresh = directory_path.path != directory_context.last_path
-                        || changed_buffers.is_empty()
+                    let directory_path = directory_context.project_path(cx);
+                    let should_refresh = changed_buffers.is_empty()
                        || changed_buffers.iter().any(|buffer| {
                            let Some(buffer_path) = buffer.read(cx).project_path(cx) else {
                                return false;
@@ -898,16 +847,10 @@ pub fn refresh_context_store_text(

                    if should_refresh {
                        let context_store = context_store.clone();
-                        return refresh_directory_text(
-                            context_store,
-                            directory_context,
-                            directory_path,
-                            cx,
-                        );
+                        return refresh_directory_text(context_store, directory_context, cx);
                    }
                }
                AssistantContext::Symbol(symbol_context) => {
-                    // TODO: Should refresh if the path has changed, as it's in the text.
                    if changed_buffers.is_empty()
                        || changed_buffers.contains(&symbol_context.context_symbol.buffer)
                    {
@@ -915,13 +858,12 @@ pub fn refresh_context_store_text(
                        return refresh_symbol_text(context_store, symbol_context, cx);
                    }
                }
-                AssistantContext::Selection(selection_context) => {
-                    // TODO: Should refresh if the path has changed, as it's in the text.
+                AssistantContext::Excerpt(excerpt_context) => {
                    if changed_buffers.is_empty()
-                        || changed_buffers.contains(&selection_context.context_buffer.buffer)
+                        || changed_buffers.contains(&excerpt_context.context_buffer.buffer)
                    {
                        let context_store = context_store.clone();
-                        return refresh_selection_text(context_store, selection_context, cx);
+                        return refresh_excerpt_text(context_store, excerpt_context, cx);
                    }
                }
                AssistantContext::Thread(thread_context) => {
@@ -934,11 +876,6 @@ pub fn refresh_context_store_text(
                // and doing the caching properly could be tricky (unless it's already handled by
                // the HttpClient?).
                AssistantContext::FetchedUrl(_) => {}
-                AssistantContext::Rules(user_rules_context) => {
-                    let context_store = context_store.clone();
-                    return Some(refresh_user_rules(context_store, user_rules_context, cx));
-                }
-                AssistantContext::Image(_) => {}
            }

            None
@@ -977,7 +914,6 @@ fn refresh_file_text(
 fn refresh_directory_text(
    context_store: Entity<ContextStore>,
    directory_context: &DirectoryContext,
-    directory_path: ProjectPath,
    cx: &App,
 ) -> Option<Task<()>> {
    let mut stale = false;
@@ -1002,8 +938,7 @@ fn refresh_directory_text(

    let id = directory_context.id;
    let worktree = directory_context.worktree.clone();
-    let entry_id = directory_context.entry_id;
-    let last_path = directory_path.path;
+    let path = directory_context.path.clone();
    Some(cx.spawn(async move |cx| {
        let context_buffers = context_buffers.await;
        context_store
@@ -1011,8 +946,7 @@ fn refresh_directory_text(
                let new_directory_context = DirectoryContext {
                    id,
                    worktree,
-                    entry_id,
-                    last_path,
+                    path,
                    context_buffers,
                };
                context_store.replace_context(AssistantContext::Directory(new_directory_context));
@@ -1043,27 +977,26 @@ fn refresh_symbol_text(
    }
 }

-fn refresh_selection_text(
+fn refresh_excerpt_text(
    context_store: Entity<ContextStore>,
-    selection_context: &SelectionContext,
+    excerpt_context: &ExcerptContext,
    cx: &App,
 ) -> Option<Task<()>> {
-    let id = selection_context.id;
-    let range = selection_context.range.clone();
-    let task = refresh_context_excerpt(&selection_context.context_buffer, range.clone(), cx);
+    let id = excerpt_context.id;
+    let range = excerpt_context.range.clone();
+    let task = refresh_context_excerpt(&excerpt_context.context_buffer, range.clone(), cx);
    if let Some(task) = task {
        Some(cx.spawn(async move |cx| {
            let (line_range, context_buffer) = task.await;
            context_store
                .update(cx, |context_store, _| {
-                    let new_selection_context = SelectionContext {
+                    let new_excerpt_context = ExcerptContext {
                        id,
                        range,
                        line_range,
                        context_buffer,
                    };
-                    context_store
-                        .replace_context(AssistantContext::Selection(new_selection_context));
+                    context_store.replace_context(AssistantContext::Excerpt(new_excerpt_context));
                })
                .ok();
        }))
@@ -1093,49 +1026,15 @@ fn refresh_thread_text(
    })
 }

-fn refresh_user_rules(
-    context_store: Entity<ContextStore>,
-    user_rules_context: &RulesContext,
+fn refresh_context_buffer(
+    context_buffer: &ContextBuffer,
    cx: &App,
-) -> Task<()> {
-    let id = user_rules_context.id;
-    let prompt_id = user_rules_context.prompt_id;
-    let Some(thread_store) = context_store.read(cx).thread_store.as_ref() else {
-        return Task::ready(());
-    };
-    let Ok(load_task) = thread_store.read_with(cx, |thread_store, cx| {
-        thread_store.load_rules(prompt_id, cx)
-    }) else {
-        return Task::ready(());
-    };
-    cx.spawn(async move |cx| {
-        if let Ok((metadata, text)) = load_task.await {
-            if let Some(title) = metadata.title.clone() {
-                context_store
-                    .update(cx, |context_store, _cx| {
-                        context_store.replace_context(AssistantContext::Rules(RulesContext {
-                            id,
-                            prompt_id,
-                            title,
-                            text: text.into(),
-                        }));
-                    })
-                    .ok();
-                return;
-            }
-        }
-        context_store
-            .update(cx, |context_store, cx| {
-                context_store.remove_context(id, cx);
-            })
-            .ok();
-    })
-}
-
-fn refresh_context_buffer(context_buffer: &ContextBuffer, cx: &App) -> Option<Task<ContextBuffer>> {
+) -> Option<impl Future<Output = ContextBuffer> + use<>> {
    let buffer = context_buffer.buffer.read(cx);
    if buffer.version.changed_since(&context_buffer.version) {
-        load_context_buffer(context_buffer.buffer.clone(), cx).log_err()
+        let (buffer_info, text_task) =
+            collect_buffer_info_and_text(context_buffer.buffer.clone(), cx).log_err()?;
+        Some(text_task.map(move |text| make_context_buffer(buffer_info, text)))
    } else {
        None
    }
@@ -1148,9 +1047,10 @@ fn refresh_context_excerpt(
 ) -> Option<impl Future<Output = (Range<Point>, ContextBuffer)> + use<>> {
    let buffer = context_buffer.buffer.read(cx);
    if buffer.version.changed_since(&context_buffer.version) {
-        let (line_range, context_buffer_task) =
-            load_context_buffer_range(context_buffer.buffer.clone(), range, cx).log_err()?;
-        Some(context_buffer_task.map(move |context_buffer| (line_range, context_buffer)))
+        let (line_range, buffer_info, text_task) =
+            collect_buffer_info_and_text_for_range(context_buffer.buffer.clone(), range, cx)
+                .log_err()?;
+        Some(text_task.map(move |text| (line_range, make_context_buffer(buffer_info, text))))
    } else {
        None
    }
@@ -1163,7 +1063,7 @@ fn refresh_context_symbol(
    let buffer = context_symbol.buffer.read(cx);
    let project_path = buffer.project_path(cx)?;
    if buffer.version.changed_since(&context_symbol.buffer_version) {
-        let (_line_range, context_buffer_task) = load_context_buffer_range(
+        let (_, buffer_info, text_task) = collect_buffer_info_and_text_for_range(
            context_symbol.buffer.clone(),
            context_symbol.enclosing_range.clone(),
            cx,
@@ -1172,8 +1072,15 @@ fn refresh_context_symbol(
        let name = context_symbol.id.name.clone();
        let range = context_symbol.id.range.clone();
        let enclosing_range = context_symbol.enclosing_range.clone();
-        Some(context_buffer_task.map(move |context_buffer| {
-            make_context_symbol(context_buffer, project_path, name, range, enclosing_range)
+        Some(text_task.map(move |text| {
+            make_context_symbol(
+                buffer_info,
+                project_path,
+                name,
+                range,
+                enclosing_range,
+                text,
+            )
        }))
    } else {
        None
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -24,7 +24,6 @@ use gpui::{
    WeakEntity, Window, point,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::ConfiguredModel;
 use language_model::{LanguageModelRegistry, report_assistant_event};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
@@ -1222,15 +1221,9 @@ impl InlineAssistant {
            self.prompt_history.pop_front();
        }

-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
-            return;
-        };
-
        assist
            .codegen
-            .update(cx, |codegen, cx| codegen.start(model, user_prompt, cx))
+            .update(cx, |codegen, cx| codegen.start(user_prompt, cx))
            .log_err();
    }

--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -1,4 +1,4 @@
-use crate::assistant_model_selector::AssistantModelSelector;
+use crate::assistant_model_selector::{AssistantModelSelector, ModelType};
 use crate::buffer_codegen::BufferCodegen;
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
@@ -20,7 +20,7 @@ use gpui::{
    Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window, anchored, deferred, point,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use language_model_selector::{ModelType, ToggleModelSelector};
+use language_model_selector::ToggleModelSelector;
 use parking_lot::Mutex;
 use settings::Settings;
 use std::cmp;
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -6,7 +6,7 @@ use crate::context::{AssistantContext, format_context_as_string};
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use buffer_diff::BufferDiff;
 use collections::HashSet;
-use editor::actions::{MoveUp, Paste};
+use editor::actions::MoveUp;
 use editor::{
    ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorEvent, EditorMode,
    EditorStyle, MultiBuffer,
@@ -14,8 +14,8 @@ use editor::{
 use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
-    Animation, AnimationExt, App, ClipboardEntry, Entity, EventEmitter, Focusable, Subscription,
-    Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
+    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, Subscription, Task, TextStyle,
+    WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
 use language::{Buffer, Language};
 use language_model::{ConfiguredModel, LanguageModelRegistry, LanguageModelRequestMessage};
@@ -34,7 +34,7 @@ use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
 use crate::context_store::{ContextStore, refresh_context_store_text};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::profile_selector::ProfileSelector;
-use crate::thread::{Thread, TokenUsageRatio};
+use crate::thread::{RequestKind, Thread, TokenUsageRatio};
 use crate::thread_store::ThreadStore;
 use crate::{
    AgentDiff, Chat, ChatMode, ExpandMessageEditor, NewThread, OpenAgentDiff, RemoveAllContext,
@@ -234,7 +234,7 @@ impl MessageEditor {
        }

        self.set_editor_is_expanded(false, cx);
-        self.send_to_model(window, cx);
+        self.send_to_model(RequestKind::Chat, window, cx);

        cx.notify();
    }
@@ -249,7 +249,12 @@ impl MessageEditor {
            .is_some()
    }

-    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn send_to_model(
+        &mut self,
+        request_kind: RequestKind,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
        let model_registry = LanguageModelRegistry::read_global(cx);
        let Some(ConfiguredModel { model, provider }) = model_registry.default_model() else {
            return;
@@ -271,7 +276,6 @@ impl MessageEditor {

        let refresh_task =
            refresh_context_store_text(self.context_store.clone(), &HashSet::default(), cx);
-        let wait_for_images = self.context_store.read(cx).wait_for_images(cx);

        let thread = self.thread.clone();
        let context_store = self.context_store.clone();
@@ -281,7 +285,6 @@ impl MessageEditor {
        cx.spawn(async move |this, cx| {
            let checkpoint = checkpoint.await.ok();
            refresh_task.await;
-            wait_for_images.await;

            thread
                .update(cx, |thread, cx| {
@@ -295,12 +298,7 @@ impl MessageEditor {
                    let excerpt_ids = context_store
                        .context()
                        .iter()
-                        .filter(|ctx| {
-                            matches!(
-                                ctx,
-                                AssistantContext::Selection(_) | AssistantContext::Image(_)
-                            )
-                        })
+                        .filter(|ctx| matches!(ctx, AssistantContext::Excerpt(_)))
                        .map(|ctx| ctx.id())
                        .collect::<Vec<_>>();

@@ -333,7 +331,7 @@ impl MessageEditor {
            thread
                .update(cx, |thread, cx| {
                    thread.advance_prompt_id();
-                    thread.send_to_model(model, cx);
+                    thread.send_to_model(model, request_kind, cx);
                })
                .log_err();
        })
@@ -347,7 +345,7 @@ impl MessageEditor {

        if cancelled {
            self.set_editor_is_expanded(false, cx);
-            self.send_to_model(window, cx);
+            self.send_to_model(RequestKind::Chat, window, cx);
        }
    }

@@ -377,34 +375,6 @@ impl MessageEditor {
        }
    }

-    fn paste(&mut self, _: &Paste, _: &mut Window, cx: &mut Context<Self>) {
-        let images = cx
-            .read_from_clipboard()
-            .map(|item| {
-                item.into_entries()
-                    .filter_map(|entry| {
-                        if let ClipboardEntry::Image(image) = entry {
-                            Some(image)
-                        } else {
-                            None
-                        }
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .unwrap_or_default();
-
-        if images.is_empty() {
-            return;
-        }
-        cx.stop_propagation();
-
-        self.context_store.update(cx, |store, cx| {
-            for image in images {
-                store.add_image(Arc::new(image), cx);
-            }
-        });
-    }
-
    fn handle_review_click(&self, window: &mut Window, cx: &mut Context<Self>) {
        AgentDiff::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
    }
@@ -480,7 +450,6 @@ impl MessageEditor {
            .on_action(cx.listener(Self::move_up))
            .on_action(cx.listener(Self::toggle_chat_mode))
            .on_action(cx.listener(Self::expand_message_editor))
-            .capture_action(cx.listener(Self::paste))
            .gap_2()
            .p_2()
            .bg(editor_bg_color)
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -1,6 +1,7 @@
 use std::fmt::Write as _;
 use std::io::Write;
 use std::ops::Range;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Instant;

@@ -16,7 +17,7 @@ use git::repository::DiffType;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
 use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelImage, LanguageModelKnownError, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelKnownError, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent,
    ModelRequestLimitReachedError, PaymentRequiredError, RequestUsage, Role, StopReason,
@@ -38,7 +39,14 @@ use crate::thread_store::{
    SerializedMessage, SerializedMessageSegment, SerializedThread, SerializedToolResult,
    SerializedToolUse, SharedProjectContext,
 };
-use crate::tool_use::{PendingToolUse, ToolUse, ToolUseMetadata, ToolUseState};
+use crate::tool_use::{PendingToolUse, ToolUse, ToolUseState, USING_TOOL_MARKER};
+
+#[derive(Debug, Clone, Copy)]
+pub enum RequestKind {
+    Chat,
+    /// Used when summarizing a thread.
+    Summarize,
+}

 #[derive(
    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize, JsonSchema,
@@ -97,7 +105,6 @@ pub struct Message {
    pub role: Role,
    pub segments: Vec<MessageSegment>,
    pub context: String,
-    pub images: Vec<LanguageModelImage>,
 }

 impl Message {
@@ -107,21 +114,12 @@ impl Message {
        self.segments.iter().all(|segment| segment.should_display())
    }

-    pub fn push_thinking(&mut self, text: &str, signature: Option<String>) {
-        if let Some(MessageSegment::Thinking {
-            text: segment,
-            signature: current_signature,
-        }) = self.segments.last_mut()
-        {
-            if let Some(signature) = signature {
-                *current_signature = Some(signature);
-            }
+    pub fn push_thinking(&mut self, text: &str) {
+        if let Some(MessageSegment::Thinking(segment)) = self.segments.last_mut() {
            segment.push_str(text);
        } else {
-            self.segments.push(MessageSegment::Thinking {
-                text: text.to_string(),
-                signature,
-            });
+            self.segments
+                .push(MessageSegment::Thinking(text.to_string()));
        }
    }

@@ -143,12 +141,11 @@ impl Message {
        for segment in &self.segments {
            match segment {
                MessageSegment::Text(text) => result.push_str(text),
-                MessageSegment::Thinking { text, .. } => {
-                    result.push_str("<think>\n");
+                MessageSegment::Thinking(text) => {
+                    result.push_str("<think>");
                    result.push_str(text);
-                    result.push_str("\n</think>");
+                    result.push_str("</think>");
                }
-                MessageSegment::RedactedThinking(_) => {}
            }
        }

@@ -159,19 +156,24 @@ impl Message {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum MessageSegment {
    Text(String),
-    Thinking {
-        text: String,
-        signature: Option<String>,
-    },
-    RedactedThinking(Vec<u8>),
+    Thinking(String),
 }

 impl MessageSegment {
-    pub fn should_display(&self) -> bool {
+    pub fn text_mut(&mut self) -> &mut String {
        match self {
-            Self::Text(text) => text.is_empty(),
-            Self::Thinking { text, .. } => text.is_empty(),
-            Self::RedactedThinking(_) => false,
+            Self::Text(text) => text,
+            Self::Thinking(text) => text,
+        }
+    }
+
+    pub fn should_display(&self) -> bool {
+        // We add USING_TOOL_MARKER when making a request that includes tool uses
+        // without non-whitespace text around them, and this can cause the model
+        // to mimic the pattern, so we consider those segments not displayable.
+        match self {
+            Self::Text(text) => text.is_empty() || text.trim() == USING_TOOL_MARKER,
+            Self::Thinking(text) => text.is_empty() || text.trim() == USING_TOOL_MARKER,
        }
    }
 }
@@ -354,7 +356,7 @@ impl Thread {
            last_restore_checkpoint: None,
            pending_checkpoint: None,
            tool_use: ToolUseState::new(tools.clone()),
-            action_log: cx.new(|_| ActionLog::new(project.clone())),
+            action_log: cx.new(|cx| ActionLog::new(project.clone(), cx)),
            initial_project_snapshot: {
                let project_snapshot = Self::project_snapshot(project, cx);
                cx.foreground_executor()
@@ -407,16 +409,12 @@ impl Thread {
                        .into_iter()
                        .map(|segment| match segment {
                            SerializedMessageSegment::Text { text } => MessageSegment::Text(text),
-                            SerializedMessageSegment::Thinking { text, signature } => {
-                                MessageSegment::Thinking { text, signature }
-                            }
-                            SerializedMessageSegment::RedactedThinking { data } => {
-                                MessageSegment::RedactedThinking(data)
+                            SerializedMessageSegment::Thinking { text } => {
+                                MessageSegment::Thinking(text)
                            }
                        })
                        .collect(),
                    context: message.context,
-                    images: Vec::new(),
                })
                .collect(),
            next_message_id,
@@ -433,7 +431,7 @@ impl Thread {
            prompt_builder,
            tools,
            tool_use,
-            action_log: cx.new(|_| ActionLog::new(project)),
+            action_log: cx.new(|cx| ActionLog::new(project, cx)),
            initial_project_snapshot: Task::ready(serialized.initial_project_snapshot).shared(),
            request_token_usage: serialized.request_token_usage,
            cumulative_token_usage: serialized.cumulative_token_usage,
@@ -749,19 +747,6 @@ impl Thread {
                }
            }

-            if let Some(message) = self.messages.iter_mut().find(|m| m.id == message_id) {
-                message.images = new_context
-                    .iter()
-                    .filter_map(|context| {
-                        if let AssistantContext::Image(image_context) = context {
-                            image_context.image_task.clone().now_or_never().flatten()
-                        } else {
-                            None
-                        }
-                    })
-                    .collect::<Vec<_>>();
-            }
-
            self.action_log.update(cx, |log, cx| {
                // Track all buffers added as context
                for ctx in &new_context {
@@ -780,16 +765,13 @@ impl Thread {
                                cx,
                            );
                        }
-                        AssistantContext::Selection(selection_context) => {
+                        AssistantContext::Excerpt(excerpt_context) => {
                            log.buffer_added_as_context(
-                                selection_context.context_buffer.buffer.clone(),
+                                excerpt_context.context_buffer.buffer.clone(),
                                cx,
                            );
                        }
-                        AssistantContext::FetchedUrl(_)
-                        | AssistantContext::Thread(_)
-                        | AssistantContext::Rules(_)
-                        | AssistantContext::Image(_) => {}
+                        AssistantContext::FetchedUrl(_) | AssistantContext::Thread(_) => {}
                    }
                }
            });
@@ -830,7 +812,6 @@ impl Thread {
            role,
            segments,
            context: String::new(),
-            images: Vec::new(),
        });
        self.touch_updated_at();
        cx.emit(ThreadEvent::MessageAdded(id));
@@ -882,10 +863,9 @@ impl Thread {
            for segment in &message.segments {
                match segment {
                    MessageSegment::Text(content) => text.push_str(content),
-                    MessageSegment::Thinking { text: content, .. } => {
+                    MessageSegment::Thinking(content) => {
                        text.push_str(&format!("<think>{}</think>", content))
                    }
-                    MessageSegment::RedactedThinking(_) => {}
                }
            }
            text.push('\n');
@@ -915,16 +895,8 @@ impl Thread {
                                MessageSegment::Text(text) => {
                                    SerializedMessageSegment::Text { text: text.clone() }
                                }
-                                MessageSegment::Thinking { text, signature } => {
-                                    SerializedMessageSegment::Thinking {
-                                        text: text.clone(),
-                                        signature: signature.clone(),
-                                    }
-                                }
-                                MessageSegment::RedactedThinking(data) => {
-                                    SerializedMessageSegment::RedactedThinking {
-                                        data: data.clone(),
-                                    }
+                                MessageSegment::Thinking(text) => {
+                                    SerializedMessageSegment::Thinking { text: text.clone() }
                                }
                            })
                            .collect(),
@@ -958,8 +930,13 @@ impl Thread {
        })
    }

-    pub fn send_to_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
-        let mut request = self.to_completion_request(cx);
+    pub fn send_to_model(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        request_kind: RequestKind,
+        cx: &mut Context<Self>,
+    ) {
+        let mut request = self.to_completion_request(request_kind, cx);
        if model.supports_tools() {
            request.tools = {
                let mut tools = Vec::new();
@@ -998,7 +975,11 @@ impl Thread {
        false
    }

-    pub fn to_completion_request(&self, cx: &mut Context<Self>) -> LanguageModelRequest {
+    pub fn to_completion_request(
+        &self,
+        request_kind: RequestKind,
+        cx: &mut Context<Self>,
+    ) -> LanguageModelRequest {
        let mut request = LanguageModelRequest {
            thread_id: Some(self.id.to_string()),
            prompt_id: Some(self.last_prompt_id.to_string()),
@@ -1045,57 +1026,34 @@ impl Thread {
                cache: false,
            };

-            self.tool_use
-                .attach_tool_results(message.id, &mut request_message);
+            match request_kind {
+                RequestKind::Chat => {
+                    self.tool_use
+                        .attach_tool_results(message.id, &mut request_message);
+                }
+                RequestKind::Summarize => {
+                    // We don't care about tool use during summarization.
+                    if self.tool_use.message_has_tool_results(message.id) {
+                        continue;
+                    }
+                }
+            }

-            if !message.context.is_empty() {
+            if !message.segments.is_empty() {
                request_message
                    .content
-                    .push(MessageContent::Text(message.context.to_string()));
+                    .push(MessageContent::Text(message.to_string()));
            }

-            if !message.images.is_empty() {
-                // Some providers only support image parts after an initial text part
-                if request_message.content.is_empty() {
-                    request_message
-                        .content
-                        .push(MessageContent::Text("Images attached by user:".to_string()));
+            match request_kind {
+                RequestKind::Chat => {
+                    self.tool_use
+                        .attach_tool_uses(message.id, &mut request_message);
                }
-
-                for image in &message.images {
-                    request_message
-                        .content
-                        .push(MessageContent::Image(image.clone()))
+                RequestKind::Summarize => {
+                    // We don't care about tool use during summarization.
                }
-            }
-
-            for segment in &message.segments {
-                match segment {
-                    MessageSegment::Text(text) => {
-                        if !text.is_empty() {
-                            request_message
-                                .content
-                                .push(MessageContent::Text(text.into()));
-                        }
-                    }
-                    MessageSegment::Thinking { text, signature } => {
-                        if !text.is_empty() {
-                            request_message.content.push(MessageContent::Thinking {
-                                text: text.into(),
-                                signature: signature.clone(),
-                            });
-                        }
-                    }
-                    MessageSegment::RedactedThinking(data) => {
-                        request_message
-                            .content
-                            .push(MessageContent::RedactedThinking(data.clone()));
-                    }
-                };
-            }
-
-            self.tool_use
-                .attach_tool_uses(message.id, &mut request_message);
+            };

            request.messages.push(request_message);
        }
@@ -1110,81 +1068,94 @@ impl Thread {
        request
    }

-    fn to_summarize_request(&self, added_user_message: String) -> LanguageModelRequest {
-        let mut request = LanguageModelRequest {
-            thread_id: None,
-            prompt_id: None,
-            messages: vec![],
-            tools: Vec::new(),
-            stop: Vec::new(),
-            temperature: None,
-        };
-
-        for message in &self.messages {
-            let mut request_message = LanguageModelRequestMessage {
-                role: message.role,
-                content: Vec::new(),
-                cache: false,
-            };
-
-            // Skip tool results during summarization.
-            if self.tool_use.message_has_tool_results(message.id) {
-                continue;
-            }
-
-            for segment in &message.segments {
-                match segment {
-                    MessageSegment::Text(text) => request_message
-                        .content
-                        .push(MessageContent::Text(text.clone())),
-                    MessageSegment::Thinking { .. } => {}
-                    MessageSegment::RedactedThinking(_) => {}
-                }
-            }
-
-            if request_message.content.is_empty() {
-                continue;
-            }
-
-            request.messages.push(request_message);
-        }
-
-        request.messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![MessageContent::Text(added_user_message)],
-            cache: false,
-        });
-
-        request
-    }
-
    fn attached_tracked_files_state(
        &self,
        messages: &mut Vec<LanguageModelRequestMessage>,
-        cx: &App,
+        cx: &mut App,
    ) {
-        const STALE_FILES_HEADER: &str = "These files changed since last read:";
+        let mut message = String::new();

-        let mut stale_message = String::new();
-
-        let action_log = self.action_log.read(cx);
-
-        for stale_file in action_log.stale_buffers(cx) {
-            let Some(file) = stale_file.read(cx).file() else {
-                continue;
-            };
-
-            if stale_message.is_empty() {
-                write!(&mut stale_message, "{}\n", STALE_FILES_HEADER).ok();
+        self.action_log.update(cx, |action_log, cx| {
+            let stale_files = action_log
+                .stale_buffers(cx)
+                .filter_map(|buffer| buffer.read(cx).file());
+            for (i, file) in stale_files.enumerate() {
+                if i == 0 {
+                    writeln!(&mut message, "These files changed since last read:").ok();
+                }
+                writeln!(&mut message, "- {}", file.full_path(cx).display()).ok();
            }

-            writeln!(&mut stale_message, "- {}", file.path().display()).ok();
-        }
+            if let Some(diagnostic_changes) = action_log.flush_diagnostic_changes(cx) {
+                let project = self.project.read(cx);
+                writeln!(
+                    &mut message,
+                    "Diagnostics have changed in the following files:",
+                )
+                .ok();
+                for change in diagnostic_changes {
+                    let path = change.project_path;
+                    let Some(worktree) = project.worktree_for_id(path.worktree_id, cx) else {
+                        continue;
+                    };
+                    let path = PathBuf::from(worktree.read(cx).root_name()).join(path.path);
+
+                    write!(&mut message, "- {} (", path.display()).ok();
+                    if change.fixed_diagnostic_count > 0 {
+                        write!(&mut message, "{} fixed", change.fixed_diagnostic_count).ok();
+                        if change.introduced_diagnostic_count > 0 {
+                            write!(
+                                &mut message,
+                                ", {} introduced",
+                                change.introduced_diagnostic_count
+                            )
+                            .ok();
+                        }
+                    } else if change.introduced_diagnostic_count > 0 {
+                        write!(
+                            &mut message,
+                            "{} introduced",
+                            change.introduced_diagnostic_count
+                        )
+                        .ok();
+                    }
+                    write!(&mut message, ") ").ok();
+
+                    if change.diagnostics.is_empty() {
+                        writeln!(&mut message, "No diagnostics remaining.").ok();
+                    } else {
+                        writeln!(&mut message, "Remaining diagnostics:").ok();
+                    }
+
+                    for entry in change.diagnostics {
+                        let mut lines = entry.diagnostic.message.split('\n');
+                        writeln!(
+                            &mut message,
+                            "    - line {}: {}",
+                            entry.range.start.0.row + 1,
+                            lines.next().unwrap()
+                        )
+                        .ok();
+                        for line in lines {
+                            writeln!(&mut message, "      {}", line).ok();
+                        }
+                    }
+
+                    if action_log
+                        .last_edited_buffer()
+                        .map_or(false, |last_edited| last_edited.consecutive_edit_count > 2)
+                    {
+                        writeln!(&mut message, "Because you've failed repeatedly, give up. Don't attempt to fix the diagnostics. Wait user input or continue with the next task.").ok();
+                        writeln!(&mut message, "Don't keep trying to fix the diagnostics. Stop and wait for the user to help you fix them.").ok();
+                    }
+                }
+            }
+        });

        let mut content = Vec::with_capacity(2);

-        if !stale_message.is_empty() {
-            content.push(stale_message.into());
+        if !message.is_empty() {
+            content.push(message.into());
        }

        if !content.is_empty() {
@@ -1211,12 +1182,6 @@ impl Thread {
            None
        };
        let prompt_id = self.last_prompt_id.clone();
-        let tool_use_metadata = ToolUseMetadata {
-            model: model.clone(),
-            thread_id: self.id.clone(),
-            prompt_id: prompt_id.clone(),
-        };
-
        let task = cx.spawn(async move |thread, cx| {
            let stream_completion_future = model.stream_completion_with_usage(request, &cx);
            let initial_token_usage =
@@ -1263,7 +1228,6 @@ impl Thread {
                                current_token_usage = token_usage;
                            }
                            LanguageModelCompletionEvent::Text(chunk) => {
-                                cx.emit(ThreadEvent::ReceivedTextChunk);
                                if let Some(last_message) = thread.messages.last_mut() {
                                    if last_message.role == Role::Assistant {
                                        last_message.push_text(&chunk);
@@ -1285,13 +1249,10 @@ impl Thread {
                                    };
                                }
                            }
-                            LanguageModelCompletionEvent::Thinking {
-                                text: chunk,
-                                signature,
-                            } => {
+                            LanguageModelCompletionEvent::Thinking(chunk) => {
                                if let Some(last_message) = thread.messages.last_mut() {
                                    if last_message.role == Role::Assistant {
-                                        last_message.push_thinking(&chunk, signature);
+                                        last_message.push_thinking(&chunk);
                                        cx.emit(ThreadEvent::StreamedAssistantThinking(
                                            last_message.id,
                                            chunk,
@@ -1304,10 +1265,7 @@ impl Thread {
                                        // will result in duplicating the text of the chunk in the rendered Markdown.
                                        thread.insert_message(
                                            Role::Assistant,
-                                            vec![MessageSegment::Thinking {
-                                                text: chunk.to_string(),
-                                                signature,
-                                            }],
+                                            vec![MessageSegment::Thinking(chunk.to_string())],
                                            cx,
                                        );
                                    };
@@ -1323,27 +1281,11 @@ impl Thread {
                                        thread.insert_message(Role::Assistant, vec![], cx)
                                    });

-                                let tool_use_id = tool_use.id.clone();
-                                let streamed_input = if tool_use.is_input_complete {
-                                    None
-                                } else {
-                                    Some((&tool_use.input).clone())
-                                };
-
-                                let ui_text = thread.tool_use.request_tool_use(
+                                thread.tool_use.request_tool_use(
                                    last_assistant_message_id,
                                    tool_use,
-                                    tool_use_metadata.clone(),
                                    cx,
                                );
-
-                                if let Some(input) = streamed_input {
-                                    cx.emit(ThreadEvent::StreamedToolUse {
-                                        tool_use_id,
-                                        ui_text,
-                                        input,
-                                    });
-                                }
                            }
                        }

@@ -1362,12 +1304,7 @@ impl Thread {
                        .pending_completions
                        .retain(|completion| completion.id != pending_completion_id);

-                    // If there is a response without tool use, summarize the message. Otherwise,
-                    // allow two tool uses before summarizing.
-                    if thread.summary.is_none()
-                        && thread.messages.len() >= 2
-                        && (!thread.has_pending_tool_uses() || thread.messages.len() >= 6)
-                    {
+                    if thread.summary.is_none() && thread.messages.len() >= 2 {
                        thread.summarize(cx);
                    }
                })?;
@@ -1477,12 +1414,18 @@ impl Thread {
            return;
        }

-        let added_user_message = "Generate a concise 3-7 word title for this conversation, omitting punctuation. \
-            Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`. \
-            If the conversation is about a specific subject, include it in the title. \
-            Be descriptive. DO NOT speak in the first person.";
-
-        let request = self.to_summarize_request(added_user_message.into());
+        let mut request = self.to_completion_request(RequestKind::Summarize, cx);
+        request.messages.push(LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![
+                "Generate a concise 3-7 word title for this conversation, omitting punctuation. \
+                 Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`. \
+                 If the conversation is about a specific subject, include it in the title. \
+                 Be descriptive. DO NOT speak in the first person."
+                    .into(),
+            ],
+            cache: false,
+        });

        self.pending_summary = cx.spawn(async move |this, cx| {
            async move {
@@ -1544,14 +1487,21 @@ impl Thread {
            return None;
        }

-        let added_user_message = "Generate a detailed summary of this conversation. Include:\n\
-             1. A brief overview of what was discussed\n\
-             2. Key facts or information discovered\n\
-             3. Outcomes or conclusions reached\n\
-             4. Any action items or next steps if any\n\
-             Format it in Markdown with headings and bullet points.";
+        let mut request = self.to_completion_request(RequestKind::Summarize, cx);

-        let request = self.to_summarize_request(added_user_message.into());
+        request.messages.push(LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![
+                "Generate a detailed summary of this conversation. Include:\n\
+                1. A brief overview of what was discussed\n\
+                2. Key facts or information discovered\n\
+                3. Outcomes or conclusions reached\n\
+                4. Any action items or next steps if any\n\
+                Format it in Markdown with headings and bullet points."
+                    .into(),
+            ],
+            cache: false,
+        });

        let task = cx.spawn(async move |thread, cx| {
            let stream = model.stream_completion_text(request, &cx);
@@ -1599,7 +1549,7 @@ impl Thread {

    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) -> Vec<PendingToolUse> {
        self.auto_capture_telemetry(cx);
-        let request = self.to_completion_request(cx);
+        let request = self.to_completion_request(RequestKind::Chat, cx);
        let messages = Arc::new(request.messages);
        let pending_tool_uses = self
            .tool_use
@@ -1711,7 +1661,7 @@ impl Thread {
            if let Some(ConfiguredModel { model, .. }) = model_registry.default_model() {
                self.attach_tool_results(cx);
                if !canceled {
-                    self.send_to_model(model, cx);
+                    self.send_to_model(model, RequestKind::Chat, cx);
                }
            }
        }
@@ -1724,10 +1674,9 @@ impl Thread {

    /// Insert an empty message to be populated with tool results upon send.
    pub fn attach_tool_results(&mut self, cx: &mut Context<Self>) {
-        // Tool results are assumed to be waiting on the next message id, so they will populate
-        // this empty message before sending to model. Would prefer this to be more straightforward.
-        self.insert_message(Role::User, vec![], cx);
-        self.auto_capture_telemetry(cx);
+        // TODO: Don't insert a dummy user message here. Ensure this works with the thinking model.
+        // Insert a user message to contain the tool results.
+        self.insert_user_message("Here are the tool results.", Vec::new(), None, cx);
    }

    /// Cancels the last pending completion, if there are any pending.
@@ -1813,7 +1762,7 @@ impl Thread {
                thread_data,
                final_project_snapshot
            );
-            client.telemetry().flush_events().await;
+            client.telemetry().flush_events();

            Ok(())
        })
@@ -1858,7 +1807,7 @@ impl Thread {
                    thread_data,
                    final_project_snapshot
                );
-                client.telemetry().flush_events().await;
+                client.telemetry().flush_events();

                Ok(())
            })
@@ -2006,10 +1955,9 @@ impl Thread {
            for segment in &message.segments {
                match segment {
                    MessageSegment::Text(text) => writeln!(markdown, "{}\n", text)?,
-                    MessageSegment::Thinking { text, .. } => {
-                        writeln!(markdown, "<think>\n{}\n</think>\n", text)?
+                    MessageSegment::Thinking(text) => {
+                        writeln!(markdown, "<think>{}</think>\n", text)?
                    }
-                    MessageSegment::RedactedThinking(_) => {}
                }
            }

@@ -2114,7 +2062,7 @@ impl Thread {
                            github_login = github_login
                        );

-                        client.telemetry().flush_events().await;
+                        client.telemetry().flush_events();
                    }
                }
            })
@@ -2232,14 +2180,8 @@ pub enum ThreadEvent {
    ShowError(ThreadError),
    UsageUpdated(RequestUsage),
    StreamedCompletion,
-    ReceivedTextChunk,
    StreamedAssistantText(MessageId, String),
    StreamedAssistantThinking(MessageId, String),
-    StreamedToolUse {
-        tool_use_id: LanguageModelToolUseId,
-        ui_text: Arc<str>,
-        input: serde_json::Value,
-    },
    Stopped(Result<StopReason, Arc<anyhow::Error>>),
    MessageAdded(MessageId),
    MessageEdited(MessageId),
@@ -2342,7 +2284,9 @@ fn main() {{
        assert_eq!(message.context, expected_context);

        // Check message in request
-        let request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        assert_eq!(request.messages.len(), 2);
        let expected_full_message = format!("{}Please explain this code", expected_context);
@@ -2432,7 +2376,9 @@ fn main() {{
        assert!(message3.context.contains("file3.rs"));

        // Check entire request to make sure all contexts are properly included
-        let request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        // The request should contain all 3 messages
        assert_eq!(request.messages.len(), 4);
@@ -2482,7 +2428,9 @@ fn main() {{
        assert_eq!(message.context, "");

        // Check message in request
-        let request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        assert_eq!(request.messages.len(), 2);
        assert_eq!(
@@ -2500,7 +2448,9 @@ fn main() {{
        assert_eq!(message2.context, "");

        // Check that both messages appear in the request
-        let request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        assert_eq!(request.messages.len(), 3);
        assert_eq!(
@@ -2540,7 +2490,9 @@ fn main() {{
        });

        // Create a request and check that it doesn't have a stale buffer warning yet
-        let initial_request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let initial_request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        // Make sure we don't have a stale file warning yet
        let has_stale_warning = initial_request.messages.iter().any(|msg| {
@@ -2568,7 +2520,9 @@ fn main() {{
        });

        // Create a new request and check for the stale buffer warning
-        let new_request = thread.update(cx, |thread, cx| thread.to_completion_request(cx));
+        let new_request = thread.update(cx, |thread, cx| {
+            thread.to_completion_request(RequestKind::Chat, cx)
+        });

        // We should have a stale file warning as the last message
        let last_message = new_request
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -24,8 +24,8 @@ use heed::types::SerdeBincode;
 use language_model::{LanguageModelToolUseId, Role, TokenUsage};
 use project::{Project, Worktree};
 use prompt_store::{
-    ProjectContext, PromptBuilder, PromptId, PromptMetadata, PromptStore, PromptsUpdatedEvent,
-    RulesFileContext, UserPromptId, UserRulesContext, WorktreeContext,
+    DefaultUserRulesContext, ProjectContext, PromptBuilder, PromptId, PromptStore,
+    PromptsUpdatedEvent, RulesFileContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
 use settings::{Settings as _, SettingsStore};
@@ -62,7 +62,6 @@ pub struct ThreadStore {
    project: Entity<Project>,
    tools: Entity<ToolWorkingSet>,
    prompt_builder: Arc<PromptBuilder>,
-    prompt_store: Option<Entity<PromptStore>>,
    context_server_manager: Entity<ContextServerManager>,
    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SerializedThreadMetadata>,
@@ -136,7 +135,6 @@ impl ThreadStore {
        let (ready_tx, ready_rx) = oneshot::channel();
        let mut ready_tx = Some(ready_tx);
        let reload_system_prompt_task = cx.spawn({
-            let prompt_store = prompt_store.clone();
            async move |thread_store, cx| {
                loop {
                    let Some(reload_task) = thread_store
@@ -160,7 +158,6 @@ impl ThreadStore {
            project,
            tools,
            prompt_builder,
-            prompt_store,
            context_server_manager,
            context_server_tool_ids: HashMap::default(),
            threads: Vec::new(),
@@ -248,7 +245,7 @@ impl ThreadStore {
            let default_user_rules = default_user_rules
                .into_iter()
                .flat_map(|(contents, prompt_metadata)| match contents {
-                    Ok(contents) => Some(UserRulesContext {
+                    Ok(contents) => Some(DefaultUserRulesContext {
                        uuid: match prompt_metadata.id {
                            PromptId::User { uuid } => uuid,
                            PromptId::EditWorkflow => return None,
@@ -349,27 +346,6 @@ impl ThreadStore {
        self.context_server_manager.clone()
    }

-    pub fn prompt_store(&self) -> Option<Entity<PromptStore>> {
-        self.prompt_store.clone()
-    }
-
-    pub fn load_rules(
-        &self,
-        prompt_id: UserPromptId,
-        cx: &App,
-    ) -> Task<Result<(PromptMetadata, String)>> {
-        let prompt_id = PromptId::User { uuid: prompt_id };
-        let Some(prompt_store) = self.prompt_store.as_ref() else {
-            return Task::ready(Err(anyhow!("Prompt store unexpectedly missing.")));
-        };
-        let prompt_store = prompt_store.read(cx);
-        let Some(metadata) = prompt_store.metadata(prompt_id) else {
-            return Task::ready(Err(anyhow!("User rules not found in library.")));
-        };
-        let text_task = prompt_store.load(prompt_id, cx);
-        cx.background_spawn(async move { Ok((metadata, text_task.await?)) })
-    }
-
    pub fn tools(&self) -> Entity<ToolWorkingSet> {
        self.tools.clone()
    }
@@ -684,18 +660,9 @@ pub struct SerializedMessage {
 #[serde(tag = "type")]
 pub enum SerializedMessageSegment {
    #[serde(rename = "text")]
-    Text {
-        text: String,
-    },
+    Text { text: String },
    #[serde(rename = "thinking")]
-    Thinking {
-        text: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        signature: Option<String>,
-    },
-    RedactedThinking {
-        data: Vec<u8>,
-    },
+    Thinking { text: String },
 }

 #[derive(Debug, Serialize, Deserialize)]
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -7,13 +7,13 @@ use futures::FutureExt as _;
 use futures::future::Shared;
 use gpui::{App, Entity, SharedString, Task};
 use language_model::{
-    LanguageModel, LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolResult,
+    LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolResult,
    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
 };
 use ui::IconName;
 use util::truncate_lines_to_byte_limit;

-use crate::thread::{MessageId, PromptId, ThreadId};
+use crate::thread::MessageId;
 use crate::thread_store::SerializedMessage;

 #[derive(Debug)]
@@ -27,6 +27,8 @@ pub struct ToolUse {
    pub needs_confirmation: bool,
 }

+pub const USING_TOOL_MARKER: &str = "Using tool:";
+
 pub struct ToolUseState {
    tools: Entity<ToolWorkingSet>,
    tool_uses_by_assistant_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
@@ -34,7 +36,6 @@ pub struct ToolUseState {
    tool_results: HashMap<LanguageModelToolUseId, LanguageModelToolResult>,
    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
    tool_result_cards: HashMap<LanguageModelToolUseId, AnyToolCard>,
-    tool_use_metadata_by_id: HashMap<LanguageModelToolUseId, ToolUseMetadata>,
 }

 impl ToolUseState {
@@ -46,7 +47,6 @@ impl ToolUseState {
            tool_results: HashMap::default(),
            pending_tool_uses_by_id: HashMap::default(),
            tool_result_cards: HashMap::default(),
-            tool_use_metadata_by_id: HashMap::default(),
        }
    }

@@ -73,7 +73,6 @@ impl ToolUseState {
                                id: tool_use.id.clone(),
                                name: tool_use.name.clone().into(),
                                input: tool_use.input.clone(),
-                                is_input_complete: true,
                            })
                            .collect::<Vec<_>>();

@@ -175,9 +174,6 @@ impl ToolUseState {
                        PendingToolUseStatus::Error(ref err) => {
                            ToolUseStatus::Error(err.clone().into())
                        }
-                        PendingToolUseStatus::InputStillStreaming => {
-                            ToolUseStatus::InputStillStreaming
-                        }
                    }
                } else {
                    ToolUseStatus::Pending
@@ -194,12 +190,7 @@ impl ToolUseState {
            tool_uses.push(ToolUse {
                id: tool_use.id.clone(),
                name: tool_use.name.clone().into(),
-                ui_text: self.tool_ui_label(
-                    &tool_use.name,
-                    &tool_use.input,
-                    tool_use.is_input_complete,
-                    cx,
-                ),
+                ui_text: self.tool_ui_label(&tool_use.name, &tool_use.input, cx),
                input: tool_use.input.clone(),
                status,
                icon,
@@ -214,15 +205,10 @@ impl ToolUseState {
        &self,
        tool_name: &str,
        input: &serde_json::Value,
-        is_input_complete: bool,
        cx: &App,
    ) -> SharedString {
        if let Some(tool) = self.tools.read(cx).tool(tool_name, cx) {
-            if is_input_complete {
-                tool.ui_text(input).into()
-            } else {
-                tool.still_streaming_ui_text(input).into()
-            }
+            tool.ui_text(input).into()
        } else {
            format!("Unknown tool {tool_name:?}").into()
        }
@@ -268,52 +254,20 @@ impl ToolUseState {
        &mut self,
        assistant_message_id: MessageId,
        tool_use: LanguageModelToolUse,
-        metadata: ToolUseMetadata,
        cx: &App,
-    ) -> Arc<str> {
-        let tool_uses = self
-            .tool_uses_by_assistant_message
+    ) {
+        self.tool_uses_by_assistant_message
            .entry(assistant_message_id)
-            .or_default();
+            .or_default()
+            .push(tool_use.clone());

-        let mut existing_tool_use_found = false;
-
-        for existing_tool_use in tool_uses.iter_mut() {
-            if existing_tool_use.id == tool_use.id {
-                *existing_tool_use = tool_use.clone();
-                existing_tool_use_found = true;
-            }
-        }
-
-        if !existing_tool_use_found {
-            tool_uses.push(tool_use.clone());
-        }
-
-        let status = if tool_use.is_input_complete {
-            self.tool_use_metadata_by_id
-                .insert(tool_use.id.clone(), metadata);
-
-            // The tool use is being requested by the Assistant, so we want to
-            // attach the tool results to the next user message.
-            let next_user_message_id = MessageId(assistant_message_id.0 + 1);
-            self.tool_uses_by_user_message
-                .entry(next_user_message_id)
-                .or_default()
-                .push(tool_use.id.clone());
-
-            PendingToolUseStatus::Idle
-        } else {
-            PendingToolUseStatus::InputStillStreaming
-        };
-
-        let ui_text: Arc<str> = self
-            .tool_ui_label(
-                &tool_use.name,
-                &tool_use.input,
-                tool_use.is_input_complete,
-                cx,
-            )
-            .into();
+        // The tool use is being requested by the Assistant, so we want to
+        // attach the tool results to the next user message.
+        let next_user_message_id = MessageId(assistant_message_id.0 + 1);
+        self.tool_uses_by_user_message
+            .entry(next_user_message_id)
+            .or_default()
+            .push(tool_use.id.clone());

        self.pending_tool_uses_by_id.insert(
            tool_use.id.clone(),
@@ -321,13 +275,13 @@ impl ToolUseState {
                assistant_message_id,
                id: tool_use.id,
                name: tool_use.name.clone(),
-                ui_text: ui_text.clone(),
+                ui_text: self
+                    .tool_ui_label(&tool_use.name, &tool_use.input, cx)
+                    .into(),
                input: tool_use.input,
-                status,
+                status: PendingToolUseStatus::Idle,
            },
        );
-
-        ui_text
    }

    pub fn run_pending_tool(
@@ -373,21 +327,7 @@ impl ToolUseState {
        output: Result<String>,
        cx: &App,
    ) -> Option<PendingToolUse> {
-        let metadata = self.tool_use_metadata_by_id.remove(&tool_use_id);
-
-        telemetry::event!(
-            "Agent Tool Finished",
-            model = metadata
-                .as_ref()
-                .map(|metadata| metadata.model.telemetry_id()),
-            model_provider = metadata
-                .as_ref()
-                .map(|metadata| metadata.model.provider_id().to_string()),
-            thread_id = metadata.as_ref().map(|metadata| metadata.thread_id.clone()),
-            prompt_id = metadata.as_ref().map(|metadata| metadata.prompt_id.clone()),
-            tool_name,
-            success = output.is_ok()
-        );
+        telemetry::event!("Agent Tool Finished", tool_name, success = output.is_ok());

        match output {
            Ok(tool_result) => {
@@ -450,8 +390,28 @@ impl ToolUseState {
        request_message: &mut LanguageModelRequestMessage,
    ) {
        if let Some(tool_uses) = self.tool_uses_by_assistant_message.get(&message_id) {
+            let mut found_tool_use = false;
+
            for tool_use in tool_uses {
                if self.tool_results.contains_key(&tool_use.id) {
+                    if !found_tool_use {
+                        // The API fails if a message contains a tool use without any (non-whitespace) text around it
+                        match request_message.content.last_mut() {
+                            Some(MessageContent::Text(txt)) => {
+                                if txt.is_empty() {
+                                    txt.push_str(USING_TOOL_MARKER);
+                                }
+                            }
+                            None | Some(_) => {
+                                request_message
+                                    .content
+                                    .push(MessageContent::Text(USING_TOOL_MARKER.into()));
+                            }
+                        };
+                    }
+
+                    found_tool_use = true;
+
                    // Do not send tool uses until they are completed
                    request_message
                        .content
@@ -517,7 +477,6 @@ pub struct Confirmation {

 #[derive(Debug, Clone)]
 pub enum PendingToolUseStatus {
-    InputStillStreaming,
    Idle,
    NeedsConfirmation(Arc<Confirmation>),
    Running { _task: Shared<Task<()>> },
@@ -537,10 +496,3 @@ impl PendingToolUseStatus {
        matches!(self, PendingToolUseStatus::NeedsConfirmation { .. })
    }
 }
-
-#[derive(Clone)]
-pub struct ToolUseMetadata {
-    pub model: Arc<dyn LanguageModel>,
-    pub thread_id: ThreadId,
-    pub prompt_id: PromptId,
-}
--- a/crates/agent/src/ui/agent_notification.rs
+++ b/crates/agent/src/ui/agent_notification.rs
@@ -12,7 +12,6 @@ pub struct AgentNotification {
    title: SharedString,
    caption: SharedString,
    icon: IconName,
-    project_name: Option<SharedString>,
 }

 impl AgentNotification {
@@ -20,13 +19,11 @@ impl AgentNotification {
        title: impl Into<SharedString>,
        caption: impl Into<SharedString>,
        icon: IconName,
-        project_name: Option<impl Into<SharedString>>,
    ) -> Self {
        Self {
            title: title.into(),
            caption: caption.into(),
            icon,
-            project_name: project_name.map(|name| name.into()),
        }
    }

@@ -133,34 +130,11 @@ impl Render for AgentNotification {
                                    .child(gradient_overflow()),
                            )
                            .child(
-                                h_flex()
+                                div()
                                    .relative()
-                                    .gap_1p5()
                                    .text_size(px(12.))
                                    .text_color(cx.theme().colors().text_muted)
                                    .truncate()
-                                    .when_some(
-                                        self.project_name.clone(),
-                                        |description, project_name| {
-                                            description.child(
-                                                h_flex()
-                                                    .gap_1p5()
-                                                    .child(
-                                                        div()
-                                                            .max_w_16()
-                                                            .truncate()
-                                                            .child(project_name),
-                                                    )
-                                                    .child(
-                                                        div().size(px(3.)).rounded_full().bg(cx
-                                                            .theme()
-                                                            .colors()
-                                                            .text
-                                                            .opacity(0.5)),
-                                                    ),
-                                            )
-                                        },
-                                    )
                                    .child(self.caption.clone())
                                    .child(gradient_overflow()),
                            ),
--- a/crates/agent/src/ui/context_pill.rs
+++ b/crates/agent/src/ui/context_pill.rs
@@ -1,14 +1,11 @@
-use std::sync::Arc;
 use std::{rc::Rc, time::Duration};

 use file_icons::FileIcons;
-use futures::FutureExt;
-use gpui::{Animation, AnimationExt as _, Image, MouseButton, pulsating_between};
-use gpui::{ClickEvent, Task};
-use language_model::LanguageModelImage;
-use ui::{IconButtonShape, Tooltip, prelude::*, tooltip_container};
+use gpui::ClickEvent;
+use gpui::{Animation, AnimationExt as _, pulsating_between};
+use ui::{IconButtonShape, Tooltip, prelude::*};

-use crate::context::{AssistantContext, ContextId, ContextKind, ImageContext};
+use crate::context::{AssistantContext, ContextId, ContextKind};

 #[derive(IntoElement)]
 pub enum ContextPill {
@@ -123,100 +120,74 @@ impl RenderOnce for ContextPill {
                on_remove,
                focused,
                on_click,
-            } => {
-                let status_is_error = matches!(context.status, ContextStatus::Error { .. });
-
-                base_pill
-                    .pr(if on_remove.is_some() { px(2.) } else { px(4.) })
-                    .map(|pill| {
-                        if status_is_error {
-                            pill.bg(cx.theme().status().error_background)
-                                .border_color(cx.theme().status().error_border)
-                        } else if *focused {
-                            pill.bg(color.element_background)
-                                .border_color(color.border_focused)
-                        } else {
-                            pill.bg(color.element_background)
-                                .border_color(color.border.opacity(0.5))
-                        }
-                    })
-                    .child(
-                        h_flex()
-                            .id("context-data")
-                            .gap_1()
-                            .child(
-                                div().max_w_64().child(
-                                    Label::new(context.name.clone())
-                                        .size(LabelSize::Small)
-                                        .truncate(),
-                                ),
-                            )
-                            .when_some(context.parent.as_ref(), |element, parent_name| {
-                                if *dupe_name {
-                                    element.child(
-                                        Label::new(parent_name.clone())
-                                            .size(LabelSize::XSmall)
-                                            .color(Color::Muted),
-                                    )
-                                } else {
-                                    element
-                                }
-                            })
-                            .when_some(context.tooltip.as_ref(), |element, tooltip| {
-                                element.tooltip(Tooltip::text(tooltip.clone()))
-                            })
-                            .map(|element| match &context.status {
-                                ContextStatus::Ready => element
-                                    .when_some(
-                                        context.render_preview.as_ref(),
-                                        |element, render_preview| {
-                                            element.hoverable_tooltip({
-                                                let render_preview = render_preview.clone();
-                                                move |_, cx| {
-                                                    cx.new(|_| ContextPillPreview {
-                                                        render_preview: render_preview.clone(),
-                                                    })
-                                                    .into()
-                                                }
-                                            })
-                                        },
-                                    )
-                                    .into_any(),
-                                ContextStatus::Loading { message } => element
-                                    .tooltip(ui::Tooltip::text(message.clone()))
-                                    .with_animation(
-                                        "pulsating-ctx-pill",
-                                        Animation::new(Duration::from_secs(2))
-                                            .repeat()
-                                            .with_easing(pulsating_between(0.4, 0.8)),
-                                        |label, delta| label.opacity(delta),
-                                    )
-                                    .into_any_element(),
-                                ContextStatus::Error { message } => element
-                                    .tooltip(ui::Tooltip::text(message.clone()))
-                                    .into_any_element(),
+            } => base_pill
+                .bg(color.element_background)
+                .border_color(if *focused {
+                    color.border_focused
+                } else {
+                    color.border.opacity(0.5)
+                })
+                .pr(if on_remove.is_some() { px(2.) } else { px(4.) })
+                .child(
+                    h_flex()
+                        .id("context-data")
+                        .gap_1()
+                        .child(
+                            div().max_w_64().child(
+                                Label::new(context.name.clone())
+                                    .size(LabelSize::Small)
+                                    .truncate(),
+                            ),
+                        )
+                        .when_some(context.parent.as_ref(), |element, parent_name| {
+                            if *dupe_name {
+                                element.child(
+                                    Label::new(parent_name.clone())
+                                        .size(LabelSize::XSmall)
+                                        .color(Color::Muted),
+                                )
+                            } else {
+                                element
+                            }
+                        })
+                        .when_some(context.tooltip.as_ref(), |element, tooltip| {
+                            element.tooltip(Tooltip::text(tooltip.clone()))
+                        }),
+                )
+                .when_some(on_remove.as_ref(), |element, on_remove| {
+                    element.child(
+                        IconButton::new(("remove", context.id.0), IconName::Close)
+                            .shape(IconButtonShape::Square)
+                            .icon_size(IconSize::XSmall)
+                            .tooltip(Tooltip::text("Remove Context"))
+                            .on_click({
+                                let on_remove = on_remove.clone();
+                                move |event, window, cx| on_remove(event, window, cx)
                            }),
                    )
-                    .when_some(on_remove.as_ref(), |element, on_remove| {
-                        element.child(
-                            IconButton::new(("remove", context.id.0), IconName::Close)
-                                .shape(IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .tooltip(Tooltip::text("Remove Context"))
-                                .on_click({
-                                    let on_remove = on_remove.clone();
-                                    move |event, window, cx| on_remove(event, window, cx)
-                                }),
-                        )
-                    })
-                    .when_some(on_click.as_ref(), |element, on_click| {
-                        let on_click = on_click.clone();
+                })
+                .when_some(on_click.as_ref(), |element, on_click| {
+                    let on_click = on_click.clone();
+                    element
+                        .cursor_pointer()
+                        .on_click(move |event, window, cx| on_click(event, window, cx))
+                })
+                .map(|element| {
+                    if context.summarizing {
                        element
-                            .cursor_pointer()
-                            .on_click(move |event, window, cx| on_click(event, window, cx))
-                    })
-                    .into_any_element()
-            }
+                            .tooltip(ui::Tooltip::text("Summarizing..."))
+                            .with_animation(
+                                "pulsating-ctx-pill",
+                                Animation::new(Duration::from_secs(2))
+                                    .repeat()
+                                    .with_easing(pulsating_between(0.4, 0.8)),
+                                |label, delta| label.opacity(delta),
+                            )
+                            .into_any_element()
+                    } else {
+                        element.into_any()
+                    }
+                }),
            ContextPill::Suggested {
                name,
                icon_path: _,
@@ -227,15 +198,15 @@ impl RenderOnce for ContextPill {
                .cursor_pointer()
                .pr_1()
                .border_dashed()
-                .map(|pill| {
-                    if *focused {
-                        pill.border_color(color.border_focused)
-                            .bg(color.element_background.opacity(0.5))
-                    } else {
-                        pill.border_color(color.border)
-                    }
+                .border_color(if *focused {
+                    color.border_focused
+                } else {
+                    color.border
                })
                .hover(|style| style.bg(color.element_hover.opacity(0.5)))
+                .when(*focused, |this| {
+                    this.bg(color.element_background.opacity(0.5))
+                })
                .child(
                    div().max_w_64().child(
                        Label::new(name.clone())
@@ -256,13 +227,6 @@ impl RenderOnce for ContextPill {
    }
 }

-pub enum ContextStatus {
-    Ready,
-    Loading { message: SharedString },
-    Error { message: SharedString },
-}
-
-#[derive(RegisterComponent)]
 pub struct AddedContext {
    pub id: ContextId,
    pub kind: ContextKind,
@@ -270,15 +234,14 @@ pub struct AddedContext {
    pub parent: Option<SharedString>,
    pub tooltip: Option<SharedString>,
    pub icon_path: Option<SharedString>,
-    pub status: ContextStatus,
-    pub render_preview: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyElement + 'static>>,
+    pub summarizing: bool,
 }

 impl AddedContext {
    pub fn new(context: &AssistantContext, cx: &App) -> AddedContext {
        match context {
            AssistantContext::File(file_context) => {
-                let full_path = file_context.context_buffer.full_path(cx);
+                let full_path = file_context.context_buffer.file.full_path(cx);
                let full_path_string: SharedString =
                    full_path.to_string_lossy().into_owned().into();
                let name = full_path
@@ -296,20 +259,15 @@ impl AddedContext {
                    parent,
                    tooltip: Some(full_path_string),
                    icon_path: FileIcons::get_icon(&full_path, cx),
-                    status: ContextStatus::Ready,
-                    render_preview: None,
+                    summarizing: false,
                }
            }

            AssistantContext::Directory(directory_context) => {
-                let worktree = directory_context.worktree.read(cx);
-                // If the directory no longer exists, use its last known path.
-                let full_path = worktree
-                    .entry_for_id(directory_context.entry_id)
-                    .map_or_else(
-                        || directory_context.last_path.clone(),
-                        |entry| worktree.full_path(&entry.path).into(),
-                    );
+                let full_path = directory_context
+                    .worktree
+                    .read(cx)
+                    .full_path(&directory_context.path);
                let full_path_string: SharedString =
                    full_path.to_string_lossy().into_owned().into();
                let name = full_path
@@ -327,8 +285,7 @@ impl AddedContext {
                    parent,
                    tooltip: Some(full_path_string),
                    icon_path: None,
-                    status: ContextStatus::Ready,
-                    render_preview: None,
+                    summarizing: false,
                }
            }

@@ -339,12 +296,11 @@ impl AddedContext {
                parent: None,
                tooltip: None,
                icon_path: None,
-                status: ContextStatus::Ready,
-                render_preview: None,
+                summarizing: false,
            },

-            AssistantContext::Selection(selection_context) => {
-                let full_path = selection_context.context_buffer.full_path(cx);
+            AssistantContext::Excerpt(excerpt_context) => {
+                let full_path = excerpt_context.context_buffer.file.full_path(cx);
                let mut full_path_string = full_path.to_string_lossy().into_owned();
                let mut name = full_path
                    .file_name()
@@ -353,8 +309,8 @@ impl AddedContext {

                let line_range_text = format!(
                    " ({}-{})",
-                    selection_context.line_range.start.row + 1,
-                    selection_context.line_range.end.row + 1
+                    excerpt_context.line_range.start.row + 1,
+                    excerpt_context.line_range.end.row + 1
                );

                full_path_string.push_str(&line_range_text);
@@ -366,25 +322,13 @@ impl AddedContext {
                    .map(|n| n.to_string_lossy().into_owned().into());

                AddedContext {
-                    id: selection_context.id,
-                    kind: ContextKind::Selection,
+                    id: excerpt_context.id,
+                    kind: ContextKind::File, // Use File icon for excerpts
                    name: name.into(),
                    parent,
-                    tooltip: None,
+                    tooltip: Some(full_path_string.into()),
                    icon_path: FileIcons::get_icon(&full_path, cx),
-                    status: ContextStatus::Ready,
-                    render_preview: Some(Rc::new({
-                        let content = selection_context.context_buffer.text.clone();
-                        move |_, cx| {
-                            div()
-                                .id("context-pill-selection-preview")
-                                .overflow_scroll()
-                                .max_w_128()
-                                .max_h_96()
-                                .child(Label::new(content.clone()).buffer_font(cx))
-                                .into_any_element()
-                        }
-                    })),
+                    summarizing: false,
                }
            }

@@ -395,8 +339,7 @@ impl AddedContext {
                parent: None,
                tooltip: None,
                icon_path: None,
-                status: ContextStatus::Ready,
-                render_preview: None,
+                summarizing: false,
            },

            AssistantContext::Thread(thread_context) => AddedContext {
@@ -406,143 +349,11 @@ impl AddedContext {
                parent: None,
                tooltip: None,
                icon_path: None,
-                status: if thread_context
+                summarizing: thread_context
                    .thread
                    .read(cx)
-                    .is_generating_detailed_summary()
-                {
-                    ContextStatus::Loading {
-                        message: "Summarizing…".into(),
-                    }
-                } else {
-                    ContextStatus::Ready
-                },
-                render_preview: None,
-            },
-
-            AssistantContext::Rules(user_rules_context) => AddedContext {
-                id: user_rules_context.id,
-                kind: ContextKind::Rules,
-                name: user_rules_context.title.clone(),
-                parent: None,
-                tooltip: None,
-                icon_path: None,
-                status: ContextStatus::Ready,
-                render_preview: None,
-            },
-
-            AssistantContext::Image(image_context) => AddedContext {
-                id: image_context.id,
-                kind: ContextKind::Image,
-                name: "Image".into(),
-                parent: None,
-                tooltip: None,
-                icon_path: None,
-                status: if image_context.is_loading() {
-                    ContextStatus::Loading {
-                        message: "Loading…".into(),
-                    }
-                } else if image_context.is_error() {
-                    ContextStatus::Error {
-                        message: "Failed to load image".into(),
-                    }
-                } else {
-                    ContextStatus::Ready
-                },
-                render_preview: Some(Rc::new({
-                    let image = image_context.original_image.clone();
-                    move |_, _| {
-                        gpui::img(image.clone())
-                            .max_w_96()
-                            .max_h_96()
-                            .into_any_element()
-                    }
-                })),
+                    .is_generating_detailed_summary(),
            },
        }
    }
 }
-
-struct ContextPillPreview {
-    render_preview: Rc<dyn Fn(&mut Window, &mut App) -> AnyElement>,
-}
-
-impl Render for ContextPillPreview {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(window, cx, move |this, window, cx| {
-            this.occlude()
-                .on_mouse_move(|_, _, cx| cx.stop_propagation())
-                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .child((self.render_preview)(window, cx))
-        })
-    }
-}
-
-impl Component for AddedContext {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn sort_name() -> &'static str {
-        "AddedContext"
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let image_ready = (
-            "Ready",
-            AddedContext::new(
-                &AssistantContext::Image(ImageContext {
-                    id: ContextId(0),
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-                }),
-                cx,
-            ),
-        );
-
-        let image_loading = (
-            "Loading",
-            AddedContext::new(
-                &AssistantContext::Image(ImageContext {
-                    id: ContextId(1),
-                    original_image: Arc::new(Image::empty()),
-                    image_task: cx
-                        .background_spawn(async move {
-                            smol::Timer::after(Duration::from_secs(60 * 5)).await;
-                            Some(LanguageModelImage::empty())
-                        })
-                        .shared(),
-                }),
-                cx,
-            ),
-        );
-
-        let image_error = (
-            "Error",
-            AddedContext::new(
-                &AssistantContext::Image(ImageContext {
-                    id: ContextId(2),
-                    original_image: Arc::new(Image::empty()),
-                    image_task: Task::ready(None).shared(),
-                }),
-                cx,
-            ),
-        );
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(
-                    vec![image_ready, image_loading, image_error]
-                        .into_iter()
-                        .map(|(text, context)| {
-                            single_example(
-                                text,
-                                ContextPill::added(context, false, false, None).into_any_element(),
-                            )
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -74,10 +74,6 @@ pub enum Model {
 }

 impl Model {
-    pub fn default_fast() -> Self {
-        Self::Claude3_5Haiku
-    }
-
    pub fn from_id(id: &str) -> Result<Self> {
        if id.starts_with("claude-3-5-sonnet") {
            Ok(Self::Claude3_5Sonnet)
@@ -511,15 +507,6 @@ pub enum RequestContent {
        #[serde(skip_serializing_if = "Option::is_none")]
        cache_control: Option<CacheControl>,
    },
-    #[serde(rename = "thinking")]
-    Thinking {
-        thinking: String,
-        signature: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-    #[serde(rename = "redacted_thinking")]
-    RedactedThinking { data: String },
    #[serde(rename = "image")]
    Image {
        source: ImageSource,
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -27,7 +27,7 @@ use language_model::{
 };
 use project::Project;
 use prompt_library::{PromptLibrary, open_prompt_library};
-use prompt_store::{PromptBuilder, PromptId, UserPromptId};
+use prompt_store::{PromptBuilder, PromptId};

 use search::{BufferSearchBar, buffer_search::DivRegistrar};
 use settings::{Settings, update_settings_file};
@@ -58,11 +58,11 @@ pub fn init(cx: &mut App) {
                .register_action(AssistantPanel::show_configuration)
                .register_action(AssistantPanel::create_new_context)
                .register_action(AssistantPanel::restart_context_servers)
-                .register_action(|workspace, action: &OpenPromptLibrary, window, cx| {
+                .register_action(|workspace, _: &OpenPromptLibrary, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.deploy_prompt_library(action, window, cx)
+                            panel.deploy_prompt_library(&OpenPromptLibrary::default(), window, cx)
                        });
                    }
                });
@@ -1060,9 +1060,7 @@ impl AssistantPanel {
                    None,
                ))
            }),
-            action.prompt_to_select.map(|uuid| PromptId::User {
-                uuid: UserPromptId(uuid),
-            }),
+            action.prompt_to_focus.map(|uuid| PromptId::User { uuid }),
            cx,
        )
        .detach_and_log_err(cx);
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -37,7 +37,7 @@ use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelTextStream, Role, report_assistant_event,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType};
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, LspAction, ProjectTransaction};
@@ -1766,7 +1766,6 @@ impl PromptEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
-                    ModelType::Default,
                    window,
                    cx,
                )
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -19,7 +19,7 @@ use language_model::{
    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    Role, report_assistant_event,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType};
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use prompt_store::PromptBuilder;
 use settings::{Settings, update_settings_file};
 use std::{
@@ -755,7 +755,6 @@ impl PromptEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
-                    ModelType::Default,
                    window,
                    cx,
                )
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -2373,7 +2373,7 @@ impl AssistantContext {
                                    LanguageModelCompletionEvent::Stop(reason) => {
                                        stop_reason = reason;
                                    }
-                                    LanguageModelCompletionEvent::Thinking { text: chunk, .. } => {
+                                    LanguageModelCompletionEvent::Thinking(chunk) => {
                                        if thought_process_stack.is_empty() {
                                            let start =
                                                buffer.anchor_before(message_old_end_offset);
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -39,7 +39,7 @@ use language_model::{
    Role,
 };
 use language_model_selector::{
-    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType, ToggleModelSelector,
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
 };
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
@@ -298,7 +298,6 @@ impl ContextEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
-                    ModelType::Default,
                    window,
                    cx,
                )
@@ -2089,7 +2088,7 @@ impl ContextEditor {
                        continue;
                    };
                    let image_id = image.id();
-                    let image_task = LanguageModelImage::from_image(Arc::new(image), cx).shared();
+                    let image_task = LanguageModelImage::from_image(image, cx).shared();

                    for image_position in image_positions.iter() {
                        context.insert_content(
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -44,10 +44,9 @@ impl SlashCommand for PromptSlashCommand {
        let store = PromptStore::global(cx);
        let query = arguments.to_owned().join(" ");
        cx.spawn(async move |cx| {
-            let cancellation_flag = Arc::new(AtomicBool::default());
            let prompts: Vec<PromptMetadata> = store
                .await?
-                .read_with(cx, |store, cx| store.search(query, cancellation_flag, cx))?
+                .read_with(cx, |store, cx| store.search(query, cx))?
                .await;
            Ok(prompts
                .into_iter()
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -22,6 +22,7 @@ gpui.workspace = true
 icons.workspace = true
 language.workspace = true
 language_model.workspace = true
+log.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 serde.workspace = true
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -1,42 +1,123 @@
 use anyhow::{Context as _, Result};
 use buffer_diff::BufferDiff;
-use collections::BTreeMap;
-use futures::{StreamExt, channel::mpsc};
+use collections::{BTreeMap, HashMap, HashSet};
+use futures::{
+    FutureExt as _, StreamExt,
+    channel::{mpsc, oneshot},
+};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
-use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
-use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
-use std::{cmp, ops::Range, sync::Arc};
-use text::{Edit, Patch, Rope};
+use language::{Anchor, Buffer, BufferEvent, DiagnosticEntry, DiskState, Point, ToPoint};
+use project::{Project, ProjectItem, ProjectPath, lsp_store::OpenLspBufferHandle};
+use std::{
+    cmp::{self, Ordering},
+    ops::Range,
+    sync::Arc,
+    time::Duration,
+};
+use text::{BufferId, Edit, Patch, PointUtf16, Rope, Unclipped};
 use util::RangeExt;

 /// Tracks actions performed by tools in a thread
 pub struct ActionLog {
    /// Buffers that we want to notify the model about when they change.
    tracked_buffers: BTreeMap<Entity<Buffer>, TrackedBuffer>,
-    /// Has the model edited a file since it last checked diagnostics?
-    edited_since_project_diagnostics_check: bool,
+    paths_with_pre_existing_diagnostics: HashSet<ProjectPath>,
+    edited_since_diagnostics_report: bool,
+    diagnostic_state: DiagnosticState,
+    last_edited_buffer: Option<LastEditedBuffer>,
    /// The project this action log is associated with
    project: Entity<Project>,
+    _project_subscription: Subscription,
+}
+
+#[derive(Clone)]
+pub struct LastEditedBuffer {
+    pub buffer_id: BufferId,
+    pub consecutive_edit_count: usize,
 }

 impl ActionLog {
    /// Creates a new, empty action log associated with the given project.
-    pub fn new(project: Entity<Project>) -> Self {
+    pub fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
+        let pre_existing_diagnostics = project.update(cx, |project, cx| {
+            project
+                .lsp_store()
+                .read(cx)
+                .diagnostic_summaries(true, cx)
+                .map(|(path, _, _)| path.clone())
+                .collect()
+        });
+
+        let _project_subscription = cx.subscribe(&project, |this, _, event, cx| {
+            if let project::Event::BufferEdited(buffer) = event {
+                if let Some(project_path) = buffer.read(cx).project_path(cx) {
+                    this.paths_with_pre_existing_diagnostics
+                        .remove(&project_path);
+                }
+            }
+        });
+
        Self {
            tracked_buffers: BTreeMap::default(),
-            edited_since_project_diagnostics_check: false,
+            paths_with_pre_existing_diagnostics: pre_existing_diagnostics,
+            edited_since_diagnostics_report: false,
+            diagnostic_state: Default::default(),
            project,
+            last_edited_buffer: None,
+            _project_subscription,
        }
    }

-    /// Notifies a diagnostics check
-    pub fn checked_project_diagnostics(&mut self) {
-        self.edited_since_project_diagnostics_check = false;
+    pub fn flush_diagnostic_changes(&mut self, cx: &App) -> Option<Vec<DiagnosticChange>> {
+        if !self.edited_since_diagnostics_report {
+            return None;
+        }
+
+        let new_state = self.diagnostic_state(cx);
+        let changes = new_state.compare(&self.diagnostic_state, cx);
+        self.diagnostic_state = new_state;
+        self.edited_since_diagnostics_report = false;
+        Some(changes).filter(|changes| !changes.is_empty())
    }

-    /// Returns true if any files have been edited since the last project diagnostics check
-    pub fn has_edited_files_since_project_diagnostics_check(&self) -> bool {
-        self.edited_since_project_diagnostics_check
+    pub fn last_edited_buffer(&self) -> Option<LastEditedBuffer> {
+        self.last_edited_buffer.clone()
+    }
+
+    fn diagnostic_state(&self, cx: &App) -> DiagnosticState {
+        let mut diagnostics_for_open_buffers = HashMap::default();
+        let mut diagnostics_for_non_open_buffers = HashMap::default();
+
+        let project = self.project.read(cx);
+        let all_diagnostics = project.lsp_store().read(cx).all_diagnostics();
+
+        for (project_path, diagnostics) in all_diagnostics {
+            if self
+                .paths_with_pre_existing_diagnostics
+                .contains(&project_path)
+            {
+                continue;
+            }
+            match project.get_open_buffer(&project_path, cx) {
+                Some(buffer) => {
+                    let diagnostics = buffer
+                        .read(cx)
+                        .snapshot()
+                        .diagnostics_in_range(Anchor::MIN..Anchor::MAX, false)
+                        .filter(|entry| entry.diagnostic.is_primary)
+                        .collect();
+                    diagnostics_for_open_buffers.insert(buffer, diagnostics);
+                }
+                None => {
+                    diagnostics_for_non_open_buffers.insert(project_path.clone(), diagnostics);
+                }
+            }
+        }
+
+        DiagnosticState {
+            diagnostics_for_open_buffers,
+            diagnostics_for_non_open_paths: diagnostics_for_non_open_buffers,
+        }
    }

    fn track_buffer(
@@ -71,6 +152,12 @@ impl ActionLog {
                    status = TrackedBufferStatus::Modified;
                    unreviewed_changes = Patch::default();
                }
+
+                if let Some(project_path) = buffer.read(cx).project_path(cx) {
+                    self.paths_with_pre_existing_diagnostics
+                        .remove(&project_path);
+                }
+
                TrackedBuffer {
                    buffer: buffer.clone(),
                    base_text,
@@ -269,21 +356,88 @@ impl ActionLog {
        self.track_buffer(buffer, false, cx);
    }

-    /// Track a buffer as read, so we can notify the model about user edits.
-    pub fn will_create_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
+    /// Save and track a new buffer
+    pub fn save_new_buffer(
+        &mut self,
+        buffer: Entity<Buffer>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
        self.track_buffer(buffer.clone(), true, cx);
-        self.buffer_edited(buffer, cx)
+        self.save_edited_buffer(buffer, cx)
    }

-    /// Mark a buffer as edited, so we can refresh it in the context
-    pub fn buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.edited_since_project_diagnostics_check = true;
+    /// Save and track an edited buffer
+    pub fn save_edited_buffer(
+        &mut self,
+        buffer: Entity<Buffer>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        self.edited_since_diagnostics_report = true;
+
+        let saved_buffer_id = buffer.read(cx).remote_id();
+        match &mut self.last_edited_buffer {
+            Some(LastEditedBuffer {
+                buffer_id,
+                consecutive_edit_count,
+            }) if *buffer_id == saved_buffer_id => *consecutive_edit_count += 1,
+            _ => {
+                self.last_edited_buffer = Some(LastEditedBuffer {
+                    buffer_id: saved_buffer_id,
+                    consecutive_edit_count: 1,
+                })
+            }
+        }

        let tracked_buffer = self.track_buffer(buffer.clone(), false, cx);
        if let TrackedBufferStatus::Deleted = tracked_buffer.status {
            tracked_buffer.status = TrackedBufferStatus::Modified;
        }
        tracked_buffer.schedule_diff_update(ChangeAuthor::Agent, cx);
+
+        let project = self.project.clone();
+
+        cx.spawn(async move |_this, cx| {
+            let (tx, mut rx) = oneshot::channel();
+            let mut tx = Some(tx);
+
+            let _subscription = cx.subscribe(&project, move |_, event, _| match event {
+                project::Event::DiskBasedDiagnosticsFinished { .. } => {
+                    if let Some(tx) = tx.take() {
+                        tx.send(()).ok();
+                    }
+                }
+                _ => {}
+            });
+
+            project
+                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
+                .await?;
+
+            let has_lang_server = project.update(cx, |project, cx| {
+                project.lsp_store().update(cx, |lsp_store, cx| {
+                    buffer.update(cx, |buffer, cx| {
+                        lsp_store
+                            .language_servers_for_local_buffer(buffer, cx)
+                            .next()
+                            .is_some()
+                    })
+                })
+            })?;
+
+            if has_lang_server {
+                let timeout = cx.background_executor().timer(Duration::from_secs(30));
+                futures::select! {
+                    _ = rx => Ok(()),
+                    _ = timeout.fuse() => {
+                        log::info!("Did not receive diagnostics update 30s after agent edit");
+                        // We don't want to fail the tool here
+                        Ok(())
+                    }
+                }
+            } else {
+                Ok(())
+            }
+        })
    }

    pub fn will_delete_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
@@ -497,6 +651,149 @@ impl ActionLog {
    }
 }

+#[derive(Default)]
+struct DiagnosticState {
+    diagnostics_for_open_buffers: HashMap<Entity<Buffer>, Vec<DiagnosticEntry<Anchor>>>,
+    diagnostics_for_non_open_paths:
+        HashMap<ProjectPath, Vec<DiagnosticEntry<Unclipped<PointUtf16>>>>,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct DiagnosticChange {
+    pub project_path: ProjectPath,
+    pub fixed_diagnostic_count: usize,
+    pub introduced_diagnostic_count: usize,
+    pub diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
+}
+
+impl DiagnosticState {
+    fn compare(&self, old_state: &Self, cx: &App) -> Vec<DiagnosticChange> {
+        let mut changes = Vec::new();
+        let empty = Vec::new();
+
+        for (buffer, new) in &self.diagnostics_for_open_buffers {
+            let old = old_state
+                .diagnostics_for_open_buffers
+                .get(&buffer)
+                .unwrap_or(&empty);
+            let buffer = buffer.read(cx);
+            let Some(project_path) = buffer.project_path(cx) else {
+                continue;
+            };
+
+            let (introduced, fixed) = Self::compare_diagnostics(new, old, |a, b| a.cmp(b, buffer));
+            if introduced > 0 || fixed > 0 {
+                changes.push(DiagnosticChange {
+                    project_path,
+                    fixed_diagnostic_count: fixed,
+                    introduced_diagnostic_count: introduced,
+                    diagnostics: new.into_iter().map(|entry| entry.resolve(buffer)).collect(),
+                });
+            }
+        }
+
+        for (buffer, old) in &old_state.diagnostics_for_open_buffers {
+            if !self.diagnostics_for_open_buffers.contains_key(&buffer) && old.len() > 0 {
+                let buffer = buffer.read(cx);
+                let Some(project_path) = buffer.project_path(cx) else {
+                    continue;
+                };
+                changes.push(DiagnosticChange {
+                    project_path,
+                    fixed_diagnostic_count: old.len(),
+                    introduced_diagnostic_count: 0,
+                    diagnostics: vec![],
+                });
+            }
+        }
+
+        let empty = Vec::new();
+
+        for (project_path, new) in &self.diagnostics_for_non_open_paths {
+            let old = old_state
+                .diagnostics_for_non_open_paths
+                .get(&project_path)
+                .unwrap_or(&empty);
+
+            let (introduced, fixed) = Self::compare_diagnostics(new, old, |a, b| a.cmp(b));
+            if introduced > 0 || fixed > 0 {
+                changes.push(DiagnosticChange {
+                    project_path: project_path.clone(),
+                    fixed_diagnostic_count: fixed,
+                    introduced_diagnostic_count: introduced,
+                    diagnostics: new.clone(),
+                });
+            }
+        }
+
+        for (project_path, old) in &old_state.diagnostics_for_non_open_paths {
+            if !self
+                .diagnostics_for_non_open_paths
+                .contains_key(&project_path)
+                && old.len() > 0
+            {
+                changes.push(DiagnosticChange {
+                    project_path: project_path.clone(),
+                    fixed_diagnostic_count: old.len(),
+                    introduced_diagnostic_count: 0,
+                    diagnostics: vec![],
+                });
+            }
+        }
+
+        changes
+    }
+
+    fn compare_diagnostics<T>(
+        new: &[DiagnosticEntry<T>],
+        old: &[DiagnosticEntry<T>],
+        cmp: impl Fn(&DiagnosticEntry<T>, &DiagnosticEntry<T>) -> Ordering,
+    ) -> (usize, usize) {
+        let mut introduced = 0;
+        let mut fixed = 0;
+
+        let mut old_iter = old.iter().peekable();
+        let mut new_iter = new.iter().peekable();
+
+        loop {
+            match (old_iter.peek(), new_iter.peek()) {
+                (Some(old_entry), Some(new_entry)) => {
+                    match cmp(old_entry, new_entry) {
+                        Ordering::Less => {
+                            // Old entry comes first and isn't in new - it's fixed
+                            fixed += 1;
+                            old_iter.next();
+                        }
+                        Ordering::Greater => {
+                            // New entry comes first and isn't in old - it's introduced
+                            introduced += 1;
+                            new_iter.next();
+                        }
+                        Ordering::Equal => {
+                            // They're the same - just advance both iterators
+                            old_iter.next();
+                            new_iter.next();
+                        }
+                    }
+                }
+                (Some(_), None) => {
+                    // Only old entries left - they're all fixed
+                    old_iter.next();
+                    fixed += 1;
+                }
+                (None, Some(_)) => {
+                    // Only new entries left - they're all introduced
+                    new_iter.next();
+                    introduced += 1;
+                }
+                (None, None) => break,
+            }
+        }
+
+        (introduced, fixed)
+    }
+}
+
 fn apply_non_conflicting_edits(
    patch: &Patch<u32>,
    edits: Vec<Edit<u32>>,
@@ -667,7 +964,7 @@ mod tests {
    use super::*;
    use buffer_diff::DiffHunkStatusKind;
    use gpui::TestAppContext;
-    use language::Point;
+    use language::{Diagnostic, LanguageServerId, Point};
    use project::{FakeFs, Fs, Project, RemoveOptions};
    use rand::prelude::*;
    use serde_json::json;
@@ -696,7 +993,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi\njkl\nmno", cx));

        cx.update(|cx| {
@@ -711,8 +1008,10 @@ mod tests {
                    .edit([(Point::new(4, 2)..Point::new(4, 3), "O")], None, cx)
                    .unwrap()
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();
        assert_eq!(
            buffer.read_with(cx, |buffer, _| buffer.text()),
@@ -766,7 +1065,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi\njkl\nmno\npqr", cx));

        cx.update(|cx| {
@@ -783,8 +1082,10 @@ mod tests {
                    .unwrap();
                buffer.finalize_last_transaction();
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();
        assert_eq!(
            buffer.read_with(cx, |buffer, _| buffer.text()),
@@ -840,7 +1141,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi\njkl\nmno", cx));

        cx.update(|cx| {
@@ -850,8 +1151,10 @@ mod tests {
                    .edit([(Point::new(1, 2)..Point::new(2, 3), "F\nGHI")], None, cx)
                    .unwrap()
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();
        assert_eq!(
            buffer.read_with(cx, |buffer, _| buffer.text()),
@@ -929,7 +1232,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));

        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(path!("/dir"), json!({})).await;
@@ -946,12 +1249,10 @@ mod tests {
            .unwrap();
        cx.update(|cx| {
            buffer.update(cx, |buffer, cx| buffer.set_text("lorem", cx));
-            action_log.update(cx, |log, cx| log.will_create_buffer(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
+            action_log.update(cx, |log, cx| log.save_new_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();
        assert_eq!(
            unreviewed_hunks(&action_log, cx),
@@ -1005,7 +1306,7 @@ mod tests {
            .read_with(cx, |project, cx| project.find_project_path("dir/file2", cx))
            .unwrap();

-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let buffer1 = project
            .update(cx, |project, cx| {
                project.open_buffer(file1_path.clone(), cx)
@@ -1068,9 +1369,8 @@ mod tests {
            .await
            .unwrap();
        buffer2.update(cx, |buffer, cx| buffer.set_text("IPSUM", cx));
-        action_log.update(cx, |log, cx| log.will_create_buffer(buffer2.clone(), cx));
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer2.clone(), cx))
+        action_log
+            .update(cx, |log, cx| log.save_new_buffer(buffer2.clone(), cx))
            .await
            .unwrap();

@@ -1103,7 +1403,7 @@ mod tests {
        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
            .await;
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let file_path = project
            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
            .unwrap();
@@ -1124,8 +1424,11 @@ mod tests {
                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
                    .unwrap()
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
+
        cx.run_until_parked();
        assert_eq!(
            buffer.read_with(cx, |buffer, _| buffer.text()),
@@ -1238,7 +1541,7 @@ mod tests {
        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
            .await;
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let file_path = project
            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
            .unwrap();
@@ -1259,8 +1562,10 @@ mod tests {
                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
                    .unwrap()
            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        cx.run_until_parked();
        assert_eq!(
            buffer.read_with(cx, |buffer, _| buffer.text()),
@@ -1314,7 +1619,7 @@ mod tests {
        fs.insert_tree(path!("/dir"), json!({"file": "content"}))
            .await;
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let file_path = project
            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
            .unwrap();
@@ -1369,7 +1674,7 @@ mod tests {

        let fs = FakeFs::new(cx.executor());
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let file_path = project
            .read_with(cx, |project, cx| {
                project.find_project_path("dir/new_file", cx)
@@ -1382,8 +1687,10 @@ mod tests {
            .unwrap();
        cx.update(|cx| {
            buffer.update(cx, |buffer, cx| buffer.set_text("content", cx));
-            action_log.update(cx, |log, cx| log.will_create_buffer(buffer.clone(), cx));
-        });
+            action_log.update(cx, |log, cx| log.save_new_buffer(buffer.clone(), cx))
+        })
+        .await
+        .unwrap();
        project
            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
            .await
@@ -1417,6 +1724,177 @@ mod tests {
        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
    }

+    #[gpui::test]
+    async fn test_track_diagnostics(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/dir",
+            json!({
+                "src": {
+                    "one.rs": "fn one(a: B) -> C { d }",
+                    "two.rs": "fn two(e: F) { G::H }",
+                    "three.rs": "fn three() -> { i(); }",
+                }
+            }),
+        )
+        .await;
+
+        let language_server_id = LanguageServerId(0);
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+
+        let diagnostics_1 = vec![language::DiagnosticEntry {
+            range: Unclipped(PointUtf16::new(0, 10))..Unclipped(PointUtf16::new(0, 11)),
+            diagnostic: Diagnostic {
+                message: "pre-existing error 1".into(),
+                group_id: 0,
+                is_primary: true,
+                ..Default::default()
+            },
+        }];
+        let diagnostics_2 = vec![language::DiagnosticEntry {
+            range: Unclipped(PointUtf16::new(0, 18))..Unclipped(PointUtf16::new(0, 19)),
+            diagnostic: Diagnostic {
+                message: "pre-existing error 2".into(),
+                group_id: 0,
+                is_primary: true,
+                ..Default::default()
+            },
+        }];
+        project.update(cx, |project, cx| {
+            project.lsp_store().update(cx, |lsp_store, cx| {
+                lsp_store
+                    .update_diagnostic_entries(
+                        language_server_id,
+                        "/dir/src/one.rs".into(),
+                        None,
+                        diagnostics_1.clone(),
+                        cx,
+                    )
+                    .unwrap();
+                lsp_store
+                    .update_diagnostic_entries(
+                        language_server_id,
+                        "/dir/src/two.rs".into(),
+                        None,
+                        diagnostics_2.clone(),
+                        cx,
+                    )
+                    .unwrap();
+            });
+        });
+
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
+
+        let buffer = project
+            .update(cx, |project, cx| {
+                project.open_local_buffer("/dir/src/one.rs", cx)
+            })
+            .await
+            .unwrap();
+        let worktree_id = buffer.read_with(cx, |buffer, cx| buffer.file().unwrap().worktree_id(cx));
+
+        action_log.update(cx, |action_log, cx| {
+            action_log.track_buffer(buffer.clone(), false, cx);
+        });
+
+        let diagnostic_changes = action_log
+            .update(cx, |action_log, cx| action_log.flush_diagnostic_changes(cx))
+            .unwrap();
+        assert_eq!(
+            diagnostic_changes,
+            vec![DiagnosticChange {
+                project_path: (worktree_id, "src/one.rs").into(),
+                fixed_diagnostic_count: 0,
+                introduced_diagnostic_count: 1,
+                diagnostics: diagnostics_1
+            },]
+        );
+
+        let save_task = action_log.update(cx, |action_log, cx| {
+            action_log.save_edited_buffer(buffer.clone(), cx)
+        });
+
+        let diagnostics_1 = vec![
+            language::DiagnosticEntry {
+                range: Unclipped(PointUtf16::new(0, 10))..Unclipped(PointUtf16::new(0, 11)),
+                diagnostic: Diagnostic {
+                    message: "pre-existing error 1".into(),
+                    group_id: 0,
+                    is_primary: true,
+                    ..Default::default()
+                },
+            },
+            language::DiagnosticEntry {
+                range: Unclipped(PointUtf16::new(0, 20))..Unclipped(PointUtf16::new(0, 21)),
+                diagnostic: Diagnostic {
+                    message: "new error".into(),
+                    group_id: 0,
+                    is_primary: true,
+                    ..Default::default()
+                },
+            },
+        ];
+        let diagnostics_3 = vec![language::DiagnosticEntry {
+            range: Unclipped(PointUtf16::new(0, 0))..Unclipped(PointUtf16::new(0, 0)),
+            diagnostic: Diagnostic {
+                message: "new error 3".into(),
+                group_id: 0,
+                is_primary: true,
+                ..Default::default()
+            },
+        }];
+        project.update(cx, |project, cx| {
+            project.lsp_store().update(cx, |lsp_store, cx| {
+                lsp_store
+                    .update_diagnostic_entries(
+                        language_server_id,
+                        "/dir/src/one.rs".into(),
+                        None,
+                        diagnostics_1.clone(),
+                        cx,
+                    )
+                    .unwrap();
+                lsp_store
+                    .update_diagnostic_entries(
+                        language_server_id,
+                        "/dir/src/three.rs".into(),
+                        None,
+                        diagnostics_3.clone(),
+                        cx,
+                    )
+                    .unwrap();
+                lsp_store.disk_based_diagnostics_finished(language_server_id, cx);
+            });
+        });
+
+        save_task.await.unwrap();
+
+        // The diagnostics in the file `two.rs` existed are pre-existing, and
+        // that file has not been edited, so they are not included.
+        let diagnostic_changes = action_log
+            .update(cx, |action_log, cx| action_log.flush_diagnostic_changes(cx))
+            .unwrap();
+        assert_eq!(
+            diagnostic_changes,
+            vec![
+                DiagnosticChange {
+                    project_path: (worktree_id, "src/one.rs").into(),
+                    fixed_diagnostic_count: 0,
+                    introduced_diagnostic_count: 1,
+                    diagnostics: diagnostics_1
+                },
+                DiagnosticChange {
+                    project_path: (worktree_id, "src/three.rs").into(),
+                    fixed_diagnostic_count: 0,
+                    introduced_diagnostic_count: 1,
+                    diagnostics: diagnostics_3
+                }
+            ]
+        );
+    }
+
    #[gpui::test(iterations = 100)]
    async fn test_random_diffs(mut rng: StdRng, cx: &mut TestAppContext) {
        init_test(cx);
@@ -1429,7 +1907,7 @@ mod tests {
        let fs = FakeFs::new(cx.executor());
        fs.insert_tree(path!("/dir"), json!({"file": text})).await;
        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let file_path = project
            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
            .unwrap();
@@ -1469,9 +1947,14 @@ mod tests {
                    cx.update(|cx| {
                        buffer.update(cx, |buffer, cx| buffer.randomly_edit(&mut rng, 1, cx));
                        if is_agent_change {
-                            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
+                            action_log
+                                .update(cx, |log, cx| log.save_edited_buffer(buffer.clone(), cx))
+                        } else {
+                            Task::ready(Ok(()))
                        }
-                    });
+                    })
+                    .await
+                    .unwrap();
                }
            }

--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -30,7 +30,6 @@ pub fn init(cx: &mut App) {

 #[derive(Debug, Clone)]
 pub enum ToolUseStatus {
-    InputStillStreaming,
    NeedsConfirmation,
    Pending,
    Running,
@@ -42,7 +41,6 @@ impl ToolUseStatus {
    pub fn text(&self) -> SharedString {
        match self {
            ToolUseStatus::NeedsConfirmation => "".into(),
-            ToolUseStatus::InputStillStreaming => "".into(),
            ToolUseStatus::Pending => "".into(),
            ToolUseStatus::Running => "".into(),
            ToolUseStatus::Finished(out) => out.clone(),
@@ -150,12 +148,6 @@ pub trait Tool: 'static + Send + Sync {
    /// Returns markdown to be displayed in the UI for this tool.
    fn ui_text(&self, input: &serde_json::Value) -> String;

-    /// Returns markdown to be displayed in the UI for this tool, while the input JSON is still streaming
-    /// (so information may be missing).
-    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
-        self.ui_text(input)
-    }
-
    /// Runs the tool with the provided input.
    fn run(
        self: Arc<Self>,
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -9,20 +9,19 @@ mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_file_tool;
 mod fetch_tool;
-mod grep_tool;
 mod list_directory_tool;
 mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod path_search_tool;
 mod read_file_tool;
+mod regex_search_tool;
 mod rename_tool;
 mod replace;
 mod schema;
 mod symbol_info_tool;
 mod terminal_tool;
 mod thinking_tool;
-mod ui;
 mod web_search_tool;

 use std::sync::Arc;
@@ -45,12 +44,12 @@ use crate::delete_path_tool::DeletePathTool;
 use crate::diagnostics_tool::DiagnosticsTool;
 use crate::edit_file_tool::EditFileTool;
 use crate::fetch_tool::FetchTool;
-use crate::grep_tool::GrepTool;
 use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
 use crate::open_tool::OpenTool;
 use crate::path_search_tool::PathSearchTool;
 use crate::read_file_tool::ReadFileTool;
+use crate::regex_search_tool::RegexSearchTool;
 use crate::rename_tool::RenameTool;
 use crate::symbol_info_tool::SymbolInfoTool;
 use crate::terminal_tool::TerminalTool;
@@ -78,7 +77,7 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    registry.register_tool(ContentsTool);
    registry.register_tool(PathSearchTool);
    registry.register_tool(ReadFileTool);
-    registry.register_tool(GrepTool);
+    registry.register_tool(RegexSearchTool);
    registry.register_tool(RenameTool);
    registry.register_tool(ThinkingTool);
    registry.register_tool(FetchTool::new(http_client));
--- a/crates/assistant_tools/src/batch_tool.rs
+++ b/crates/assistant_tools/src/batch_tool.rs
@@ -43,7 +43,7 @@ pub struct BatchToolInput {
    ///       }
    ///     },
    ///     {
-    ///       "name": "grep",
+    ///       "name": "regex_search",
    ///       "input": {
    ///         "regex": "fn run\\("
    ///       }
@@ -91,7 +91,7 @@ pub struct BatchToolInput {
    /// {
    ///   "invocations": [
    ///     {
-    ///       "name": "grep",
+    ///       "name": "regex_search",
    ///       "input": {
    ///         "regex": "impl Database"
    ///       }
--- a/crates/assistant_tools/src/code_action_tool.rs
+++ b/crates/assistant_tools/src/code_action_tool.rs
@@ -241,13 +241,10 @@ impl Tool for CodeActionTool {
                    format!("Completed code action: {}", title)
                };

-                project
-                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                    .await?;

                action_log.update(cx, |log, cx| {
-                    log.buffer_edited(buffer.clone(), cx)
-                })?;
+                    log.save_edited_buffer(buffer.clone(), cx)
+                })?.await?;

                Ok(response)
            } else {
--- a/crates/assistant_tools/src/create_file_tool.rs
+++ b/crates/assistant_tools/src/create_file_tool.rs
@@ -33,18 +33,8 @@ pub struct CreateFileToolInput {
    pub contents: String,
 }

-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct PartialInput {
-    #[serde(default)]
-    path: String,
-    #[serde(default)]
-    contents: String,
-}
-
 pub struct CreateFileTool;

-const DEFAULT_UI_TEXT: &str = "Create file";
-
 impl Tool for CreateFileTool {
    fn name(&self) -> String {
        "create_file".into()
@@ -72,14 +62,7 @@ impl Tool for CreateFileTool {
                let path = MarkdownString::inline_code(&input.path);
                format!("Create file {path}")
            }
-            Err(_) => DEFAULT_UI_TEXT.to_string(),
-        }
-    }
-
-    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<PartialInput>(input.clone()).ok() {
-            Some(input) if !input.path.is_empty() => input.path,
-            _ => DEFAULT_UI_TEXT.to_string(),
+            Err(_) => "Create file".to_string(),
        }
    }

@@ -114,74 +97,14 @@ impl Tool for CreateFileTool {
            cx.update(|cx| {
                buffer.update(cx, |buffer, cx| buffer.set_text(contents, cx));
                action_log.update(cx, |action_log, cx| {
-                    action_log.will_create_buffer(buffer.clone(), cx)
-                });
-            })?;
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer, cx))?
-                .await
-                .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;
+                    action_log.save_new_buffer(buffer.clone(), cx)
+                })
+            })?
+            .await
+            .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;

            Ok(format!("Created file {destination_path}"))
        })
        .into()
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn still_streaming_ui_text_with_path() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), "src/main.rs");
-    }
-
-    #[test]
-    fn still_streaming_ui_text_without_path() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_null() {
-        let tool = CreateFileTool;
-        let input = serde_json::Value::Null;
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-
-    #[test]
-    fn ui_text_with_valid_input() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.ui_text(&input), "Create file `src/main.rs`");
-    }
-
-    #[test]
-    fn ui_text_with_invalid_input() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "invalid": "field"
-        });
-
-        assert_eq!(tool.ui_text(&input), DEFAULT_UI_TEXT);
-    }
-}
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -81,7 +81,7 @@ impl Tool for DiagnosticsTool {
        input: serde_json::Value,
        _messages: &[LanguageModelRequestMessage],
        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
+        _action_log: Entity<ActionLog>,
        cx: &mut App,
    ) -> ToolResult {
        match serde_json::from_value::<DiagnosticsToolInput>(input)
@@ -152,10 +152,6 @@ impl Tool for DiagnosticsTool {
                    }
                }

-                action_log.update(cx, |action_log, _cx| {
-                    action_log.checked_project_diagnostics();
-                });
-
                if has_diagnostics {
                    Task::ready(Ok(output)).into()
                } else {
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -1,11 +1,14 @@
 use crate::{replace::replace_with_flexible_indent, schema::json_schema_for};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
+
 use gpui::{App, AppContext, AsyncApp, Entity, Task};
+
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+
 use std::{path::PathBuf, sync::Arc};
 use ui::IconName;

@@ -47,22 +50,8 @@ pub struct EditFileToolInput {
    pub new_string: String,
 }

-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct PartialInput {
-    #[serde(default)]
-    path: String,
-    #[serde(default)]
-    display_description: String,
-    #[serde(default)]
-    old_string: String,
-    #[serde(default)]
-    new_string: String,
-}
-
 pub struct EditFileTool;

-const DEFAULT_UI_TEXT: &str = "Edit file";
-
 impl Tool for EditFileTool {
    fn name(&self) -> String {
        "edit_file".into()
@@ -91,22 +80,6 @@ impl Tool for EditFileTool {
        }
    }

-    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
-        if let Some(input) = serde_json::from_value::<PartialInput>(input.clone()).ok() {
-            let description = input.display_description.trim();
-            if !description.is_empty() {
-                return description.to_string();
-            }
-
-            let path = input.path.trim();
-            if !path.is_empty() {
-                return path.to_string();
-            }
-        }
-
-        DEFAULT_UI_TEXT.to_string()
-    }
-
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
@@ -190,90 +163,22 @@ impl Tool for EditFileTool {
                    buffer.finalize_last_transaction();
                    buffer.snapshot()
                });
-                action_log.update(cx, |log, cx| {
-                    log.buffer_edited(buffer.clone(), cx)
-                });
                snapshot
            })?;

-            project.update( cx, |project, cx| {
-                project.save_buffer(buffer, cx)
+            action_log.update(cx, |log, cx| {
+                log.save_edited_buffer(buffer.clone(), cx)
            })?.await?;

-            let diff_str = cx.background_spawn(async move {
-                let new_text = snapshot.text();
-                language::unified_diff(&old_text, &new_text)
+            let diff_str = cx.background_spawn({
+                let snapshot = snapshot.clone();
+                async move {
+                    let new_text = snapshot.text();
+                    language::unified_diff(&old_text, &new_text)
+                }
            }).await;

-
            Ok(format!("Edited {}:\n\n```diff\n{}\n```", input.path.display(), diff_str))
-
        }).into()
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn still_streaming_ui_text_with_path() {
-        let tool = EditFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "display_description": "",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), "src/main.rs");
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_description() {
-        let tool = EditFileTool;
-        let input = json!({
-            "path": "",
-            "display_description": "Fix error handling",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), "Fix error handling");
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_path_and_description() {
-        let tool = EditFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "display_description": "Fix error handling",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), "Fix error handling");
-    }
-
-    #[test]
-    fn still_streaming_ui_text_no_path_or_description() {
-        let tool = EditFileTool;
-        let input = json!({
-            "path": "",
-            "display_description": "",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_null() {
-        let tool = EditFileTool;
-        let input = serde_json::Value::Null;
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-}
--- a/crates/assistant_tools/src/find_replace_file_tool.rs
+++ b/crates/assistant_tools/src/find_replace_file_tool.rs
@@ -0,0 +1,268 @@
+use crate::{replace::replace_with_flexible_indent, schema::json_schema_for};
+use anyhow::{Context as _, Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use gpui::{App, AppContext, AsyncApp, Entity, Task};
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::{path::PathBuf, sync::Arc};
+use ui::IconName;
+
+use crate::replace::replace_exact;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct FindReplaceFileToolInput {
+    /// The path of the file to modify.
+    ///
+    /// WARNING: When specifying which file path need changing, you MUST
+    /// start each path with one of the project's root directories.
+    ///
+    /// The following examples assume we have two root directories in the project:
+    /// - backend
+    /// - frontend
+    ///
+    /// <example>
+    /// `backend/src/main.rs`
+    ///
+    /// Notice how the file path starts with root-1. Without that, the path
+    /// would be ambiguous and the call would fail!
+    /// </example>
+    ///
+    /// <example>
+    /// `frontend/db.js`
+    /// </example>
+    pub path: PathBuf,
+
+    /// A user-friendly markdown description of what's being replaced. This will be shown in the UI.
+    ///
+    /// <example>Fix API endpoint URLs</example>
+    /// <example>Update copyright year in `page_footer`</example>
+    pub display_description: String,
+
+    /// The unique string to find in the file. This string cannot be empty;
+    /// if the string is empty, the tool call will fail. Remember, do not use this tool
+    /// to create new files from scratch, or to overwrite existing files! Use a different
+    /// approach if you want to do that.
+    ///
+    /// If this string appears more than once in the file, this tool call will fail,
+    /// so it is absolutely critical that you verify ahead of time that the string
+    /// is unique. You can search within the file to verify this.
+    ///
+    /// To make the string more likely to be unique, include a minimum of 3 lines of context
+    /// before the string you actually want to find, as well as a minimum of 3 lines of
+    /// context after the string you want to find. (These lines of context should appear
+    /// in the `replace` string as well.) If 3 lines of context is not enough to obtain
+    /// a string that appears only once in the file, then double the number of context lines
+    /// until the string becomes unique. (Start with 3 lines before and 3 lines after
+    /// though, because too much context is needlessly costly.)
+    ///
+    /// Do not alter the context lines of code in any way, and make sure to preserve all
+    /// whitespace and indentation for all lines of code. This string must be exactly as
+    /// it appears in the file, because this tool will do a literal find/replace, and if
+    /// even one character in this string is different in any way from how it appears
+    /// in the file, then the tool call will fail.
+    ///
+    /// If you get an error that the `find` string was not found, this means that either
+    /// you made a mistake, or that the file has changed since you last looked at it.
+    /// Either way, when this happens, you should retry doing this tool call until it
+    /// succeeds, up to 3 times. Each time you retry, you should take another look at
+    /// the exact text of the file in question, to make sure that you are searching for
+    /// exactly the right string. Regardless of whether it was because you made a mistake
+    /// or because the file changed since you last looked at it, you should be extra
+    /// careful when retrying in this way. It's a bad experience for the user if
+    /// this `find` string isn't found, so be super careful to get it exactly right!
+    ///
+    /// <example>
+    /// If a file contains this code:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    ///
+    /// Your find string should include at least 3 lines of context before and after the part
+    /// you want to change:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    ///
+    /// And your replace string might look like:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" || user.role == "superuser" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    /// </example>
+    pub find: String,
+
+    /// The string to replace the one unique occurrence of the find string with.
+    pub replace: String,
+}
+
+pub struct FindReplaceFileTool;
+
+impl Tool for FindReplaceFileTool {
+    fn name(&self) -> String {
+        "find_replace_file".into()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("find_replace_tool/description.md").to_string()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Pencil
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<FindReplaceFileToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<FindReplaceFileToolInput>(input.clone()) {
+            Ok(input) => input.display_description,
+            Err(_) => "Edit file".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<FindReplaceFileToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        cx.spawn(async move |cx: &mut AsyncApp| {
+            let project_path = project.read_with(cx, |project, cx| {
+                project
+                    .find_project_path(&input.path, cx)
+                    .context("Path not found in project")
+            })??;
+
+            let buffer = project
+                .update(cx, |project, cx| project.open_buffer(project_path, cx))?
+                .await?;
+
+            let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
+
+            if input.find.is_empty() {
+                return Err(anyhow!("`find` string cannot be empty. Use a different tool if you want to create a file."));
+            }
+
+            if input.find == input.replace {
+                return Err(anyhow!("The `find` and `replace` strings are identical, so no changes would be made."));
+            }
+
+            let result = cx
+                .background_spawn(async move {
+                    // Try to match exactly
+                    let diff = replace_exact(&input.find, &input.replace, &snapshot)
+                    .await
+                    // If that fails, try being flexible about indentation
+                    .or_else(|| replace_with_flexible_indent(&input.find, &input.replace, &snapshot))?;
+
+                    if diff.edits.is_empty() {
+                        return None;
+                    }
+
+                    let old_text = snapshot.text();
+
+                    Some((old_text, diff))
+                })
+                .await;
+
+            let Some((old_text, diff)) = result else {
+                let err = buffer.read_with(cx, |buffer, _cx| {
+                    let file_exists = buffer
+                        .file()
+                        .map_or(false, |file| file.disk_state().exists());
+
+                    if !file_exists {
+                        anyhow!("{} does not exist", input.path.display())
+                    } else if buffer.is_empty() {
+                        anyhow!(
+                            "{} is empty, so the provided `find` string wasn't found.",
+                            input.path.display()
+                        )
+                    } else {
+                        anyhow!("Failed to match the provided `find` string")
+                    }
+                })?;
+
+                return Err(err)
+            };
+
+            let snapshot = cx.update(|cx| {
+                action_log.update(cx, |log, cx| {
+                    log.buffer_read(buffer.clone(), cx)
+                });
+                let snapshot = buffer.update(cx, |buffer, cx| {
+                    buffer.finalize_last_transaction();
+                    buffer.apply_diff(diff, cx);
+                    buffer.finalize_last_transaction();
+                    buffer.snapshot()
+                });
+                action_log.update(cx, |log, cx| {
+                    log.buffer_edited(buffer.clone(), cx)
+                });
+                snapshot
+            })?;
+
+            project.update( cx, |project, cx| {
+                project.save_buffer(buffer, cx)
+            })?.await?;
+
+            let diff_str = cx.background_spawn(async move {
+                let new_text = snapshot.text();
+                language::unified_diff(&old_text, &new_text)
+            }).await;
+
+
+            Ok(format!("Edited {}:\n\n```diff\n{}\n```", input.path.display(), diff_str))
+
+        }).into()
+    }
+}
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -1,424 +0,0 @@
-use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, Tool, ToolResult};
-use futures::StreamExt;
-use gpui::{App, Entity, Task};
-use language::OffsetRangeExt;
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
-use project::{
-    Project,
-    search::{SearchQuery, SearchResult},
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{cmp, fmt::Write, sync::Arc};
-use ui::IconName;
-use util::markdown::MarkdownString;
-use util::paths::PathMatcher;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct GrepToolInput {
-    /// A regex pattern to search for in the entire project. Note that the regex
-    /// will be parsed by the Rust `regex` crate.
-    pub regex: String,
-
-    /// A glob pattern for the paths of files to include in the search.
-    /// Supports standard glob patterns like "**/*.rs" or "src/**/*.ts".
-    /// If omitted, all files in the project will be searched.
-    pub include_pattern: Option<String>,
-
-    /// Optional starting position for paginated results (0-based).
-    /// When not provided, starts from the beginning.
-    #[serde(default)]
-    pub offset: u32,
-
-    /// Whether the regex is case-sensitive. Defaults to false (case-insensitive).
-    #[serde(default)]
-    pub case_sensitive: bool,
-}
-
-impl GrepToolInput {
-    /// Which page of search results this is.
-    pub fn page(&self) -> u32 {
-        1 + (self.offset / RESULTS_PER_PAGE)
-    }
-}
-
-const RESULTS_PER_PAGE: u32 = 20;
-
-pub struct GrepTool;
-
-impl Tool for GrepTool {
-    fn name(&self) -> String {
-        "grep".into()
-    }
-
-    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./grep_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Regex
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<GrepToolInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<GrepToolInput>(input.clone()) {
-            Ok(input) => {
-                let page = input.page();
-                let regex_str = MarkdownString::inline_code(&input.regex);
-                let case_info = if input.case_sensitive {
-                    " (case-sensitive)"
-                } else {
-                    ""
-                };
-
-                if page > 1 {
-                    format!("Get page {page} of search results for regex {regex_str}{case_info}")
-                } else {
-                    format!("Search files for regex {regex_str}{case_info}")
-                }
-            }
-            Err(_) => "Search with regex".to_string(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        _action_log: Entity<ActionLog>,
-        cx: &mut App,
-    ) -> ToolResult {
-        const CONTEXT_LINES: u32 = 2;
-
-        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();
-            }
-        };
-
-        let include_matcher = match PathMatcher::new(
-            input
-                .include_pattern
-                .as_ref()
-                .into_iter()
-                .collect::<Vec<_>>(),
-        ) {
-            Ok(matcher) => matcher,
-            Err(error) => {
-                return Task::ready(Err(anyhow!("invalid include glob pattern: {}", error))).into();
-            }
-        };
-
-        let query = match SearchQuery::regex(
-            &input.regex,
-            false,
-            input.case_sensitive,
-            false,
-            false,
-            include_matcher,
-            PathMatcher::default(), // For now, keep it simple and don't enable an exclude pattern.
-            true, // Always match file include pattern against *full project paths* that start with a project root.
-            None,
-        ) {
-            Ok(query) => query,
-            Err(error) => return Task::ready(Err(error)).into(),
-        };
-
-        let results = project.update(cx, |project, cx| project.search(query, cx));
-
-        cx.spawn(async move|cx|  {
-            futures::pin_mut!(results);
-
-            let mut output = String::new();
-            let mut skips_remaining = input.offset;
-            let mut matches_found = 0;
-            let mut has_more_matches = false;
-
-            while let Some(SearchResult::Buffer { buffer, ranges }) = results.next().await {
-                if ranges.is_empty() {
-                    continue;
-                }
-
-                buffer.read_with(cx, |buffer, cx| -> Result<(), anyhow::Error> {
-                    if let Some(path) = buffer.file().map(|file| file.full_path(cx)) {
-                        let mut file_header_written = false;
-                        let mut ranges = ranges
-                            .into_iter()
-                            .map(|range| {
-                                let mut point_range = range.to_point(buffer);
-                                point_range.start.row =
-                                    point_range.start.row.saturating_sub(CONTEXT_LINES);
-                                point_range.start.column = 0;
-                                point_range.end.row = cmp::min(
-                                    buffer.max_point().row,
-                                    point_range.end.row + CONTEXT_LINES,
-                                );
-                                point_range.end.column = buffer.line_len(point_range.end.row);
-                                point_range
-                            })
-                            .peekable();
-
-                        while let Some(mut range) = ranges.next() {
-                            if skips_remaining > 0 {
-                                skips_remaining -= 1;
-                                continue;
-                            }
-
-                            // We'd already found a full page of matches, and we just found one more.
-                            if matches_found >= RESULTS_PER_PAGE {
-                                has_more_matches = true;
-                                return Ok(());
-                            }
-
-                            while let Some(next_range) = ranges.peek() {
-                                if range.end.row >= next_range.start.row {
-                                    range.end = next_range.end;
-                                    ranges.next();
-                                } else {
-                                    break;
-                                }
-                            }
-
-                            if !file_header_written {
-                                writeln!(output, "\n## Matches in {}", path.display())?;
-                                file_header_written = true;
-                            }
-
-                            let start_line = range.start.row + 1;
-                            let end_line = range.end.row + 1;
-                            writeln!(output, "\n### Lines {start_line}-{end_line}\n```")?;
-                            output.extend(buffer.text_for_range(range));
-                            output.push_str("\n```\n");
-
-                            matches_found += 1;
-                        }
-                    }
-
-                    Ok(())
-                })??;
-            }
-
-            if matches_found == 0 {
-                Ok("No matches found".to_string())
-            } else if has_more_matches {
-                Ok(format!(
-                    "Showing matches {}-{} (there were more matches found; use offset: {} to see next page):\n{output}",
-                    input.offset + 1,
-                    input.offset + matches_found,
-                    input.offset + RESULTS_PER_PAGE,
-                ))
-            } else {
-                Ok(format!("Found {matches_found} matches:\n{output}"))
-            }
-        }).into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use assistant_tool::Tool;
-    use gpui::{AppContext, TestAppContext};
-    use project::{FakeFs, Project};
-    use settings::SettingsStore;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_grep_tool_with_include_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor().clone());
-        fs.insert_tree(
-            "/root",
-            serde_json::json!({
-                "src": {
-                    "main.rs": "fn main() {\n    println!(\"Hello, world!\");\n}",
-                    "utils": {
-                        "helper.rs": "fn helper() {\n    println!(\"I'm a helper!\");\n}",
-                    },
-                },
-                "tests": {
-                    "test_main.rs": "fn test_main() {\n    assert!(true);\n}",
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Test with include pattern for Rust files inside the root of the project
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "println".to_string(),
-            include_pattern: Some("root/**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(result.contains("main.rs"), "Should find matches in main.rs");
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in helper.rs"
-        );
-        assert!(
-            !result.contains("test_main.rs"),
-            "Should not include test_main.rs even though it's a .rs file (because it doesn't have the pattern)"
-        );
-
-        // Test with include pattern for src directory only
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "fn".to_string(),
-            include_pattern: Some("root/**/src/**".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("main.rs"),
-            "Should find matches in src/main.rs"
-        );
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in src/utils/helper.rs"
-        );
-        assert!(
-            !result.contains("test_main.rs"),
-            "Should not include test_main.rs as it's not in src directory"
-        );
-
-        // Test with empty include pattern (should default to all files)
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "fn".to_string(),
-            include_pattern: None,
-            offset: 0,
-            case_sensitive: false,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(result.contains("main.rs"), "Should find matches in main.rs");
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in helper.rs"
-        );
-        assert!(
-            result.contains("test_main.rs"),
-            "Should include test_main.rs"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_grep_tool_with_case_sensitivity(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor().clone());
-        fs.insert_tree(
-            "/root",
-            serde_json::json!({
-                "case_test.txt": "This file has UPPERCASE and lowercase text.\nUPPERCASE patterns should match only with case_sensitive: true",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Test case-insensitive search (default)
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "uppercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("UPPERCASE"),
-            "Case-insensitive search should match uppercase"
-        );
-
-        // Test case-sensitive search
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "uppercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            !result.contains("UPPERCASE"),
-            "Case-sensitive search should not match uppercase"
-        );
-
-        // Test case-sensitive search
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "LOWERCASE".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-
-        assert!(
-            !result.contains("lowercase"),
-            "Case-sensitive search should match lowercase"
-        );
-
-        // Test case-sensitive search for lowercase pattern
-        let input = serde_json::to_value(GrepToolInput {
-            regex: "lowercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        })
-        .unwrap();
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("lowercase"),
-            "Case-sensitive search should match lowercase text"
-        );
-    }
-
-    async fn run_grep_tool(
-        input: serde_json::Value,
-        project: Entity<Project>,
-        cx: &mut TestAppContext,
-    ) -> String {
-        let tool = Arc::new(GrepTool);
-        let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
-        let task = cx.update(|cx| tool.run(input, &[], project, action_log, cx));
-
-        match task.output.await {
-            Ok(result) => result,
-            Err(e) => panic!("Failed to run grep tool: {}", e),
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-        });
-    }
-}
--- a/crates/assistant_tools/src/grep_tool/description.md
+++ b/crates/assistant_tools/src/grep_tool/description.md
@@ -1,8 +0,0 @@
-Searches the contents of files in the project with a regular expression
-
- Prefer this tool to path search when searching for symbols in the project, because you won't need to guess what path it's in.
- Supports full regex syntax (eg. "log.*Error", "function\\s+\\w+", etc.)
- Pass an `include_pattern` if you know how to narrow your search on the files system
- Never use this tool to search for paths. Only search file contents with this tool.
- Use this tool when you need to find files containing specific patterns
- Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
--- a/crates/assistant_tools/src/list_directory_tool/description.md
+++ b/crates/assistant_tools/src/list_directory_tool/description.md
@@ -1 +1 @@
-Lists files and directories in a given path. Prefer the `grep` or `path_search` tools when searching the codebase.
+Lists files and directories in a given path. Prefer the `regex_search` or `path_search` tools when searching the codebase.
--- a/crates/assistant_tools/src/path_search_tool/description.md
+++ b/crates/assistant_tools/src/path_search_tool/description.md
@@ -2,6 +2,6 @@ Fast file pattern matching tool that works with any codebase size

 - Supports glob patterns like "**/*.js" or "src/**/*.ts"
 - Returns matching file paths sorted alphabetically
- Prefer the `grep` tool to this tool when searching for symbols unless you have specific information about paths.
+- Prefer the `regex_search` tool to this tool when searching for symbols unless you have specific information about paths.
 - Use this tool when you need to find files by name patterns
 - Results are paginated with 50 matches per page. Use the optional 'offset' parameter to request subsequent pages.
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -186,7 +186,7 @@ mod test {
        let fs = FakeFs::new(cx.executor());
        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let result = cx
            .update(|cx| {
                let input = json!({
@@ -216,7 +216,7 @@ mod test {
        )
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let result = cx
            .update(|cx| {
                let input = json!({
@@ -245,7 +245,7 @@ mod test {
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
        language_registry.add(Arc::new(rust_lang()));
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));

        let result = cx
            .update(|cx| {
@@ -314,7 +314,7 @@ mod test {
        )
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let action_log = cx.new(|cx| ActionLog::new(project.clone(), cx));
        let result = cx
            .update(|cx| {
                let input = json!({
--- a/crates/assistant_tools/src/regex_search_tool.rs
+++ b/crates/assistant_tools/src/regex_search_tool.rs
@@ -0,0 +1,206 @@
+use crate::schema::json_schema_for;
+use anyhow::{Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use futures::StreamExt;
+use gpui::{App, Entity, Task};
+use language::OffsetRangeExt;
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::{
+    Project,
+    search::{SearchQuery, SearchResult},
+};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::{cmp, fmt::Write, sync::Arc};
+use ui::IconName;
+use util::markdown::MarkdownString;
+use util::paths::PathMatcher;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct RegexSearchToolInput {
+    /// A regex pattern to search for in the entire project. Note that the regex
+    /// will be parsed by the Rust `regex` crate.
+    pub regex: String,
+
+    /// Optional starting position for paginated results (0-based).
+    /// When not provided, starts from the beginning.
+    #[serde(default)]
+    pub offset: u32,
+
+    /// Whether the regex is case-sensitive. Defaults to false (case-insensitive).
+    #[serde(default)]
+    pub case_sensitive: bool,
+}
+
+impl RegexSearchToolInput {
+    /// Which page of search results this is.
+    pub fn page(&self) -> u32 {
+        1 + (self.offset / RESULTS_PER_PAGE)
+    }
+}
+
+const RESULTS_PER_PAGE: u32 = 20;
+
+pub struct RegexSearchTool;
+
+impl Tool for RegexSearchTool {
+    fn name(&self) -> String {
+        "regex_search".into()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("./regex_search_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Regex
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<RegexSearchToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<RegexSearchToolInput>(input.clone()) {
+            Ok(input) => {
+                let page = input.page();
+                let regex_str = MarkdownString::inline_code(&input.regex);
+                let case_info = if input.case_sensitive {
+                    " (case-sensitive)"
+                } else {
+                    ""
+                };
+
+                if page > 1 {
+                    format!("Get page {page} of search results for regex {regex_str}{case_info}")
+                } else {
+                    format!("Search files for regex {regex_str}{case_info}")
+                }
+            }
+            Err(_) => "Search with regex".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        _action_log: Entity<ActionLog>,
+        cx: &mut App,
+    ) -> ToolResult {
+        const CONTEXT_LINES: u32 = 2;
+
+        let (offset, regex, case_sensitive) =
+            match serde_json::from_value::<RegexSearchToolInput>(input) {
+                Ok(input) => (input.offset, input.regex, input.case_sensitive),
+                Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+            };
+
+        let query = match SearchQuery::regex(
+            &regex,
+            false,
+            case_sensitive,
+            false,
+            false,
+            PathMatcher::default(),
+            PathMatcher::default(),
+            None,
+        ) {
+            Ok(query) => query,
+            Err(error) => return Task::ready(Err(error)).into(),
+        };
+
+        let results = project.update(cx, |project, cx| project.search(query, cx));
+
+        cx.spawn(async move|cx|  {
+            futures::pin_mut!(results);
+
+            let mut output = String::new();
+            let mut skips_remaining = offset;
+            let mut matches_found = 0;
+            let mut has_more_matches = false;
+
+            while let Some(SearchResult::Buffer { buffer, ranges }) = results.next().await {
+                if ranges.is_empty() {
+                    continue;
+                }
+
+                buffer.read_with(cx, |buffer, cx| -> Result<(), anyhow::Error> {
+                    if let Some(path) = buffer.file().map(|file| file.full_path(cx)) {
+                        let mut file_header_written = false;
+                        let mut ranges = ranges
+                            .into_iter()
+                            .map(|range| {
+                                let mut point_range = range.to_point(buffer);
+                                point_range.start.row =
+                                    point_range.start.row.saturating_sub(CONTEXT_LINES);
+                                point_range.start.column = 0;
+                                point_range.end.row = cmp::min(
+                                    buffer.max_point().row,
+                                    point_range.end.row + CONTEXT_LINES,
+                                );
+                                point_range.end.column = buffer.line_len(point_range.end.row);
+                                point_range
+                            })
+                            .peekable();
+
+                        while let Some(mut range) = ranges.next() {
+                            if skips_remaining > 0 {
+                                skips_remaining -= 1;
+                                continue;
+                            }
+
+                            // We'd already found a full page of matches, and we just found one more.
+                            if matches_found >= RESULTS_PER_PAGE {
+                                has_more_matches = true;
+                                return Ok(());
+                            }
+
+                            while let Some(next_range) = ranges.peek() {
+                                if range.end.row >= next_range.start.row {
+                                    range.end = next_range.end;
+                                    ranges.next();
+                                } else {
+                                    break;
+                                }
+                            }
+
+                            if !file_header_written {
+                                writeln!(output, "\n## Matches in {}", path.display())?;
+                                file_header_written = true;
+                            }
+
+                            let start_line = range.start.row + 1;
+                            let end_line = range.end.row + 1;
+                            writeln!(output, "\n### Lines {start_line}-{end_line}\n```")?;
+                            output.extend(buffer.text_for_range(range));
+                            output.push_str("\n```\n");
+
+                            matches_found += 1;
+                        }
+                    }
+
+                    Ok(())
+                })??;
+            }
+
+            if matches_found == 0 {
+                Ok("No matches found".to_string())
+            } else if has_more_matches {
+                Ok(format!(
+                    "Showing matches {}-{} (there were more matches found; use offset: {} to see next page):\n{output}",
+                    offset + 1,
+                    offset + matches_found,
+                    offset + RESULTS_PER_PAGE,
+                ))
+            } else {
+                Ok(format!("Found {matches_found} matches:\n{output}"))
+            }
+        }).into()
+    }
+}
--- a/crates/assistant_tools/src/regex_search_tool/description.md
+++ b/crates/assistant_tools/src/regex_search_tool/description.md
@@ -0,0 +1,6 @@
+Searches the entire project for the given regular expression.
+
+- Prefer this tool when searching for files containing symbols in the project.
+- Supports full regex syntax (eg. "log.*Error", "function\\s+\\w+", etc.)
+- Use this tool when you need to find files containing specific patterns
+- Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
--- a/crates/assistant_tools/src/rename_tool.rs
+++ b/crates/assistant_tools/src/rename_tool.rs
@@ -129,13 +129,9 @@ impl Tool for RenameTool {
                })?
                .await?;

-            project
-                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                .await?;
-
            action_log.update(cx, |log, cx| {
-                log.buffer_edited(buffer.clone(), cx)
-            })?;
+                log.save_edited_buffer(buffer.clone(), cx)
+            })?.await?;

            Ok(format!("Renamed '{}' to '{}'", input.symbol, input.new_name))
        }).into()
--- a/crates/assistant_tools/src/replace.rs
+++ b/crates/assistant_tools/src/replace.rs
@@ -14,7 +14,6 @@ pub async fn replace_exact(old: &str, new: &str, snapshot: &BufferSnapshot) -> O
        true,
        PathMatcher::new(iter::empty::<&str>()).ok()?,
        PathMatcher::new(iter::empty::<&str>()).ok()?,
-        false,
        None,
    )
    .log_err()?;
@@ -59,8 +58,10 @@ pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapsho

    let max_row = buffer.max_point().row;

-    'windows: for start_row in 0..max_row + 1 {
-        let end_row = start_row + old_lines.len().saturating_sub(1) as u32;
+    'windows: for start_row in 0..max_row.saturating_sub(old_lines.len() as u32 - 1) {
+        let mut common_leading = None;
+
+        let end_row = start_row + old_lines.len() as u32 - 1;

        if end_row > max_row {
            // The buffer ends before fully matching the pattern
@@ -75,14 +76,6 @@ pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapsho
        let mut window_lines = window_text.lines();
        let mut old_lines_iter = old_lines.iter();

-        let mut common_mismatch = None;
-
-        #[derive(Eq, PartialEq)]
-        enum Mismatch {
-            OverIndented(String),
-            UnderIndented(String),
-        }
-
        while let (Some(window_line), Some(old_line)) = (window_lines.next(), old_lines_iter.next())
        {
            let line_trimmed = window_line.trim_start();
@@ -95,24 +88,18 @@ pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapsho
                continue;
            }

-            let line_mismatch = if window_line.len() > old_line.len() {
-                let prefix = window_line[..window_line.len() - old_line.len()].to_string();
-                Mismatch::UnderIndented(prefix)
-            } else {
-                let prefix = old_line[..old_line.len() - window_line.len()].to_string();
-                Mismatch::OverIndented(prefix)
-            };
+            let line_leading = &window_line[..window_line.len() - old_line.len()];

-            match &common_mismatch {
-                Some(common_mismatch) if common_mismatch != &line_mismatch => {
+            match &common_leading {
+                Some(common_leading) if common_leading != line_leading => {
                    continue 'windows;
                }
                Some(_) => (),
-                None => common_mismatch = Some(line_mismatch),
+                None => common_leading = Some(line_leading.to_string()),
            }
        }

-        if let Some(common_mismatch) = &common_mismatch {
+        if let Some(common_leading) = common_leading {
            let line_ending = buffer.line_ending();
            let replacement = new_lines
                .iter()
@@ -120,13 +107,7 @@ pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapsho
                    if new_line.trim().is_empty() {
                        new_line.to_string()
                    } else {
-                        match common_mismatch {
-                            Mismatch::UnderIndented(prefix) => prefix.to_string() + new_line,
-                            Mismatch::OverIndented(prefix) => new_line
-                                .strip_prefix(prefix)
-                                .unwrap_or(new_line)
-                                .to_string(),
-                        }
+                        common_leading.to_string() + new_line
                    }
                })
                .collect::<Vec<_>>()
@@ -168,123 +149,14 @@ fn lines_with_min_indent(input: &str) -> (Vec<&str>, usize) {
 }

 #[cfg(test)]
-mod replace_exact_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use gpui::prelude::*;
-
-    #[gpui::test]
-    async fn basic(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn no_match(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let y = 42;", "let y = 43;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn multi_line(cx: &mut TestAppContext) {
-        let whole = "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}";
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let result = test_replace_exact(cx, whole, old_text, new_text).await;
-        assert_eq!(
-            result,
-            Some("fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn multiple_occurrences(cx: &mut TestAppContext) {
-        let whole = "let x = 41;\nlet y = 41;\nlet z = 41;";
-        let result = test_replace_exact(cx, whole, "let x = 41;", "let x = 42;").await;
-        assert_eq!(
-            result,
-            Some("let x = 42;\nlet y = 41;\nlet z = 41;".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn empty_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn partial_match(cx: &mut TestAppContext) {
-        let whole = "let x = 41; let y = 42;";
-        let result = test_replace_exact(cx, whole, "let x = 41", "let x = 42").await;
-        assert_eq!(result, Some("let x = 42; let y = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn whitespace_sensitive(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", " let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn entire_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    async fn test_replace_exact(
-        cx: &mut TestAppContext,
-        whole: &str,
-        old: &str,
-        new: &str,
-    ) -> Option<String> {
-        let buffer = cx.new(|cx| language::Buffer::local(whole, cx));
-
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(old, new, &buffer_snapshot).await;
-        diff.map(|diff| {
-            buffer.update(cx, |buffer, cx| {
-                let _ = buffer.apply_diff(diff, cx);
-                buffer.text()
-            })
-        })
-    }
-}
-
-#[cfg(test)]
-mod flexible_indent_tests {
+mod tests {
    use super::*;
    use gpui::TestAppContext;
    use gpui::prelude::*;
    use unindent::Unindent;

    #[gpui::test]
-    fn test_underindented_single_line(cx: &mut TestAppContext) {
-        let cur = "        let a = 41;".to_string();
-        let old = "    let a = 41;".to_string();
-        let new = "    let a = 42;".to_string();
-        let exp = "        let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_overindented_single_line(cx: &mut TestAppContext) {
-        let cur = "    let a = 41;".to_string();
-        let old = "        let a = 41;".to_string();
-        let new = "        let a = 42;".to_string();
-        let exp = "    let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_underindented_multi_line(cx: &mut TestAppContext) {
+    fn test_replace_consistent_indentation(cx: &mut TestAppContext) {
        let whole = r#"
            fn test() {
                let x = 5;
@@ -321,33 +193,6 @@ mod flexible_indent_tests {
        );
    }

-    #[gpui::test]
-    fn test_overindented_multi_line(cx: &mut TestAppContext) {
-        let cur = r#"
-            fn foo() {
-                let a = 41;
-                let b = 3.13;
-            }
-        "#
-        .unindent();
-
-        // 6 space indent instead of 4
-        let old = "      let a = 41;\n      let b = 3.13;";
-        let new = "      let a = 42;\n      let b = 3.14;";
-
-        let expected = r#"
-            fn foo() {
-                let a = 42;
-                let b = 3.14;
-            }
-        "#
-        .unindent();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(expected.to_string()))
-    }
-
    #[gpui::test]
    fn test_replace_inconsistent_indentation(cx: &mut TestAppContext) {
        let whole = r#"
@@ -420,6 +265,7 @@ mod flexible_indent_tests {

    #[gpui::test]
    fn test_replace_no_match(cx: &mut TestAppContext) {
+        // Test with no match
        let whole = r#"
            fn test() {
                let x = 5;
@@ -470,71 +316,6 @@ mod flexible_indent_tests {
        );
    }

-    #[gpui::test]
-    fn test_replace_whole_is_shorter_than_old(cx: &mut TestAppContext) {
-        let whole = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            let y = 10;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 5;
-            let y = 20;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_old_is_empty(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-            }
-        "#
-        .unindent();
-
-        let old = "";
-        let new = r#"
-            let y = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_is_empty(cx: &mut TestAppContext) {
-        let whole = "";
-        let old = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
    #[test]
    fn test_lines_with_min_indent() {
        // Empty string
@@ -722,133 +503,6 @@ mod flexible_indent_tests {
        );
    }

-    #[gpui::test]
-    async fn test_replace_exact_basic(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        assert_eq!(diff.edits.len(), 1);
-
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_no_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let y = 42;", "let y = 43;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multi_line(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| {
-            language::Buffer::local(
-                "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}",
-                cx,
-            )
-        });
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let diff = replace_exact(old_text, new_text, &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(
-            result,
-            "fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multiple_occurrences(cx: &mut TestAppContext) {
-        let buffer =
-            cx.new(|cx| language::Buffer::local("let x = 41;\nlet y = 41;\nlet z = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Should replace only the first occurrence
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;\nlet y = 41;\nlet z = 41;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_empty_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_partial_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41; let y = 42;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Verify substring replacement actually works
-        let diff = replace_exact("let x = 41", "let x = 42", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42; let y = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_whitespace_sensitive(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(" let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_entire_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
    fn test_replace_with_flexible_indent(
        cx: &mut TestAppContext,
        whole: &str,
--- a/crates/assistant_tools/src/ui.rs
+++ b/crates/assistant_tools/src/ui.rs
@@ -1,3 +0,0 @@
-mod tool_call_card_header;
-
-pub use tool_call_card_header::*;
--- a/crates/assistant_tools/src/ui/tool_call_card_header.rs
+++ b/crates/assistant_tools/src/ui/tool_call_card_header.rs
@@ -1,102 +0,0 @@
-use gpui::{Animation, AnimationExt, App, IntoElement, pulsating_between};
-use std::time::Duration;
-use ui::{Tooltip, prelude::*};
-
-/// A reusable header component for tool call cards.
-#[derive(IntoElement)]
-pub struct ToolCallCardHeader {
-    icon: IconName,
-    primary_text: SharedString,
-    secondary_text: Option<SharedString>,
-    is_loading: bool,
-    error: Option<String>,
-}
-
-impl ToolCallCardHeader {
-    pub fn new(icon: IconName, primary_text: impl Into<SharedString>) -> Self {
-        Self {
-            icon,
-            primary_text: primary_text.into(),
-            secondary_text: None,
-            is_loading: false,
-            error: None,
-        }
-    }
-
-    pub fn with_secondary_text(mut self, text: impl Into<SharedString>) -> Self {
-        self.secondary_text = Some(text.into());
-        self
-    }
-
-    pub fn loading(mut self) -> Self {
-        self.is_loading = true;
-        self
-    }
-
-    pub fn with_error(mut self, error: impl Into<String>) -> Self {
-        self.error = Some(error.into());
-        self
-    }
-}
-
-impl RenderOnce for ToolCallCardHeader {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let font_size = rems(0.8125);
-        let secondary_text = self.secondary_text;
-
-        h_flex()
-            .id("tool-label-container")
-            .gap_1p5()
-            .max_w_full()
-            .overflow_x_scroll()
-            .opacity(0.8)
-            .child(
-                h_flex().h(window.line_height()).justify_center().child(
-                    Icon::new(self.icon)
-                        .size(IconSize::XSmall)
-                        .color(Color::Muted),
-                ),
-            )
-            .child(
-                h_flex()
-                    .h(window.line_height())
-                    .gap_1p5()
-                    .text_size(font_size)
-                    .map(|this| {
-                        if let Some(error) = &self.error {
-                            this.child(format!("{} failed", self.primary_text)).child(
-                                IconButton::new("error_info", IconName::Warning)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::XSmall)
-                                    .icon_color(Color::Warning)
-                                    .tooltip(Tooltip::text(error.clone())),
-                            )
-                        } else {
-                            this.child(self.primary_text.clone())
-                        }
-                    })
-                    .when_some(secondary_text, |this, secondary_text| {
-                        this.child(
-                            div()
-                                .size(px(3.))
-                                .rounded_full()
-                                .bg(cx.theme().colors().text),
-                        )
-                        .child(div().text_size(font_size).child(secondary_text.clone()))
-                    })
-                    .with_animation(
-                        "loading-label",
-                        Animation::new(Duration::from_secs(2))
-                            .repeat()
-                            .with_easing(pulsating_between(0.6, 1.)),
-                        move |this, delta| {
-                            if self.is_loading {
-                                this.opacity(delta)
-                            } else {
-                                this
-                            }
-                        },
-                    ),
-            )
-    }
-}
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -1,11 +1,13 @@
 use std::{sync::Arc, time::Duration};

 use crate::schema::json_schema_for;
-use crate::ui::ToolCallCardHeader;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
-use futures::{Future, FutureExt, TryFutureExt};
-use gpui::{App, AppContext, Context, Entity, IntoElement, Task, Window};
+use futures::{FutureExt, TryFutureExt};
+use gpui::{
+    Animation, AnimationExt, App, AppContext, Context, Entity, IntoElement, Task, Window,
+    pulsating_between,
+};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
@@ -45,7 +47,7 @@ impl Tool for WebSearchTool {
    }

    fn ui_text(&self, _input: &serde_json::Value) -> String {
-        "Searching the Web".to_string()
+        "Web Search".to_string()
    }

    fn run(
@@ -113,30 +115,61 @@ impl ToolCard for WebSearchToolCard {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let header = match self.response.as_ref() {
-            Some(Ok(response)) => {
-                let text: SharedString = if response.citations.len() == 1 {
-                    "1 result".into()
-                } else {
-                    format!("{} results", response.citations.len()).into()
-                };
-                ToolCallCardHeader::new(IconName::Globe, "Searched the Web")
-                    .with_secondary_text(text)
-            }
-            Some(Err(error)) => {
-                ToolCallCardHeader::new(IconName::Globe, "Web Search").with_error(error.to_string())
-            }
-            None => ToolCallCardHeader::new(IconName::Globe, "Searching the Web").loading(),
-        };
+        let header = h_flex()
+            .id("tool-label-container")
+            .gap_1p5()
+            .max_w_full()
+            .overflow_x_scroll()
+            .child(
+                Icon::new(IconName::Globe)
+                    .size(IconSize::XSmall)
+                    .color(Color::Muted),
+            )
+            .child(match self.response.as_ref() {
+                Some(Ok(response)) => {
+                    let text: SharedString = if response.citations.len() == 1 {
+                        "1 result".into()
+                    } else {
+                        format!("{} results", response.citations.len()).into()
+                    };
+                    h_flex()
+                        .gap_1p5()
+                        .child(Label::new("Searched the Web").size(LabelSize::Small))
+                        .child(
+                            div()
+                                .size(px(3.))
+                                .rounded_full()
+                                .bg(cx.theme().colors().text),
+                        )
+                        .child(Label::new(text).size(LabelSize::Small))
+                        .into_any_element()
+                }
+                Some(Err(error)) => div()
+                    .id("web-search-error")
+                    .child(Label::new("Web Search failed").size(LabelSize::Small))
+                    .tooltip(Tooltip::text(error.to_string()))
+                    .into_any_element(),
+
+                None => Label::new("Searching the Web…")
+                    .size(LabelSize::Small)
+                    .with_animation(
+                        "web-search-label",
+                        Animation::new(Duration::from_secs(2))
+                            .repeat()
+                            .with_easing(pulsating_between(0.6, 1.)),
+                        |label, delta| label.alpha(delta),
+                    )
+                    .into_any_element(),
+            })
+            .into_any();

        let content =
            self.response.as_ref().and_then(|response| match response {
                Ok(response) => {
                    Some(
                        v_flex()
-                            .overflow_hidden()
                            .ml_1p5()
-                            .pl(px(5.))
+                            .pl_1p5()
                            .border_l_1()
                            .border_color(cx.theme().colors().border_variant)
                            .gap_1()
@@ -176,7 +209,7 @@ impl ToolCard for WebSearchToolCard {
                Err(_) => None,
            });

-        v_flex().mb_3().gap_1().child(header).children(content)
+        v_flex().my_2().gap_1().child(header).children(content)
    }
 }

--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -84,10 +84,6 @@ pub enum Model {
 }

 impl Model {
-    pub fn default_fast() -> Self {
-        Self::Claude3_5Haiku
-    }
-
    pub fn from_id(id: &str) -> anyhow::Result<Self> {
        if id.starts_with("claude-3-5-sonnet-v2") {
            Ok(Self::Claude3_5SonnetV2)
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -4,7 +4,7 @@ use crate::TelemetrySettings;
 use anyhow::Result;
 use clock::SystemClock;
 use futures::channel::mpsc;
-use futures::{Future, FutureExt, StreamExt};
+use futures::{Future, StreamExt};
 use gpui::{App, AppContext as _, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
 use parking_lot::Mutex;
@@ -290,10 +290,6 @@ impl Telemetry {
        paths::logs_dir().join("telemetry.log")
    }

-    pub fn has_checksum_seed(&self) -> bool {
-        ZED_CLIENT_CHECKSUM_SEED.is_some()
-    }
-
    pub fn start(
        self: &Arc<Self>,
        system_id: Option<String>,
@@ -434,7 +430,7 @@ impl Telemetry {
            let executor = self.executor.clone();
            state.flush_events_task = Some(self.executor.spawn(async move {
                executor.timer(FLUSH_INTERVAL).await;
-                this.flush_events().detach();
+                this.flush_events();
            }));
        }

@@ -460,7 +456,7 @@ impl Telemetry {

        if state.installation_id.is_some() && state.events_queue.len() >= state.max_queue_size {
            drop(state);
-            self.flush_events().detach();
+            self.flush_events();
        }
    }

@@ -503,59 +499,60 @@ impl Telemetry {
            .body(json_bytes.into())?)
    }

-    pub fn flush_events(self: &Arc<Self>) -> Task<()> {
+    pub fn flush_events(self: &Arc<Self>) {
        let mut state = self.state.lock();
        state.first_event_date_time = None;
        let mut events = mem::take(&mut state.events_queue);
        state.flush_events_task.take();
        drop(state);
        if events.is_empty() {
-            return Task::ready(());
+            return;
        }

        let this = self.clone();
-        self.executor.spawn(
-            async move {
-                let mut json_bytes = Vec::new();
+        self.executor
+            .spawn(
+                async move {
+                    let mut json_bytes = Vec::new();

-                if let Some(file) = &mut this.state.lock().log_file {
-                    for event in &mut events {
-                        json_bytes.clear();
-                        serde_json::to_writer(&mut json_bytes, event)?;
-                        file.write_all(&json_bytes)?;
-                        file.write_all(b"\n")?;
+                    if let Some(file) = &mut this.state.lock().log_file {
+                        for event in &mut events {
+                            json_bytes.clear();
+                            serde_json::to_writer(&mut json_bytes, event)?;
+                            file.write_all(&json_bytes)?;
+                            file.write_all(b"\n")?;
+                        }
                    }
-                }

-                let request_body = {
-                    let state = this.state.lock();
+                    let request_body = {
+                        let state = this.state.lock();

-                    EventRequestBody {
-                        system_id: state.system_id.as_deref().map(Into::into),
-                        installation_id: state.installation_id.as_deref().map(Into::into),
-                        session_id: state.session_id.clone(),
-                        metrics_id: state.metrics_id.as_deref().map(Into::into),
-                        is_staff: state.is_staff,
-                        app_version: state.app_version.clone(),
-                        os_name: state.os_name.clone(),
-                        os_version: state.os_version.clone(),
-                        architecture: state.architecture.to_string(),
+                        EventRequestBody {
+                            system_id: state.system_id.as_deref().map(Into::into),
+                            installation_id: state.installation_id.as_deref().map(Into::into),
+                            session_id: state.session_id.clone(),
+                            metrics_id: state.metrics_id.as_deref().map(Into::into),
+                            is_staff: state.is_staff,
+                            app_version: state.app_version.clone(),
+                            os_name: state.os_name.clone(),
+                            os_version: state.os_version.clone(),
+                            architecture: state.architecture.to_string(),

-                        release_channel: state.release_channel.map(Into::into),
-                        events,
+                            release_channel: state.release_channel.map(Into::into),
+                            events,
+                        }
+                    };
+
+                    let request = this.build_request(json_bytes, request_body)?;
+                    let response = this.http_client.send(request).await?;
+                    if response.status() != 200 {
+                        log::error!("Failed to send events: HTTP {:?}", response.status());
                    }
-                };
-
-                let request = this.build_request(json_bytes, request_body)?;
-                let response = this.http_client.send(request).await?;
-                if response.status() != 200 {
-                    log::error!("Failed to send events: HTTP {:?}", response.status());
+                    anyhow::Ok(())
                }
-                anyhow::Ok(())
-            }
-            .log_err()
-            .map(|_| ()),
-        )
+                .log_err(),
+            )
+            .detach();
    }
 }

--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -516,7 +516,6 @@ pub async fn post_events(
    if let Some(kinesis_client) = app.kinesis_client.clone() {
        if let Some(stream) = app.config.kinesis_stream.clone() {
            let mut request = kinesis_client.put_records().stream_name(stream);
-            let mut has_records = false;
            for row in for_snowflake(
                request_body.clone(),
                first_event_at,
@@ -531,12 +530,9 @@ pub async fn post_events(
                            .build()
                            .unwrap(),
                    );
-                    has_records = true;
                }
            }
-            if has_records {
-                request.send().await.log_err();
-            }
+            request.send().await.log_err();
        }
    };

@@ -559,7 +555,7 @@ fn for_snowflake(
    country_code: Option<String>,
    checksum_matched: bool,
 ) -> impl Iterator<Item = SnowflakeRow> {
-    body.events.into_iter().filter_map(move |event| {
+    body.events.into_iter().flat_map(move |event| {
        let timestamp =
            first_event_at + Duration::milliseconds(event.milliseconds_since_first_event);
        // We will need to double check, but I believe all of the events that
@@ -748,11 +744,9 @@ fn for_snowflake(
        // NOTE: most amplitude user properties are read out of our event_properties
        // dictionary. See https://app.amplitude.com/data/zed/Zed/sources/detail/production/falcon%3A159998
        // for how that is configured.
-        let user_properties = body.is_staff.map(|is_staff| {
-            serde_json::json!({
-                "is_staff": is_staff,
-            })
-        });
+        let user_properties = Some(serde_json::json!({
+            "is_staff": body.is_staff,
+        }));

        Some(SnowflakeRow {
            time: timestamp,
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -5091,7 +5091,6 @@ async fn test_project_search(
                false,
                Default::default(),
                Default::default(),
-                false,
                None,
            )
            .unwrap(),
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -882,7 +882,6 @@ impl RandomizedTest for ProjectCollaborationTest {
                            false,
                            Default::default(),
                            Default::default(),
-                            false,
                            None,
                        )
                        .unwrap(),
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -1,7 +1,7 @@
 use crate::tests::TestServer;
 use call::ActiveCall;
 use collections::{HashMap, HashSet};
-
+use dap::DapRegistry;
 use extension::ExtensionHostProxy;
 use fs::{FakeFs, Fs as _, RemoveOptions};
 use futures::StreamExt as _;
@@ -86,6 +86,7 @@ async fn test_sharing_an_ssh_remote_project(
                http_client: remote_http_client,
                node_runtime: node,
                languages,
+                debug_adapters: Arc::new(DapRegistry::fake()),
                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
            },
            cx,
@@ -253,6 +254,7 @@ async fn test_ssh_collaboration_git_branches(
                http_client: remote_http_client,
                node_runtime: node,
                languages,
+                debug_adapters: Arc::new(DapRegistry::fake()),
                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
            },
            cx,
@@ -458,6 +460,7 @@ async fn test_ssh_collaboration_formatting_with_prettier(
                http_client: remote_http_client,
                node_runtime: NodeRuntime::unavailable(),
                languages,
+                debug_adapters: Arc::new(DapRegistry::fake()),
                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
            },
            cx,
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -14,7 +14,7 @@ use client::{
 use clock::FakeSystemClock;
 use collab_ui::channel_view::ChannelView;
 use collections::{HashMap, HashSet};
-
+use dap::DapRegistry;
 use fs::FakeFs;
 use futures::{StreamExt as _, channel::oneshot};
 use git::GitHostingProviderRegistry;
@@ -275,12 +275,14 @@ impl TestServer {
        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
        let language_registry = Arc::new(LanguageRegistry::test(cx.executor()));
+        let debug_adapters = Arc::new(DapRegistry::default());
        let session = cx.new(|cx| AppSession::new(Session::test(), cx));
        let app_state = Arc::new(workspace::AppState {
            client: client.clone(),
            user_store: user_store.clone(),
            workspace_store,
            languages: language_registry,
+            debug_adapters,
            fs: fs.clone(),
            build_window_options: |_, _| Default::default(),
            node_runtime: NodeRuntime::unavailable(),
@@ -796,6 +798,7 @@ impl TestClient {
                self.app_state.node_runtime.clone(),
                self.app_state.user_store.clone(),
                self.app_state.languages.clone(),
+                self.app_state.debug_adapters.clone(),
                self.app_state.fs.clone(),
                None,
                cx,
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -37,7 +37,6 @@ static MENTIONS_SEARCH: LazyLock<SearchQuery> = LazyLock::new(|| {
        false,
        Default::default(),
        Default::default(),
-        false,
        None,
    )
    .unwrap()
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
@@ -166,9 +166,6 @@ impl ComponentPreview {

        component_preview.update_component_list(cx);

-        let focus_handle = component_preview.filter_editor.read(cx).focus_handle(cx);
-        window.focus(&focus_handle);
-
        component_preview
    }

@@ -782,13 +779,10 @@ impl Item for ComponentPreview {
    fn added_to_workspace(
        &mut self,
        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
    ) {
        self.workspace_id = workspace.database_id();
-
-        let focus_handle = self.filter_editor.read(cx).focus_handle(cx);
-        window.focus(&focus_handle);
    }
 }

--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -61,10 +61,6 @@ pub enum Model {
 }

 impl Model {
-    pub fn default_fast() -> Self {
-        Self::Claude3_7Sonnet
-    }
-
    pub fn uses_streaming(&self) -> bool {
        match self {
            Self::Gpt4o
--- a/crates/dap/Cargo.toml
+++ b/crates/dap/Cargo.toml
@@ -39,7 +39,6 @@ log.workspace = true
 node_runtime.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
-proto.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -3,8 +3,7 @@ use anyhow::{Context as _, Result, anyhow};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
 use async_trait::async_trait;
-use collections::HashMap;
-use dap_types::{StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest};
+use dap_types::StartDebuggingRequestArguments;
 use futures::io::BufReader;
 use gpui::{AsyncApp, SharedString};
 pub use http_client::{HttpClient, github::latest_github_release};
@@ -14,10 +13,16 @@ use serde::{Deserialize, Serialize};
 use settings::WorktreeId;
 use smol::{self, fs::File, lock::Mutex};
 use std::{
-    borrow::Borrow, collections::HashSet, ffi::OsStr, fmt::Debug, net::Ipv4Addr, ops::Deref,
-    path::PathBuf, sync::Arc,
+    borrow::Borrow,
+    collections::{HashMap, HashSet},
+    ffi::{OsStr, OsString},
+    fmt::Debug,
+    net::Ipv4Addr,
+    ops::Deref,
+    path::PathBuf,
+    sync::Arc,
 };
-use task::{DebugTaskDefinition, TcpArgumentsTemplate};
+use task::DebugTaskDefinition;
 use util::ResultExt;

 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -88,91 +93,17 @@ pub struct TcpArguments {
    pub port: u16,
    pub timeout: Option<u64>,
 }
-
-impl TcpArguments {
-    pub fn from_proto(proto: proto::TcpHost) -> anyhow::Result<Self> {
-        let host = TcpArgumentsTemplate::from_proto(proto)?;
-        Ok(TcpArguments {
-            host: host.host.ok_or_else(|| anyhow!("missing host"))?,
-            port: host.port.ok_or_else(|| anyhow!("missing port"))?,
-            timeout: host.timeout,
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::TcpHost {
-        TcpArgumentsTemplate {
-            host: Some(self.host),
-            port: Some(self.port),
-            timeout: self.timeout,
-        }
-        .to_proto()
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct DebugAdapterBinary {
+    pub adapter_name: DebugAdapterName,
    pub command: String,
-    pub arguments: Vec<String>,
-    pub envs: HashMap<String, String>,
+    pub arguments: Option<Vec<OsString>>,
+    pub envs: Option<HashMap<String, String>>,
    pub cwd: Option<PathBuf>,
    pub connection: Option<TcpArguments>,
    pub request_args: StartDebuggingRequestArguments,
 }

-impl DebugAdapterBinary {
-    pub fn from_proto(binary: proto::DebugAdapterBinary) -> anyhow::Result<Self> {
-        let request = match binary.launch_type() {
-            proto::debug_adapter_binary::LaunchType::Launch => {
-                StartDebuggingRequestArgumentsRequest::Launch
-            }
-            proto::debug_adapter_binary::LaunchType::Attach => {
-                StartDebuggingRequestArgumentsRequest::Attach
-            }
-        };
-
-        Ok(DebugAdapterBinary {
-            command: binary.command,
-            arguments: binary.arguments,
-            envs: binary.envs.into_iter().collect(),
-            connection: binary
-                .connection
-                .map(TcpArguments::from_proto)
-                .transpose()?,
-            request_args: StartDebuggingRequestArguments {
-                configuration: serde_json::from_str(&binary.configuration)?,
-                request,
-            },
-            cwd: binary.cwd.map(|cwd| cwd.into()),
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::DebugAdapterBinary {
-        proto::DebugAdapterBinary {
-            command: self.command.clone(),
-            arguments: self.arguments.clone(),
-            envs: self
-                .envs
-                .iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect(),
-            cwd: self
-                .cwd
-                .as_ref()
-                .map(|cwd| cwd.to_string_lossy().to_string()),
-            connection: self.connection.as_ref().map(|c| c.to_proto()),
-            launch_type: match self.request_args.request {
-                StartDebuggingRequestArgumentsRequest::Launch => {
-                    proto::debug_adapter_binary::LaunchType::Launch.into()
-                }
-                StartDebuggingRequestArgumentsRequest::Attach => {
-                    proto::debug_adapter_binary::LaunchType::Attach.into()
-                }
-            },
-            configuration: self.request_args.configuration.to_string(),
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct AdapterVersion {
    pub tag_name: String,
@@ -387,22 +318,22 @@ impl FakeAdapter {

    fn request_args(&self, config: &DebugTaskDefinition) -> StartDebuggingRequestArguments {
        use serde_json::json;
-        use task::DebugRequest;
+        use task::DebugRequestType;

        let value = json!({
            "request": match config.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
+                DebugRequestType::Launch(_) => "launch",
+                DebugRequestType::Attach(_) => "attach",
            },
-            "process_id": if let DebugRequest::Attach(attach_config) = &config.request {
+            "process_id": if let DebugRequestType::Attach(attach_config) = &config.request {
                attach_config.process_id
            } else {
                None
            },
        });
        let request = match config.request {
-            DebugRequest::Launch(_) => dap_types::StartDebuggingRequestArgumentsRequest::Launch,
-            DebugRequest::Attach(_) => dap_types::StartDebuggingRequestArgumentsRequest::Attach,
+            DebugRequestType::Launch(_) => dap_types::StartDebuggingRequestArgumentsRequest::Launch,
+            DebugRequestType::Attach(_) => dap_types::StartDebuggingRequestArgumentsRequest::Attach,
        };
        StartDebuggingRequestArguments {
            configuration: value,
@@ -426,10 +357,11 @@ impl DebugAdapter for FakeAdapter {
        _: &mut AsyncApp,
    ) -> Result<DebugAdapterBinary> {
        Ok(DebugAdapterBinary {
+            adapter_name: Self::ADAPTER_NAME.into(),
            command: "command".into(),
-            arguments: vec![],
+            arguments: None,
            connection: None,
-            envs: HashMap::default(),
+            envs: None,
            cwd: None,
            request_args: self.request_args(config),
        })
--- a/crates/dap/src/client.rs
+++ b/crates/dap/src/client.rs
@@ -1,5 +1,5 @@
 use crate::{
-    adapters::DebugAdapterBinary,
+    adapters::{DebugAdapterBinary, DebugAdapterName},
    transport::{IoKind, LogKind, TransportDelegate},
 };
 use anyhow::{Result, anyhow};
@@ -88,6 +88,7 @@ impl DebugAdapterClient {
    ) -> Result<Self> {
        let binary = match self.transport_delegate.transport() {
            crate::transport::Transport::Tcp(tcp_transport) => DebugAdapterBinary {
+                adapter_name: binary.adapter_name,
                command: binary.command,
                arguments: binary.arguments,
                envs: binary.envs,
@@ -218,6 +219,9 @@ impl DebugAdapterClient {
        self.id
    }

+    pub fn name(&self) -> DebugAdapterName {
+        self.binary.adapter_name.clone()
+    }
    pub fn binary(&self) -> &DebugAdapterBinary {
        &self.binary
    }
@@ -318,6 +322,7 @@ mod tests {
        let client = DebugAdapterClient::start(
            crate::client::SessionId(1),
            DebugAdapterBinary {
+                adapter_name: "adapter".into(),
                command: "command".into(),
                arguments: Default::default(),
                envs: Default::default(),
@@ -388,6 +393,7 @@ mod tests {
        let client = DebugAdapterClient::start(
            crate::client::SessionId(1),
            DebugAdapterBinary {
+                adapter_name: "adapter".into(),
                command: "command".into(),
                arguments: Default::default(),
                envs: Default::default(),
@@ -441,6 +447,7 @@ mod tests {
        let client = DebugAdapterClient::start(
            crate::client::SessionId(1),
            DebugAdapterBinary {
+                adapter_name: "test-adapter".into(),
                command: "command".into(),
                arguments: Default::default(),
                envs: Default::default(),
--- a/crates/dap/src/dap.rs
+++ b/crates/dap/src/dap.rs
@@ -7,7 +7,7 @@ pub mod transport;

 pub use dap_types::*;
 pub use registry::DapRegistry;
-pub use task::DebugRequest;
+pub use task::DebugRequestType;

 pub type ScopeId = u64;
 pub type VariableReference = u64;
--- a/crates/dap/src/registry.rs
+++ b/crates/dap/src/registry.rs
@@ -1,4 +1,3 @@
-use gpui::{App, Global};
 use parking_lot::RwLock;

 use crate::adapters::{DebugAdapter, DebugAdapterName};
@@ -12,20 +11,8 @@ struct DapRegistryState {
 #[derive(Clone, Default)]
 /// Stores available debug adapters.
 pub struct DapRegistry(Arc<RwLock<DapRegistryState>>);
-impl Global for DapRegistry {}

 impl DapRegistry {
-    pub fn global(cx: &mut App) -> &mut Self {
-        let ret = cx.default_global::<Self>();
-
-        #[cfg(any(test, feature = "test-support"))]
-        if ret.adapter(crate::FakeAdapter::ADAPTER_NAME).is_none() {
-            ret.add_adapter(Arc::new(crate::FakeAdapter::new()));
-        }
-
-        ret
-    }
-
    pub fn add_adapter(&self, adapter: Arc<dyn DebugAdapter>) {
        let name = adapter.name();
        let _previous_value = self.0.write().adapters.insert(name, adapter);
@@ -34,12 +21,19 @@ impl DapRegistry {
            "Attempted to insert a new debug adapter when one is already registered"
        );
    }
-
    pub fn adapter(&self, name: &str) -> Option<Arc<dyn DebugAdapter>> {
        self.0.read().adapters.get(name).cloned()
    }
-
    pub fn enumerate_adapters(&self) -> Vec<DebugAdapterName> {
        self.0.read().adapters.keys().cloned().collect()
    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn fake() -> Self {
+        use crate::FakeAdapter;
+
+        let register = Self::default();
+        register.add_adapter(Arc::new(FakeAdapter::new()));
+        register
+    }
 }
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -21,7 +21,7 @@ use std::{
    sync::Arc,
    time::Duration,
 };
-use task::TcpArgumentsTemplate;
+use task::TCPHost;
 use util::ResultExt as _;

 use crate::{adapters::DebugAdapterBinary, debugger_settings::DebuggerSettings};
@@ -74,14 +74,16 @@ pub enum Transport {
 }

 impl Transport {
-    async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
+    #[cfg(any(test, feature = "test-support"))]
+    async fn start(_: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
        #[cfg(any(test, feature = "test-support"))]
-        if cfg!(any(test, feature = "test-support")) {
-            return FakeTransport::start(cx)
-                .await
-                .map(|(transports, fake)| (transports, Self::Fake(fake)));
-        }
+        return FakeTransport::start(cx)
+            .await
+            .map(|(transports, fake)| (transports, Self::Fake(fake)));
+    }

+    #[cfg(not(any(test, feature = "test-support")))]
+    async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
        if binary.connection.is_some() {
            TcpTransport::start(binary, cx)
                .await
@@ -518,21 +520,18 @@ pub struct TcpTransport {

 impl TcpTransport {
    /// Get an open port to use with the tcp client when not supplied by debug config
-    pub async fn port(host: &TcpArgumentsTemplate) -> Result<u16> {
+    pub async fn port(host: &TCPHost) -> Result<u16> {
        if let Some(port) = host.port {
            Ok(port)
        } else {
-            Self::unused_port(host.host()).await
+            Ok(TcpListener::bind(SocketAddrV4::new(host.host(), 0))
+                .await?
+                .local_addr()?
+                .port())
        }
    }

-    pub async fn unused_port(host: Ipv4Addr) -> Result<u16> {
-        Ok(TcpListener::bind(SocketAddrV4::new(host, 0))
-            .await?
-            .local_addr()?
-            .port())
-    }
-
+    #[allow(dead_code, reason = "This is used in non test builds of Zed")]
    async fn start(binary: &DebugAdapterBinary, cx: AsyncApp) -> Result<(TransportPipe, Self)> {
        let Some(connection_args) = binary.connection.as_ref() else {
            return Err(anyhow!("No connection arguments provided"));
@@ -547,8 +546,13 @@ impl TcpTransport {
            command.current_dir(cwd);
        }

-        command.args(&binary.arguments);
-        command.envs(&binary.envs);
+        if let Some(args) = &binary.arguments {
+            command.args(args);
+        }
+
+        if let Some(envs) = &binary.envs {
+            command.envs(envs);
+        }

        command
            .stdin(Stdio::null())
@@ -631,8 +635,13 @@ impl StdioTransport {
            command.current_dir(cwd);
        }

-        command.args(&binary.arguments);
-        command.envs(&binary.envs);
+        if let Some(args) = &binary.arguments {
+            command.args(args);
+        }
+
+        if let Some(envs) = &binary.envs {
+            command.envs(envs);
+        }

        command
            .stdin(Stdio::piped())
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -1,10 +1,10 @@
-use std::{collections::HashMap, path::PathBuf, sync::OnceLock};
+use std::{path::PathBuf, sync::OnceLock};

 use anyhow::{Result, bail};
 use async_trait::async_trait;
 use dap::adapters::latest_github_release;
 use gpui::AsyncApp;
-use task::{DebugRequest, DebugTaskDefinition};
+use task::{DebugRequestType, DebugTaskDefinition};

 use crate::*;

@@ -19,8 +19,8 @@ impl CodeLldbDebugAdapter {
    fn request_args(&self, config: &DebugTaskDefinition) -> dap::StartDebuggingRequestArguments {
        let mut configuration = json!({
            "request": match config.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
+                DebugRequestType::Launch(_) => "launch",
+                DebugRequestType::Attach(_) => "attach",
            },
        });
        let map = configuration.as_object_mut().unwrap();
@@ -28,10 +28,10 @@ impl CodeLldbDebugAdapter {
        map.insert("name".into(), Value::String(config.label.clone()));
        let request = config.request.to_dap();
        match &config.request {
-            DebugRequest::Attach(attach) => {
+            DebugRequestType::Attach(attach) => {
                map.insert("pid".into(), attach.process_id.into());
            }
-            DebugRequest::Launch(launch) => {
+            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());

                if !launch.args.is_empty() {
@@ -140,13 +140,16 @@ impl DebugAdapter for CodeLldbDebugAdapter {
            .ok_or_else(|| anyhow!("Adapter path is expected to be valid UTF-8"))?;
        Ok(DebugAdapterBinary {
            command,
-            cwd: None,
-            arguments: vec![
+            cwd: Some(adapter_dir),
+            arguments: Some(vec![
                "--settings".into(),
-                json!({"sourceLanguages": ["cpp", "rust"]}).to_string(),
-            ],
+                json!({"sourceLanguages": ["cpp", "rust"]})
+                    .to_string()
+                    .into(),
+            ]),
            request_args: self.request_args(config),
-            envs: HashMap::default(),
+            adapter_name: "test".into(),
+            envs: None,
            connection: None,
        })
    }
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ b/crates/dap_adapters/src/dap_adapters.rs
@@ -11,7 +11,7 @@ use anyhow::{Result, anyhow};
 use async_trait::async_trait;
 use codelldb::CodeLldbDebugAdapter;
 use dap::{
-    DapRegistry, DebugRequest,
+    DapRegistry, DebugRequestType,
    adapters::{
        self, AdapterVersion, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName,
        GithubRepo,
@@ -19,26 +19,23 @@ use dap::{
 };
 use gdb::GdbDebugAdapter;
 use go::GoDebugAdapter;
-use gpui::{App, BorrowAppContext};
 use javascript::JsDebugAdapter;
 use php::PhpDebugAdapter;
 use python::PythonDebugAdapter;
 use serde_json::{Value, json};
-use task::TcpArgumentsTemplate;
+use task::TCPHost;

-pub fn init(cx: &mut App) {
-    cx.update_default_global(|registry: &mut DapRegistry, _cx| {
-        registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
-        registry.add_adapter(Arc::from(PythonDebugAdapter));
-        registry.add_adapter(Arc::from(PhpDebugAdapter));
-        registry.add_adapter(Arc::from(JsDebugAdapter));
-        registry.add_adapter(Arc::from(GoDebugAdapter));
-        registry.add_adapter(Arc::from(GdbDebugAdapter));
-    })
+pub fn init(registry: Arc<DapRegistry>) {
+    registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
+    registry.add_adapter(Arc::from(PythonDebugAdapter));
+    registry.add_adapter(Arc::from(PhpDebugAdapter));
+    registry.add_adapter(Arc::from(JsDebugAdapter));
+    registry.add_adapter(Arc::from(GoDebugAdapter));
+    registry.add_adapter(Arc::from(GdbDebugAdapter));
 }

 pub(crate) async fn configure_tcp_connection(
-    tcp_connection: TcpArgumentsTemplate,
+    tcp_connection: TCPHost,
 ) -> Result<(Ipv4Addr, u16, Option<u64>)> {
    let host = tcp_connection.host();
    let timeout = tcp_connection.timeout;
@@ -56,7 +53,7 @@ trait ToDap {
    fn to_dap(&self) -> dap::StartDebuggingRequestArgumentsRequest;
 }

-impl ToDap for DebugRequest {
+impl ToDap for DebugRequestType {
    fn to_dap(&self) -> dap::StartDebuggingRequestArgumentsRequest {
        match self {
            Self::Launch(_) => dap::StartDebuggingRequestArgumentsRequest::Launch,
--- a/crates/dap_adapters/src/gdb.rs
+++ b/crates/dap_adapters/src/gdb.rs
@@ -1,10 +1,10 @@
-use std::{collections::HashMap, ffi::OsStr};
+use std::ffi::OsStr;

 use anyhow::{Result, bail};
 use async_trait::async_trait;
 use dap::StartDebuggingRequestArguments;
 use gpui::AsyncApp;
-use task::{DebugRequest, DebugTaskDefinition};
+use task::{DebugRequestType, DebugTaskDefinition};

 use crate::*;

@@ -17,18 +17,18 @@ impl GdbDebugAdapter {
    fn request_args(&self, config: &DebugTaskDefinition) -> StartDebuggingRequestArguments {
        let mut args = json!({
            "request": match config.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
+                DebugRequestType::Launch(_) => "launch",
+                DebugRequestType::Attach(_) => "attach",
            },
        });

        let map = args.as_object_mut().unwrap();
        match &config.request {
-            DebugRequest::Attach(attach) => {
+            DebugRequestType::Attach(attach) => {
                map.insert("pid".into(), attach.process_id.into());
            }

-            DebugRequest::Launch(launch) => {
+            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());

                if !launch.args.is_empty() {
@@ -82,9 +82,10 @@ impl DebugAdapter for GdbDebugAdapter {
        let gdb_path = user_setting_path.unwrap_or(gdb_path?);

        Ok(DebugAdapterBinary {
+            adapter_name: Self::ADAPTER_NAME.into(),
            command: gdb_path,
-            arguments: vec!["-i=dap".into()],
-            envs: HashMap::default(),
+            arguments: Some(vec!["-i=dap".into()]),
+            envs: None,
            cwd: None,
            connection: None,
            request_args: self.request_args(config),
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -1,6 +1,6 @@
 use dap::StartDebuggingRequestArguments;
 use gpui::AsyncApp;
-use std::{collections::HashMap, ffi::OsStr, path::PathBuf};
+use std::{ffi::OsStr, path::PathBuf};
 use task::DebugTaskDefinition;

 use crate::*;
@@ -12,12 +12,12 @@ impl GoDebugAdapter {
    const ADAPTER_NAME: &'static str = "Delve";
    fn request_args(&self, config: &DebugTaskDefinition) -> StartDebuggingRequestArguments {
        let mut args = match &config.request {
-            dap::DebugRequest::Attach(attach_config) => {
+            dap::DebugRequestType::Attach(attach_config) => {
                json!({
                    "processId": attach_config.process_id,
                })
            }
-            dap::DebugRequest::Launch(launch_config) => json!({
+            dap::DebugRequestType::Launch(launch_config) => json!({
                "program": launch_config.program,
                "cwd": launch_config.cwd,
                "args": launch_config.args
@@ -92,14 +92,15 @@ impl DebugAdapter for GoDebugAdapter {
        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;

        Ok(DebugAdapterBinary {
+            adapter_name: self.name(),
            command: delve_path,
-            arguments: vec![
+            arguments: Some(vec![
                "dap".into(),
                "--listen".into(),
-                format!("{}:{}", host, port),
-            ],
+                format!("{}:{}", host, port).into(),
+            ]),
            cwd: None,
-            envs: HashMap::default(),
+            envs: None,
            connection: Some(adapters::TcpArguments {
                host,
                port,
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -1,8 +1,8 @@
 use adapters::latest_github_release;
 use dap::StartDebuggingRequestArguments;
 use gpui::AsyncApp;
-use std::{collections::HashMap, path::PathBuf};
-use task::{DebugRequest, DebugTaskDefinition};
+use std::path::PathBuf;
+use task::{DebugRequestType, DebugTaskDefinition};

 use crate::*;

@@ -18,16 +18,16 @@ impl JsDebugAdapter {
        let mut args = json!({
            "type": "pwa-node",
            "request": match config.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
+                DebugRequestType::Launch(_) => "launch",
+                DebugRequestType::Attach(_) => "attach",
            },
        });
        let map = args.as_object_mut().unwrap();
        match &config.request {
-            DebugRequest::Attach(attach) => {
+            DebugRequestType::Attach(attach) => {
                map.insert("processId".into(), attach.process_id.into());
            }
-            DebugRequest::Launch(launch) => {
+            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());

                if !launch.args.is_empty() {
@@ -106,22 +106,20 @@ impl DebugAdapter for JsDebugAdapter {
        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;

        Ok(DebugAdapterBinary {
+            adapter_name: self.name(),
            command: delegate
                .node_runtime()
                .binary_path()
                .await?
                .to_string_lossy()
                .into_owned(),
-            arguments: vec![
-                adapter_path
-                    .join(Self::ADAPTER_PATH)
-                    .to_string_lossy()
-                    .to_string(),
-                port.to_string(),
-                host.to_string(),
-            ],
+            arguments: Some(vec![
+                adapter_path.join(Self::ADAPTER_PATH).into(),
+                port.to_string().into(),
+                host.to_string().into(),
+            ]),
            cwd: None,
-            envs: HashMap::default(),
+            envs: None,
            connection: Some(adapters::TcpArguments {
                host,
                port,
--- a/crates/dap_adapters/src/php.rs
+++ b/crates/dap_adapters/src/php.rs
@@ -1,7 +1,7 @@
 use adapters::latest_github_release;
 use dap::adapters::TcpArguments;
 use gpui::AsyncApp;
-use std::{collections::HashMap, path::PathBuf};
+use std::path::PathBuf;
 use task::DebugTaskDefinition;

 use crate::*;
@@ -19,18 +19,20 @@ impl PhpDebugAdapter {
        config: &DebugTaskDefinition,
    ) -> Result<dap::StartDebuggingRequestArguments> {
        match &config.request {
-            dap::DebugRequest::Attach(_) => {
+            dap::DebugRequestType::Attach(_) => {
                anyhow::bail!("php adapter does not support attaching")
            }
-            dap::DebugRequest::Launch(launch_config) => Ok(dap::StartDebuggingRequestArguments {
-                configuration: json!({
-                    "program": launch_config.program,
-                    "cwd": launch_config.cwd,
-                    "args": launch_config.args,
-                    "stopOnEntry": config.stop_on_entry.unwrap_or_default(),
-                }),
-                request: config.request.to_dap(),
-            }),
+            dap::DebugRequestType::Launch(launch_config) => {
+                Ok(dap::StartDebuggingRequestArguments {
+                    configuration: json!({
+                        "program": launch_config.program,
+                        "cwd": launch_config.cwd,
+                        "args": launch_config.args,
+                        "stopOnEntry": config.stop_on_entry.unwrap_or_default(),
+                    }),
+                    request: config.request.to_dap(),
+                })
+            }
        }
    }
 }
@@ -92,26 +94,24 @@ impl DebugAdapter for PhpDebugAdapter {
        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;

        Ok(DebugAdapterBinary {
+            adapter_name: self.name(),
            command: delegate
                .node_runtime()
                .binary_path()
                .await?
                .to_string_lossy()
                .into_owned(),
-            arguments: vec![
-                adapter_path
-                    .join(Self::ADAPTER_PATH)
-                    .to_string_lossy()
-                    .to_string(),
-                format!("--server={}", port),
-            ],
+            arguments: Some(vec![
+                adapter_path.join(Self::ADAPTER_PATH).into(),
+                format!("--server={}", port).into(),
+            ]),
            connection: Some(TcpArguments {
                port,
                host,
                timeout,
            }),
            cwd: None,
-            envs: HashMap::default(),
+            envs: None,
            request_args: self.request_args(config)?,
        })
    }
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -1,7 +1,7 @@
 use crate::*;
-use dap::{DebugRequest, StartDebuggingRequestArguments};
+use dap::{DebugRequestType, StartDebuggingRequestArguments};
 use gpui::AsyncApp;
-use std::{collections::HashMap, ffi::OsStr, path::PathBuf};
+use std::{ffi::OsStr, path::PathBuf};
 use task::DebugTaskDefinition;

 #[derive(Default)]
@@ -16,18 +16,18 @@ impl PythonDebugAdapter {
    fn request_args(&self, config: &DebugTaskDefinition) -> StartDebuggingRequestArguments {
        let mut args = json!({
            "request": match config.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
+                DebugRequestType::Launch(_) => "launch",
+                DebugRequestType::Attach(_) => "attach",
            },
            "subProcess": true,
            "redirectOutput": true,
        });
        let map = args.as_object_mut().unwrap();
        match &config.request {
-            DebugRequest::Attach(attach) => {
+            DebugRequestType::Attach(attach) => {
                map.insert("processId".into(), attach.process_id.into());
            }
-            DebugRequest::Launch(launch) => {
+            DebugRequestType::Launch(launch) => {
                map.insert("program".into(), launch.program.clone().into());
                map.insert("args".into(), launch.args.clone().into());

@@ -141,22 +141,20 @@ impl DebugAdapter for PythonDebugAdapter {
        };

        Ok(DebugAdapterBinary {
+            adapter_name: self.name(),
            command: python_path.ok_or(anyhow!("failed to find binary path for python"))?,
-            arguments: vec![
-                debugpy_dir
-                    .join(Self::ADAPTER_PATH)
-                    .to_string_lossy()
-                    .to_string(),
-                format!("--port={}", port),
-                format!("--host={}", host),
-            ],
+            arguments: Some(vec![
+                debugpy_dir.join(Self::ADAPTER_PATH).into(),
+                format!("--port={}", port).into(),
+                format!("--host={}", host).into(),
+            ]),
            connection: Some(adapters::TcpArguments {
                host,
                port,
                timeout,
            }),
            cwd: None,
-            envs: HashMap::default(),
+            envs: None,
            request_args: self.request_args(config),
        })
    }
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -566,13 +566,11 @@ impl DapLogView {
            .dap_store()
            .read(cx)
            .sessions()
-            .filter_map(|session| {
-                let session = session.read(cx);
-                session.adapter_name();
-                let client = session.adapter_client()?;
+            .filter_map(|client| {
+                let client = client.read(cx).adapter_client()?;
                Some(DapMenuItem {
                    client_id: client.id(),
-                    client_name: session.adapter_name().to_string(),
+                    client_name: client.name().0.as_ref().into(),
                    has_adapter_logs: client.has_adapter_logs(),
                    selected_entry: self.current_view.map_or(LogKind::Adapter, |(_, kind)| kind),
                })
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -1,4 +1,4 @@
-use dap::DebugRequest;
+use dap::DebugRequestType;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::Subscription;
 use gpui::{DismissEvent, Entity, EventEmitter, Focusable, Render};
@@ -216,10 +216,10 @@ impl PickerDelegate for AttachModalDelegate {
        };

        match &mut self.debug_config.request {
-            DebugRequest::Attach(config) => {
+            DebugRequestType::Attach(config) => {
                config.process_id = Some(candidate.pid);
            }
-            DebugRequest::Launch(_) => {
+            DebugRequestType::Launch(_) => {
                debug_panic!("Debugger attach modal used on launch debug config");
                return;
            }
--- a/crates/debugger_ui/src/new_session_modal.rs
+++ b/crates/debugger_ui/src/new_session_modal.rs
@@ -5,7 +5,7 @@ use std::{
 };

 use anyhow::{Result, anyhow};
-use dap::{DapRegistry, DebugRequest};
+use dap::DebugRequestType;
 use editor::{Editor, EditorElement, EditorStyle};
 use gpui::{
    App, AppContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, TextStyle,
@@ -13,7 +13,7 @@ use gpui::{
 };
 use project::Project;
 use settings::Settings;
-use task::{DebugTaskDefinition, DebugTaskTemplate, LaunchRequest};
+use task::{DebugTaskDefinition, LaunchConfig};
 use theme::ThemeSettings;
 use ui::{
    ActiveTheme, Button, ButtonCommon, ButtonSize, CheckboxWithLabel, Clickable, Color, Context,
@@ -37,9 +37,9 @@ pub(super) struct NewSessionModal {
    last_selected_profile_name: Option<SharedString>,
 }

-fn suggested_label(request: &DebugRequest, debugger: &str) -> String {
+fn suggested_label(request: &DebugRequestType, debugger: &str) -> String {
    match request {
-        DebugRequest::Launch(config) => {
+        DebugRequestType::Launch(config) => {
            let last_path_component = Path::new(&config.program)
                .file_name()
                .map(|name| name.to_string_lossy())
@@ -47,7 +47,7 @@ fn suggested_label(request: &DebugRequest, debugger: &str) -> String {

            format!("{} ({debugger})", last_path_component)
        }
-        DebugRequest::Attach(config) => format!(
+        DebugRequestType::Attach(config) => format!(
            "pid: {} ({debugger})",
            config.process_id.unwrap_or(u32::MAX)
        ),
@@ -71,7 +71,7 @@ impl NewSessionModal {
            .and_then(|def| def.stop_on_entry);

        let launch_config = match past_debug_definition.map(|def| def.request) {
-            Some(DebugRequest::Launch(launch_config)) => Some(launch_config),
+            Some(DebugRequestType::Launch(launch_config)) => Some(launch_config),
            _ => None,
        };

@@ -96,6 +96,7 @@ impl NewSessionModal {
            request,
            initialize_args: self.initialize_args.clone(),
            tcp_connection: None,
+            locator: None,
            stop_on_entry: match self.stop_on_entry {
                ToggleState::Selected => Some(true),
                _ => None,
@@ -130,16 +131,20 @@ impl NewSessionModal {
            let project = workspace.update(cx, |workspace, _| workspace.project().clone())?;

            let task = project.update(cx, |this, cx| {
-                let template = DebugTaskTemplate {
-                    locator: None,
-                    definition: config.clone(),
-                };
-                if let Some(debug_config) = template
-                    .to_zed_format()
-                    .resolve_task("debug_task", &task_context)
-                    .and_then(|resolved_task| resolved_task.resolved_debug_adapter_config())
+                if let Some(debug_config) =
+                    config
+                        .clone()
+                        .to_zed_format()
+                        .ok()
+                        .and_then(|task_template| {
+                            task_template
+                                .resolve_task("debug_task", &task_context)
+                                .and_then(|resolved_task| {
+                                    resolved_task.resolved_debug_adapter_config()
+                                })
+                        })
                {
-                    this.start_debug_session(debug_config.definition, cx)
+                    this.start_debug_session(debug_config, cx)
                } else {
                    this.start_debug_session(config, cx)
                }
@@ -209,7 +214,12 @@ impl NewSessionModal {
                };

                let available_adapters = workspace
-                    .update(cx, |_, cx| DapRegistry::global(cx).enumerate_adapters())
+                    .update(cx, |this, cx| {
+                        this.project()
+                            .read(cx)
+                            .debug_adapters()
+                            .enumerate_adapters()
+                    })
                    .ok()
                    .unwrap_or_default();

@@ -241,14 +251,14 @@ impl NewSessionModal {
                            this.debugger = Some(task.adapter.clone().into());
                            this.initialize_args = task.initialize_args.clone();
                            match &task.request {
-                                DebugRequest::Launch(launch_config) => {
+                                DebugRequestType::Launch(launch_config) => {
                                    this.mode = NewSessionMode::launch(
                                        Some(launch_config.clone()),
                                        window,
                                        cx,
                                    );
                                }
-                                DebugRequest::Attach(_) => {
+                                DebugRequestType::Attach(_) => {
                                    let Ok(project) = this
                                        .workspace
                                        .read_with(cx, |this, _| this.project().clone())
@@ -275,7 +285,7 @@ impl NewSessionModal {
                    }
                };

-                let available_adapters: Vec<DebugTaskTemplate> = workspace
+                let available_adapters: Vec<DebugTaskDefinition> = workspace
                    .update(cx, |this, cx| {
                        this.project()
                            .read(cx)
@@ -293,9 +303,9 @@ impl NewSessionModal {

                for debug_definition in available_adapters {
                    menu = menu.entry(
-                        debug_definition.definition.label.clone(),
+                        debug_definition.label.clone(),
                        None,
-                        setter_for_name(debug_definition.definition),
+                        setter_for_name(debug_definition),
                    );
                }
                menu
@@ -312,7 +322,7 @@ struct LaunchMode {

 impl LaunchMode {
    fn new(
-        past_launch_config: Option<LaunchRequest>,
+        past_launch_config: Option<LaunchConfig>,
        window: &mut Window,
        cx: &mut App,
    ) -> Entity<Self> {
@@ -338,9 +348,9 @@ impl LaunchMode {
        cx.new(|_| Self { program, cwd })
    }

-    fn debug_task(&self, cx: &App) -> task::LaunchRequest {
+    fn debug_task(&self, cx: &App) -> task::LaunchConfig {
        let path = self.cwd.read(cx).text(cx);
-        task::LaunchRequest {
+        task::LaunchConfig {
            program: self.program.read(cx).text(cx),
            cwd: path.is_empty().not().then(|| PathBuf::from(path)),
            args: Default::default(),
@@ -363,9 +373,10 @@ impl AttachMode {
    ) -> Entity<Self> {
        let debug_definition = DebugTaskDefinition {
            label: "Attach New Session Setup".into(),
-            request: dap::DebugRequest::Attach(task::AttachRequest { process_id: None }),
+            request: dap::DebugRequestType::Attach(task::AttachConfig { process_id: None }),
            tcp_connection: None,
            adapter: debugger.clone().unwrap_or_default().into(),
+            locator: None,
            initialize_args: None,
            stop_on_entry: Some(false),
        };
@@ -380,8 +391,8 @@ impl AttachMode {
            attach_picker,
        })
    }
-    fn debug_task(&self) -> task::AttachRequest {
-        task::AttachRequest { process_id: None }
+    fn debug_task(&self) -> task::AttachConfig {
+        task::AttachConfig { process_id: None }
    }
 }

@@ -395,7 +406,7 @@ enum NewSessionMode {
 }

 impl NewSessionMode {
-    fn debug_task(&self, cx: &App) -> DebugRequest {
+    fn debug_task(&self, cx: &App) -> DebugRequestType {
        match self {
            NewSessionMode::Launch(entity) => entity.read(cx).debug_task(cx).into(),
            NewSessionMode::Attach(entity) => entity.read(cx).debug_task().into(),
@@ -477,7 +488,7 @@ impl NewSessionMode {
        Self::Attach(AttachMode::new(debugger, project, window, cx))
    }
    fn launch(
-        past_launch_config: Option<LaunchRequest>,
+        past_launch_config: Option<LaunchConfig>,
        window: &mut Window,
        cx: &mut Context<NewSessionModal>,
    ) -> Self {
--- a/crates/debugger_ui/src/tests/attach_modal.rs
+++ b/crates/debugger_ui/src/tests/attach_modal.rs
@@ -5,7 +5,7 @@ use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
 use menu::Confirm;
 use project::{FakeFs, Project};
 use serde_json::json;
-use task::{AttachRequest, DebugTaskDefinition, TcpArgumentsTemplate};
+use task::{AttachConfig, DebugTaskDefinition, TCPHost};
 use tests::{init_test, init_test_workspace};

 #[gpui::test]
@@ -31,12 +31,13 @@ async fn test_direct_attach_to_process(executor: BackgroundExecutor, cx: &mut Te
        cx,
        DebugTaskDefinition {
            adapter: "fake-adapter".to_string(),
-            request: dap::DebugRequest::Attach(AttachRequest {
+            request: dap::DebugRequestType::Attach(AttachConfig {
                process_id: Some(10),
            }),
            label: "label".to_string(),
            initialize_args: None,
            tcp_connection: None,
+            locator: None,
            stop_on_entry: None,
        },
        |client| {
@@ -104,10 +105,11 @@ async fn test_show_attach_modal_and_select_process(
                    project.clone(),
                    DebugTaskDefinition {
                        adapter: FakeAdapter::ADAPTER_NAME.into(),
-                        request: dap::DebugRequest::Attach(AttachRequest::default()),
+                        request: dap::DebugRequestType::Attach(AttachConfig::default()),
                        label: "attach example".into(),
                        initialize_args: None,
-                        tcp_connection: Some(TcpArgumentsTemplate::default()),
+                        tcp_connection: Some(TCPHost::default()),
+                        locator: None,
                        stop_on_entry: None,
                    },
                    vec![
--- a/crates/deepseek/src/deepseek.rs
+++ b/crates/deepseek/src/deepseek.rs
@@ -64,10 +64,6 @@ pub enum Model {
 }

 impl Model {
-    pub fn default_fast() -> Self {
-        Model::Chat
-    }
-
    pub fn from_id(id: &str) -> Result<Self> {
        match id {
            "deepseek-chat" => Ok(Self::Chat),
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -760,7 +760,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng

    // The mutated view may contain more than the reference view as
    // we don't currently shrink excerpts when diagnostics were removed.
-    let mut ref_iter = reference_excerpts.lines().filter(|line| *line != "§ -----");
+    let mut ref_iter = reference_excerpts.lines();
    let mut next_ref_line = ref_iter.next();
    let mut skipped_block = false;

@@ -768,7 +768,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
        if let Some(ref_line) = next_ref_line {
            if mut_line == ref_line {
                next_ref_line = ref_iter.next();
-            } else if mut_line.contains('§') && mut_line != "§ -----" {
+            } else if mut_line.contains('§') {
                skipped_block = true;
            }
        }
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -215,7 +215,6 @@ const MAX_SELECTION_HISTORY_LEN: usize = 1024;
 pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
 #[doc(hidden)]
 pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
-const SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);

 pub(crate) const CODE_ACTION_TIMEOUT: Duration = Duration::from_secs(5);
 pub(crate) const FORMAT_TIMEOUT: Duration = Duration::from_secs(5);
@@ -812,8 +811,7 @@ pub struct Editor {
    next_completion_id: CompletionId,
    available_code_actions: Option<(Location, Rc<[AvailableCodeAction]>)>,
    code_actions_task: Option<Task<Result<()>>>,
-    quick_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
-    debounced_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
+    selection_highlight_task: Option<Task<()>>,
    document_highlights_task: Option<Task<()>>,
    linked_editing_range_task: Option<Task<Option<()>>>,
    linked_edit_ranges: linked_editing_ranges::LinkedEditingRanges,
@@ -1592,8 +1590,7 @@ impl Editor {
            code_action_providers,
            available_code_actions: Default::default(),
            code_actions_task: Default::default(),
-            quick_selection_highlight_task: Default::default(),
-            debounced_selection_highlight_task: Default::default(),
+            selection_highlight_task: Default::default(),
            document_highlights_task: Default::default(),
            linked_editing_range_task: Default::default(),
            pending_rename: Default::default(),
@@ -1723,7 +1720,6 @@ impl Editor {
                                new_anchor.offset,
                            );
                        });
-                        editor.hide_signature_help(cx, SignatureHelpHiddenBy::Escape);
                    }
                }
                EditorEvent::Edited { .. } => {
@@ -3108,13 +3104,6 @@ impl Editor {
        cx.notify();
    }

-    pub fn has_non_empty_selection(&self, cx: &mut App) -> bool {
-        self.selections
-            .all_adjusted(cx)
-            .iter()
-            .any(|selection| !selection.is_empty())
-    }
-
    pub fn has_pending_nonempty_selection(&self) -> bool {
        let pending_nonempty_selection = match self.selections.pending_anchor() {
            Some(Selection { start, end, .. }) => start != end,
@@ -5118,21 +5107,44 @@ impl Editor {
            CodeActionsItem::Task(task_source_kind, resolved_task) => {
                match resolved_task.task_type() {
                    task::TaskType::Script => workspace.update(cx, |workspace, cx| {
-                        workspace.schedule_resolved_task(
+                        workspace::tasks::schedule_resolved_task(
+                            workspace,
                            task_source_kind,
                            resolved_task,
                            false,
-                            window,
                            cx,
                        );

                        Some(Task::ready(Ok(())))
                    }),
-                    task::TaskType::Debug(_) => {
-                        workspace.update(cx, |workspace, cx| {
-                            workspace.schedule_debug_task(resolved_task, window, cx);
-                        });
-                        Some(Task::ready(Ok(())))
+                    task::TaskType::Debug(debug_args) => {
+                        if debug_args.locator.is_some() {
+                            workspace.update(cx, |workspace, cx| {
+                                workspace::tasks::schedule_resolved_task(
+                                    workspace,
+                                    task_source_kind,
+                                    resolved_task,
+                                    false,
+                                    cx,
+                                );
+                            });
+
+                            return Some(Task::ready(Ok(())));
+                        }
+
+                        if let Some(project) = self.project.as_ref() {
+                            project
+                                .update(cx, |project, cx| {
+                                    project.start_debug_session(
+                                        resolved_task.resolved_debug_adapter_config().unwrap(),
+                                        cx,
+                                    )
+                                })
+                                .detach_and_log_err(cx);
+                            Some(Task::ready(Ok(())))
+                        } else {
+                            Some(Task::ready(Ok(())))
+                        }
                    }
                }
            }
@@ -5463,169 +5475,111 @@ impl Editor {
        None
    }

-    fn prepare_highlight_query_from_selection(
+    pub fn refresh_selected_text_highlights(
        &mut self,
+        window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Option<(String, Range<Anchor>)> {
+    ) {
        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            return None;
+            return;
        }
+        self.selection_highlight_task.take();
        if !EditorSettings::get_global(cx).selection_highlight {
-            return None;
+            self.clear_background_highlights::<SelectedTextHighlight>(cx);
+            return;
        }
        if self.selections.count() != 1 || self.selections.line_mode {
-            return None;
+            self.clear_background_highlights::<SelectedTextHighlight>(cx);
+            return;
        }
        let selection = self.selections.newest::<Point>(cx);
        if selection.is_empty() || selection.start.row != selection.end.row {
-            return None;
+            self.clear_background_highlights::<SelectedTextHighlight>(cx);
+            return;
        }
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        let selection_anchor_range = selection.range().to_anchors(&multi_buffer_snapshot);
-        let query = multi_buffer_snapshot
-            .text_for_range(selection_anchor_range.clone())
-            .collect::<String>();
-        if query.trim().is_empty() {
-            return None;
-        }
-        Some((query, selection_anchor_range))
-    }
-
-    fn update_selection_occurrence_highlights(
-        &mut self,
-        query_text: String,
-        query_range: Range<Anchor>,
-        multi_buffer_range_to_query: Range<Point>,
-        use_debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<()> {
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        cx.spawn_in(window, async move |editor, cx| {
-            if use_debounce {
-                cx.background_executor()
-                    .timer(SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT)
-                    .await;
-            }
-            let match_task = cx.background_spawn(async move {
-                let buffer_ranges = multi_buffer_snapshot
-                    .range_to_buffer_ranges(multi_buffer_range_to_query)
-                    .into_iter()
-                    .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty());
-                let mut match_ranges = Vec::new();
-                for (buffer_snapshot, search_range, excerpt_id) in buffer_ranges {
-                    match_ranges.extend(
-                        project::search::SearchQuery::text(
-                            query_text.clone(),
-                            false,
-                            false,
-                            false,
-                            Default::default(),
-                            Default::default(),
-                            false,
-                            None,
-                        )
-                        .unwrap()
-                        .search(&buffer_snapshot, Some(search_range.clone()))
-                        .await
-                        .into_iter()
-                        .filter_map(|match_range| {
-                            let match_start = buffer_snapshot
-                                .anchor_after(search_range.start + match_range.start);
-                            let match_end =
-                                buffer_snapshot.anchor_before(search_range.start + match_range.end);
-                            let match_anchor_range = Anchor::range_in_buffer(
-                                excerpt_id,
-                                buffer_snapshot.remote_id(),
-                                match_start..match_end,
-                            );
-                            (match_anchor_range != query_range).then_some(match_anchor_range)
-                        }),
-                    );
-                }
-                match_ranges
-            });
-            let match_ranges = match_task.await;
+        let debounce = EditorSettings::get_global(cx).selection_highlight_debounce;
+        self.selection_highlight_task = Some(cx.spawn_in(window, async move |editor, cx| {
+            cx.background_executor()
+                .timer(Duration::from_millis(debounce))
+                .await;
+            let Some(Some(matches_task)) = editor
+                .update_in(cx, |editor, _, cx| {
+                    if editor.selections.count() != 1 || editor.selections.line_mode {
+                        editor.clear_background_highlights::<SelectedTextHighlight>(cx);
+                        return None;
+                    }
+                    let selection = editor.selections.newest::<Point>(cx);
+                    if selection.is_empty() || selection.start.row != selection.end.row {
+                        editor.clear_background_highlights::<SelectedTextHighlight>(cx);
+                        return None;
+                    }
+                    let buffer = editor.buffer().read(cx).snapshot(cx);
+                    let query = buffer.text_for_range(selection.range()).collect::<String>();
+                    if query.trim().is_empty() {
+                        editor.clear_background_highlights::<SelectedTextHighlight>(cx);
+                        return None;
+                    }
+                    Some(cx.background_spawn(async move {
+                        let mut ranges = Vec::new();
+                        let selection_anchors = selection.range().to_anchors(&buffer);
+                        for range in [buffer.anchor_before(0)..buffer.anchor_after(buffer.len())] {
+                            for (search_buffer, search_range, excerpt_id) in
+                                buffer.range_to_buffer_ranges(range)
+                            {
+                                ranges.extend(
+                                    project::search::SearchQuery::text(
+                                        query.clone(),
+                                        false,
+                                        false,
+                                        false,
+                                        Default::default(),
+                                        Default::default(),
+                                        None,
+                                    )
+                                    .unwrap()
+                                    .search(search_buffer, Some(search_range.clone()))
+                                    .await
+                                    .into_iter()
+                                    .filter_map(
+                                        |match_range| {
+                                            let start = search_buffer.anchor_after(
+                                                search_range.start + match_range.start,
+                                            );
+                                            let end = search_buffer.anchor_before(
+                                                search_range.start + match_range.end,
+                                            );
+                                            let range = Anchor::range_in_buffer(
+                                                excerpt_id,
+                                                search_buffer.remote_id(),
+                                                start..end,
+                                            );
+                                            (range != selection_anchors).then_some(range)
+                                        },
+                                    ),
+                                );
+                            }
+                        }
+                        ranges
+                    }))
+                })
+                .log_err()
+            else {
+                return;
+            };
+            let matches = matches_task.await;
            editor
                .update_in(cx, |editor, _, cx| {
                    editor.clear_background_highlights::<SelectedTextHighlight>(cx);
-                    if !match_ranges.is_empty() {
+                    if !matches.is_empty() {
                        editor.highlight_background::<SelectedTextHighlight>(
-                            &match_ranges,
+                            &matches,
                            |theme| theme.editor_document_highlight_bracket_background,
                            cx,
                        )
                    }
                })
                .log_err();
-        })
-    }
-
-    fn refresh_selected_text_highlights(&mut self, window: &mut Window, cx: &mut Context<Editor>) {
-        let Some((query_text, query_range)) = self.prepare_highlight_query_from_selection(cx)
-        else {
-            self.clear_background_highlights::<SelectedTextHighlight>(cx);
-            self.quick_selection_highlight_task.take();
-            self.debounced_selection_highlight_task.take();
-            return;
-        };
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        if self
-            .quick_selection_highlight_task
-            .as_ref()
-            .map_or(true, |(prev_anchor_range, _)| {
-                prev_anchor_range != &query_range
-            })
-        {
-            let multi_buffer_visible_start = self
-                .scroll_manager
-                .anchor()
-                .anchor
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
-                multi_buffer_visible_start
-                    + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
-                Bias::Left,
-            );
-            let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
-            self.quick_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text.clone(),
-                    query_range.clone(),
-                    multi_buffer_visible_range,
-                    false,
-                    window,
-                    cx,
-                ),
-            ));
-        }
-        if self
-            .debounced_selection_highlight_task
-            .as_ref()
-            .map_or(true, |(prev_anchor_range, _)| {
-                prev_anchor_range != &query_range
-            })
-        {
-            let multi_buffer_start = multi_buffer_snapshot
-                .anchor_before(0)
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_end = multi_buffer_snapshot
-                .anchor_after(multi_buffer_snapshot.len())
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_full_range = multi_buffer_start..multi_buffer_end;
-            self.debounced_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text,
-                    query_range,
-                    multi_buffer_full_range,
-                    true,
-                    window,
-                    cx,
-                ),
-            ));
-        }
+        }));
    }

    pub fn refresh_inline_completion(
@@ -6829,12 +6783,12 @@ impl Editor {
            resolved.reveal = reveal_strategy;

            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.schedule_resolved_task(
+                .update(cx, |workspace, cx| {
+                    workspace::tasks::schedule_resolved_task(
+                        workspace,
                        task_source_kind,
                        resolved_task,
                        false,
-                        window,
                        cx,
                    );
                })
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -10,6 +10,7 @@ pub struct EditorSettings {
    pub cursor_shape: Option<CursorShape>,
    pub current_line_highlight: CurrentLineHighlight,
    pub selection_highlight: bool,
+    pub selection_highlight_debounce: u64,
    pub lsp_highlight_debounce: u64,
    pub hover_popover_enabled: bool,
    pub hover_popover_delay: u64,
@@ -262,6 +263,10 @@ pub struct EditorSettingsContent {
    ///
    /// Default: true
    pub selection_highlight: Option<bool>,
+    /// The debounce delay before querying highlights based on the selected text.
+    ///
+    /// Default: 75
+    pub selection_highlight_debounce: Option<u64>,
    /// The debounce delay before querying highlights from the language
    /// server based on the current cursor location.
    ///
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -12,8 +12,8 @@ use crate::{
 use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind};
 use futures::StreamExt;
 use gpui::{
-    BackgroundExecutor, DismissEvent, SemanticVersion, TestAppContext, UpdateGlobal,
-    VisualTestContext, WindowBounds, WindowOptions, div,
+    BackgroundExecutor, SemanticVersion, TestAppContext, UpdateGlobal, VisualTestContext,
+    WindowBounds, WindowOptions, div,
 };
 use indoc::indoc;
 use language::{
@@ -19549,64 +19549,6 @@ println!("5");
    });
 }

-#[gpui::test]
-async fn test_hide_mouse_context_menu_on_modal_opened(cx: &mut TestAppContext) {
-    struct EmptyModalView {
-        focus_handle: gpui::FocusHandle,
-    }
-    impl EventEmitter<DismissEvent> for EmptyModalView {}
-    impl Render for EmptyModalView {
-        fn render(&mut self, _: &mut Window, _: &mut Context<'_, Self>) -> impl IntoElement {
-            div()
-        }
-    }
-    impl Focusable for EmptyModalView {
-        fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-    impl workspace::ModalView for EmptyModalView {}
-    fn new_empty_modal_view(cx: &App) -> EmptyModalView {
-        EmptyModalView {
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let buffer = cx.update(|cx| MultiBuffer::build_simple("hello world!", cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-        })
-        .unwrap();
-    editor.update_in(cx, |editor, window, cx| {
-        editor.open_context_menu(&OpenContextMenu, window, cx);
-        assert!(editor.mouse_context_menu.is_some());
-    });
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.toggle_modal(window, cx, |_, cx| new_empty_modal_view(cx));
-        })
-        .unwrap();
-    cx.read(|cx| {
-        assert!(editor.read(cx).mouse_context_menu.is_none());
-    });
-}
-
 fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {
    let point = DisplayPoint::new(DisplayRow(row as u32), column as u32);
    point..point
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -6681,10 +6681,7 @@ impl Element for EditorElement {
                    let max_row = snapshot.max_point().row().as_f32();

                    // The max scroll position for the top of the window
-                    let max_scroll_top = if matches!(
-                        snapshot.mode,
-                        EditorMode::AutoHeight { .. } | EditorMode::SingleLine { .. }
-                    ) {
+                    let max_scroll_top = if matches!(snapshot.mode, EditorMode::AutoHeight { .. }) {
                        (max_row - height_in_lines + 1.).max(0.)
                    } else {
                        let settings = EditorSettings::get_global(cx);
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -928,17 +928,9 @@ impl Item for Editor {
        &mut self,
        workspace: &mut Workspace,
        _window: &mut Window,
-        cx: &mut Context<Self>,
+        _: &mut Context<Self>,
    ) {
        self.workspace = Some((workspace.weak_handle(), workspace.database_id()));
-        if let Some(workspace) = &workspace.weak_handle().upgrade() {
-            cx.subscribe(&workspace, |editor, _, event: &workspace::Event, _cx| {
-                if matches!(event, workspace::Event::ModalOpened) {
-                    editor.mouse_context_menu.take();
-                }
-            })
-            .detach();
-        }
    }

    fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) {
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -199,9 +199,6 @@ pub fn editor_content_with_blocks(editor: &Entity<Editor>, cx: &mut VisualTestCo
                        lines[row.0 as usize].push_str("§ ");
                        lines[row.0 as usize].push_str(block_lines[0].trim_end());
                        for i in 1..height as usize {
-                            if row.0 as usize + i >= lines.len() {
-                                lines.push("".to_string());
-                            };
                            lines[row.0 as usize + i].push_str("§ ");
                            lines[row.0 as usize + i].push_str(block_lines[i].trim_end());
                        }
--- a/crates/eval/Cargo.toml
+++ b/crates/eval/Cargo.toml
@@ -7,14 +7,15 @@ edition.workspace = true
 [dependencies]
 agent.workspace = true
 anyhow.workspace = true
+async-watch.workspace = true
 assistant_tool.workspace = true
 assistant_tools.workspace = true
-async-watch.workspace = true
 chrono.workspace = true
 clap.workspace = true
 client.workspace = true
 collections.workspace = true
 context_server.workspace = true
+dap.workspace = true
 dirs = "5.0"
 env_logger.workspace = true
 extension.workspace = true
@@ -29,7 +30,6 @@ language_model.workspace = true
 language_models.workspace = true
 languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true
-parking_lot.workspace = true
 paths.workspace = true
 project.workspace = true
 prompt_store.workspace = true
@@ -38,7 +38,6 @@ reqwest_client.workspace = true
 serde.workspace = true
 settings.workspace = true
 shellexpand.workspace = true
-smol.workspace = true
 telemetry.workspace = true
 toml.workspace = true
 unindent.workspace = true
--- a/crates/eval/examples/add_arp_protocol_support/base.toml
+++ b/crates/eval/examples/add_arp_protocol_support/base.toml
@@ -0,0 +1,3 @@
+url = "https://github.com/GyulyVGC/sniffnet.git"
+revision = "cfb5b6519bd7838f279e5be9d360445aaffaa647"
+language_extension = "rs"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max Brunsfeld	35a773c492	Use diagnostic updates in trailing user messages Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Michael Sloan <mgsloan@gmail.com>	2025-04-19 12:58:21 +02:00
Agus Zubiaga	ea7fe49fb5	Do not use tag for "Using tool" marker Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>	2025-04-19 12:57:12 +02:00
Agus Zubiaga	7340513eee	Wait for diagnostics after saving a buffer from any tool	2025-04-19 12:57:09 +02:00
Agus Zubiaga	4568ed12c3	Do not set `edited_since_diagnostics_report` unnecessarily	2025-04-19 12:57:05 +02:00
Agus Zubiaga	fd00f0ba73	WIP - Comparing non open path diagnostics	2025-04-19 12:57:01 +02:00
Max Brunsfeld	43c5db9583	WIP - tweak approach to reporting changed diagnostics Co-authored-by: Agus Zubiaga <hi@aguz.me>	2025-04-19 12:56:56 +02:00
Antonio Scandurra	cba4effb2d	WIP: start reworking diagnostics	2025-04-19 12:56:51 +02:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-image-icon lucide-image"><rect width="18" height="18" x="3" y="3" rx="2" ry="2"/><circle cx="9" cy="9" r="2"/><path d="m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21"/></svg>`