Cargo fmt

chore: Prepare for Rust 2024
This is just a result of `cargo fix --edition`, without actually bumping the edition just yet.
2025-03-31 15:31:27 +02:00 · 2025-03-31 15:29:44 +02:00
1128 changed files with 30085 additions and 36798 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -14,10 +14,10 @@ linker = "clang"
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]

 [target.aarch64-apple-darwin]
-rustflags = ["-C", "link-args=-all_load"]
+rustflags = ["-C", "link-args=-Objc -all_load"]

 [target.x86_64-apple-darwin]
-rustflags = ["-C", "link-args=-all_load"]
+rustflags = ["-C", "link-args=-Objc -all_load"]

 [target.'cfg(target_os = "windows")']
 rustflags = [
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -1,43 +0,0 @@
-# This file contains settings for `cargo hakari`.
-# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
-
-hakari-package = "workspace-hack"
-
-resolver = "2"
-dep-format-version = "4"
-workspace-hack-line-style = "workspace-dotted"
-
-# this should be the same list as "targets" in ../rust-toolchain.toml
-platforms = [
-    "x86_64-apple-darwin",
-    "aarch64-apple-darwin",
-    "x86_64-unknown-linux-gnu",
-    "aarch64-unknown-linux-gnu",
-    "x86_64-pc-windows-msvc",
-    "x86_64-unknown-linux-musl", # remote server
-]
-
-[traversal-excludes]
-workspace-members = [
-    "remote_server",
-]
-third-party = [
-    { name = "reqwest", version = "0.11.27" },
-]
-
-[final-excludes]
-workspace-members = [
-    "zed_extension_api",
-
-    # exclude all extensions
-    "zed_emmet",
-    "zed_glsl",
-    "zed_html",
-    "perplexity",
-    "zed_proto",
-    "zed_ruff",
-    "slash_commands_example",
-    "zed_snippets",
-    "zed_test_extension",
-    "zed_toml",
-]
--- a/.github/actions/run_tests_windows/action.yml
+++ b/.github/actions/run_tests_windows/action.yml
@@ -23,4 +23,4 @@ runs:
    - name: Run tests
      shell: pwsh
      working-directory: ${{ inputs.working-directory }}
-      run: cargo nextest run --workspace --no-fail-fast --config='profile.dev.debug="limited"'
+      run: cargo nextest run --workspace --no-fail-fast
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,37 +110,6 @@ jobs:
          input: "crates/proto/proto/"
          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"

-  workspace_hack:
-    timeout-minutes: 60
-    name: Check workspace-hack crate
-    needs: [job_spec]
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - buildjet-8vcpu-ubuntu-2204
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: Install cargo-hakari
-        uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
-        with:
-          command: install
-          args: cargo-hakari@0.9.35
-
-      - name: Check workspace-hack Cargo.toml is up-to-date
-        run: |
-          cargo hakari generate --diff || {
-            echo "To fix, run script/update-workspace-hack";
-            false
-          }
-      - name: Check all crates depend on workspace-hack
-        run: |
-          cargo hakari manage-deps --dry-run || {
-            echo "To fix, run script/update-workspace-hack"
-            false
-          }
-
  style:
    timeout-minutes: 60
    name: Check formatting and spelling
@@ -463,7 +432,6 @@ jobs:
      - job_spec
      - style
      - migration_checks
-      - workspace_hack
      - linux_tests
      - build_remote_server
      - macos_tests
@@ -706,51 +674,6 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  nix-build:
-    timeout-minutes: 60
-    name: Nix Build
-    continue-on-error: true
-    if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
-    strategy:
-      fail-fast: false
-      matrix:
-        system:
-          - os: x86 Linux
-            runner: buildjet-16vcpu-ubuntu-2204
-            install_nix: true
-          - os: arm Mac
-            runner: [macOS, ARM64, test]
-            install_nix: false
-    runs-on: ${{ matrix.system.runner }}
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-      - name: Set path
-        if: ${{ ! matrix.system.install_nix }}
-        run: |
-          echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
-          echo "/Users/administrator/.nix-profile/bin" >> $GITHUB_PATH
-
-      - uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f # v31
-        if: ${{ matrix.system.install_nix }}
-        with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
-        with:
-          name: zed-industries
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          skipPush: true
-      - run: nix build .#debug
-      - name: Limit /nix/store to 50GB
-        run: "[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d"
-
  auto-release-preview:
    name: Auto release preview
    if: |
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -184,6 +184,9 @@ jobs:
          - os: arm Mac
            runner: [macOS, ARM64, test]
            install_nix: false
+          - os: arm Linux
+            runner: buildjet-16vcpu-ubuntu-2204-arm
+            install_nix: true
    if: github.repository_owner == 'zed-industries'
    runs-on: ${{ matrix.system.runner }}
    needs: tests
@@ -216,8 +219,7 @@ jobs:
          name: zed-industries
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
      - run: nix build
-      - name: Limit /nix/store to 50GB
-        run: '[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d'
+      - run: nix-collect-garbage -d

  update-nightly-tag:
    name: Update nightly tag
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -1,14 +1,14 @@
 [
  {
    "label": "Debug Zed with LLDB",
-    "adapter": "LLDB",
+    "adapter": "lldb",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT"
  },
  {
    "label": "Debug Zed with GDB",
-    "adapter": "GDB",
+    "adapter": "gdb",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT",
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,11 +2,11 @@
 resolver = "2"
 members = [
    "crates/activity_indicator",
-    "crates/agent",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
    "crates/assistant",
+    "crates/assistant2",
    "crates/assistant_context_editor",
    "crates/assistant_eval",
    "crates/assistant_settings",
@@ -192,14 +192,13 @@ members = [
    # Tooling
    #

-    "tooling/workspace-hack",
    "tooling/xtask",
 ]
 default-members = ["crates/zed"]

 [workspace.package]
 publish = false
-edition = "2024"
+edition = "2021"

 [workspace.dependencies]

@@ -208,12 +207,12 @@ edition = "2024"
 #

 activity_indicator = { path = "crates/activity_indicator" }
-agent = { path = "crates/agent" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
+assistant2 = { path = "crates/assistant2" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
 assistant_eval = { path = "crates/assistant_eval" }
 assistant_settings = { path = "crates/assistant_settings" }
@@ -400,12 +399,8 @@ async-tungstenite = "0.28"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.5.16", features = ["behavior-version-latest"] }
-aws-credential-types = { version = "1.2.1", features = [
-    "hardcoded-credentials",
-] }
-aws-sdk-bedrockruntime = { version = "1.73.0", features = [
-    "behavior-version-latest",
-] }
+aws-credential-types = { version = "1.2.1", features = ["hardcoded-credentials"] }
+aws-sdk-bedrockruntime = { version = "1.73.0", features = ["behavior-version-latest"] }
 aws-smithy-runtime-api = { version = "1.7.3", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.2.13", features = ["http-body-1-x"] }
 base64 = "0.22"
@@ -512,7 +507,6 @@ rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.22" }
 rustls-platform-verifier = "0.5.0"
-scap = { git = "https://github.com/zed-industries/scap", rev = "5715067104794aa356977c543e2f3e95c6183044", default-features = false }
 schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -552,7 +546,7 @@ time = { version = "0.3", features = [
 tiny_http = "0.8"
 toml = "0.8"
 tokio = { version = "1" }
-tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
+tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"]}
 tower-http = "0.4.4"
 tree-sitter = { version = "0.25.3", features = ["wasm"] }
 tree-sitter-bash = "0.23"
@@ -574,7 +568,7 @@ tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-ma
 tree-sitter-python = "0.23"
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"
-tree-sitter-rust = "0.24"
+tree-sitter-rust = "0.23"
 tree-sitter-typescript = "0.23"
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unicase = "2.6"
@@ -584,7 +578,6 @@ unicode-script = "0.5.7"
 url = "2.2"
 urlencoding = "2.1.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
-walkdir = "2.3"
 wasmparser = "0.221"
 wasm-encoder = "0.221"
 wasmtime = { version = "29", default-features = false, features = [
@@ -597,7 +590,6 @@ wasmtime = { version = "29", default-features = false, features = [
 wasmtime-wasi = "29"
 which = "6.0.0"
 wit-component = "0.221"
-workspace-hack = "0.1.0"
 zed_llm_client = "0.4"
 zstd = "0.11"
 metal = "0.29"
@@ -665,14 +657,10 @@ features = [
 [patch.crates-io]
 cpal = { git = "https://github.com/zed-industries/cpal", rev = "fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50" }
 real-async-tls = { git = "https://github.com/zed-industries/async-tls", rev = "1e759a4b5e370f87dc15e40756ac4f8815b61d9d", package = "async-tls" }
-notify = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }
-notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "bbb9ea5ae52b253e095737847e367c30653a2e96" }
-
-# Makes the workspace hack crate refer to the local one, but only when you're building locally
-workspace-hack = { path = "tooling/workspace-hack" }

 [profile.dev]
 split-debuginfo = "unpacked"
+debug = "limited"
 codegen-units = 16

 [profile.dev.package]
@@ -782,4 +770,4 @@ let_underscore_future = "allow"
 too_many_arguments = "allow"

 [workspace.metadata.cargo-machete]
-ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme", "workspace-hack"]
+ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.86-bookworm as builder
+FROM rust:1.81-bookworm as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/arrow_down_right.svg
+++ b/assets/icons/arrow_down_right.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-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></svg>
--- a/assets/icons/arrow_up_right.svg
+++ b/assets/icons/arrow_up_right.svg
@@ -1 +1,3 @@
-<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-arrow-up-right-icon lucide-arrow-up-right"><path d="M7 7h10v10"/><path d="M7 17 17 7"/></svg>
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 2H6.5C6.5 1.86739 6.44732 1.74021 6.35355 1.64645C6.25979 1.55268 6.13261 1.5 6 1.5V2ZM2 1.5C1.72386 1.5 1.5 1.72386 1.5 2C1.5 2.27614 1.72386 2.5 2 2.5L2 1.5ZM5.5 6C5.5 6.27614 5.72386 6.5 6 6.5C6.27614 6.5 6.5 6.27614 6.5 6H5.5ZM1.64645 5.64645C1.45118 5.84171 1.45118 6.15829 1.64645 6.35355C1.84171 6.54882 2.15829 6.54882 2.35355 6.35355L1.64645 5.64645ZM6 1.5H2L2 2.5H6V1.5ZM5.5 2V6H6.5V2H5.5ZM5.64645 1.64645L1.64645 5.64645L2.35355 6.35355L6.35355 2.35355L5.64645 1.64645Z" fill="white"/>
+</svg>
--- a/assets/icons/bug_off.svg
+++ b/assets/icons/bug_off.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-bug-off-icon lucide-bug-off"><path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2"/><path d="M14.12 3.88 16 2"/><path d="M22 13h-4v-2a4 4 0 0 0-4-4h-1.3"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="m2 2 20 20"/><path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13"/><path d="M12 20v-8"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/></svg>
--- a/assets/icons/check_double.svg
+++ b/assets/icons/check_double.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-check-check-icon lucide-check-check"><path d="M18 6 7 17l-5-5"/><path d="m22 10-7.5 7.5L13 16"/></svg>
--- a/assets/icons/circle_off.svg
+++ b/assets/icons/circle_off.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-circle-off-icon lucide-circle-off"><path d="m2 2 20 20"/><path d="M8.35 2.69A10 10 0 0 1 21.3 15.65"/><path d="M19.08 19.08A10 10 0 1 1 4.92 4.92"/></svg>
--- a/assets/icons/forward_arrow.svg
+++ b/assets/icons/forward_arrow.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-forward-icon lucide-forward"><polyline points="15 17 20 12 15 7"/><path d="M4 18v-2a4 4 0 0 1 4-4h12"/></svg>
--- a/assets/icons/power.svg
+++ b/assets/icons/power.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-power-icon lucide-power"><path d="M12 2v10"/><path d="M18.4 6.6a9 9 0 1 1-12.77.04"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -138,7 +138,7 @@
    }
  },
  {
-    "context": "Editor && !agent_diff",
+    "context": "Editor && !assistant_diff",
    "bindings": {
      "ctrl-k ctrl-r": "git::Restore",
      "ctrl-alt-y": "git::ToggleStaged",
@@ -147,10 +147,10 @@
    }
  },
  {
-    "context": "AgentDiff",
+    "context": "AssistantDiff",
    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-k ctrl-r": "agent::Reject"
+      "ctrl-y": "assistant2::ToggleKeep",
+      "ctrl-k ctrl-r": "assistant2::Reject"
    }
  },
  {
@@ -311,7 +311,6 @@
      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
      "back": "pane::GoBack",
      "ctrl-alt--": "pane::GoBack",
      "ctrl-alt-_": "pane::GoForward",
@@ -482,8 +481,6 @@
      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
      // also possible to spawn tasks by name:
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
  {
@@ -597,6 +594,13 @@
      "ctrl-:": "editor::ToggleInlayHints"
    }
  },
+  {
+    "context": "ProposedChangesEditor",
+    "bindings": {
+      "ctrl-shift-y": "editor::ApplyDiffHunk",
+      "ctrl-alt-a": "editor::ApplyAllDiffHunks"
+    }
+  },
  {
    "context": "Editor && jupyter && !ContextEditor",
    "bindings": {
@@ -621,34 +625,34 @@
    }
  },
  {
-    "context": "AgentPanel",
+    "context": "AssistantPanel2",
    "bindings": {
-      "ctrl-n": "agent::NewThread",
-      "new": "agent::NewThread",
-      "ctrl-alt-n": "agent::NewPromptEditor",
-      "ctrl-shift-h": "agent::OpenHistory",
-      "ctrl-alt-c": "agent::OpenConfiguration",
-      "ctrl-i": "agent::ToggleProfileSelector",
+      "ctrl-n": "assistant2::NewThread",
+      "new": "assistant2::NewThread",
+      "ctrl-alt-n": "assistant2::NewPromptEditor",
+      "ctrl-shift-h": "assistant2::OpenHistory",
+      "ctrl-alt-c": "assistant2::OpenConfiguration",
+      "ctrl-i": "assistant2::ToggleProfileSelector",
      "ctrl-alt-/": "assistant::ToggleModelSelector",
-      "ctrl-shift-a": "agent::ToggleContextPicker",
-      "ctrl-e": "agent::ChatMode",
-      "ctrl-alt-e": "agent::RemoveAllContext"
+      "ctrl-shift-a": "assistant2::ToggleContextPicker",
+      "ctrl-e": "assistant2::ChatMode",
+      "ctrl-alt-e": "assistant2::RemoveAllContext"
    }
  },
  {
-    "context": "AgentPanel && prompt_editor",
+    "context": "AssistantPanel2 && prompt_editor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "agent::NewPromptEditor",
-      "cmd-alt-t": "agent::NewThread"
+      "cmd-n": "assistant2::NewPromptEditor",
+      "cmd-alt-t": "assistant2::NewThread"
    }
  },
  {
    "context": "MessageEditor > Editor",
    "bindings": {
-      "enter": "agent::Chat",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
+      "enter": "assistant2::Chat",
+      "ctrl-i": "assistant2::ToggleProfileSelector",
+      "shift-ctrl-r": "assistant2::OpenAssistantDiff"
    }
  },
  {
@@ -660,30 +664,21 @@
      "alt-enter": "editor::Newline"
    }
  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "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"
+      "up": "assistant2::FocusUp",
+      "right": "assistant2::FocusRight",
+      "left": "assistant2::FocusLeft",
+      "down": "assistant2::FocusDown",
+      "backspace": "assistant2::RemoveFocusedContext",
+      "enter": "assistant2::AcceptSuggestedContext"
    }
  },
  {
    "context": "ThreadHistory",
    "bindings": {
-      "backspace": "agent::RemoveSelectedThread"
+      "backspace": "assistant2::RemoveSelectedThread"
    }
  },
  {
@@ -691,7 +686,7 @@
    "bindings": {
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist",
-      "ctrl-alt-e": "agent::RemoveAllContext"
+      "ctrl-alt-e": "assistant2::RemoveAllContext"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -228,7 +228,7 @@
    }
  },
  {
-    "context": "Editor && !agent_diff",
+    "context": "Editor && !assistant_diff",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-alt-z": "git::Restore",
@@ -238,11 +238,11 @@
    }
  },
  {
-    "context": "AgentDiff",
+    "context": "AssistantDiff",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-y": "agent::Keep",
-      "cmd-alt-z": "agent::Reject"
+      "cmd-y": "assistant2::ToggleKeep",
+      "cmd-alt-z": "assistant2::Reject"
    }
  },
  {
@@ -277,35 +277,35 @@
    }
  },
  {
-    "context": "AgentPanel",
+    "context": "AssistantPanel2",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "agent::NewThread",
-      "cmd-alt-n": "agent::NewPromptEditor",
-      "cmd-shift-h": "agent::OpenHistory",
-      "cmd-alt-c": "agent::OpenConfiguration",
-      "cmd-i": "agent::ToggleProfileSelector",
+      "cmd-n": "assistant2::NewThread",
+      "cmd-alt-n": "assistant2::NewPromptEditor",
+      "cmd-shift-h": "assistant2::OpenHistory",
+      "cmd-alt-c": "assistant2::OpenConfiguration",
+      "cmd-i": "assistant2::ToggleProfileSelector",
      "cmd-alt-/": "assistant::ToggleModelSelector",
-      "cmd-shift-a": "agent::ToggleContextPicker",
-      "cmd-e": "agent::ChatMode",
-      "cmd-alt-e": "agent::RemoveAllContext"
+      "cmd-shift-a": "assistant2::ToggleContextPicker",
+      "cmd-e": "assistant2::ChatMode",
+      "cmd-alt-e": "assistant2::RemoveAllContext"
    }
  },
  {
-    "context": "AgentPanel && prompt_editor",
+    "context": "AssistantPanel2 && prompt_editor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "agent::NewPromptEditor",
-      "cmd-alt-t": "agent::NewThread"
+      "cmd-n": "assistant2::NewPromptEditor",
+      "cmd-alt-t": "assistant2::NewThread"
    }
  },
  {
    "context": "MessageEditor > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "enter": "agent::Chat",
-      "cmd-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
+      "enter": "assistant2::Chat",
+      "cmd-i": "assistant2::ToggleProfileSelector",
+      "shift-ctrl-r": "assistant2::OpenAssistantDiff"
    }
  },
  {
@@ -317,31 +317,22 @@
      "alt-enter": "editor::Newline"
    }
  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
  {
    "context": "ContextStrip",
    "use_key_equivalents": true,
    "bindings": {
-      "up": "agent::FocusUp",
-      "right": "agent::FocusRight",
-      "left": "agent::FocusLeft",
-      "down": "agent::FocusDown",
-      "backspace": "agent::RemoveFocusedContext",
-      "enter": "agent::AcceptSuggestedContext"
+      "up": "assistant2::FocusUp",
+      "right": "assistant2::FocusRight",
+      "left": "assistant2::FocusLeft",
+      "down": "assistant2::FocusDown",
+      "backspace": "assistant2::RemoveFocusedContext",
+      "enter": "assistant2::AcceptSuggestedContext"
    }
  },
  {
    "context": "ThreadHistory",
    "bindings": {
-      "backspace": "agent::RemoveSelectedThread"
+      "backspace": "assistant2::RemoveSelectedThread"
    }
  },
  {
@@ -430,8 +421,7 @@
      "cmd-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
      "cmd-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "cmd-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "cmd-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "cmd-k cmd-w": "workspace::CloseAllItemsAndPanes",
+      "cmd-k cmd-w": ["pane::CloseAllItems", { "close_pinned": false }],
      "cmd-f": "project_search::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPreviousMatch",
@@ -608,8 +598,6 @@
      "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
      // also possible to spawn tasks by name:
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
  // Bindings from Sublime Text
@@ -716,13 +704,21 @@
      "ctrl-:": "editor::ToggleInlayHints"
    }
  },
+  {
+    "context": "ProposedChangesEditor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-shift-y": "editor::ApplyDiffHunk",
+      "cmd-shift-a": "editor::ApplyAllDiffHunks"
+    }
+  },
  {
    "context": "PromptEditor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-shift-a": "agent::ToggleContextPicker",
+      "cmd-shift-a": "assistant2::ToggleContextPicker",
      "cmd-alt-/": "assistant::ToggleModelSelector",
-      "cmd-alt-e": "agent::RemoveAllContext",
+      "cmd-alt-e": "assistant2::RemoveAllContext",
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist"
    }
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -227,8 +227,6 @@
      "g u": "vim::PushLowercase",
      "g shift-u": "vim::PushUppercase",
      "g ~": "vim::PushOppositeCase",
-      "g ?": "vim::PushRot13",
-      // "g ?": "vim::PushRot47",
      "\"": "vim::PushRegister",
      "g w": "vim::PushRewrap",
      "g q": "vim::PushRewrap",
@@ -263,7 +261,6 @@
      "o": "vim::OtherEndRowAware",
      "d": "vim::VisualDelete",
      "x": "vim::VisualDelete",
-      "delete": "vim::VisualDelete",
      "shift-d": "vim::VisualDeleteLine",
      "shift-x": "vim::VisualDeleteLine",
      "y": "vim::VisualYank",
@@ -300,8 +297,6 @@
      "g r": ["vim::Paste", { "preserve_clipboard": true }],
      "g c": "vim::ToggleComments",
      "g q": "vim::Rewrap",
-      "g ?": "vim::ConvertToRot13",
-      // "g ?": "vim::ConvertToRot47",
      "\"": "vim::PushRegister",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
@@ -335,106 +330,27 @@
    }
  },
  {
-    "context": "vim_mode == helix_normal && !menu",
+    "context": "vim_mode == helix_normal",
    "bindings": {
-      "escape": "editor::Cancel",
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "y": "editor::Copy",
-      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
-      "shift-i": "vim::InsertFirstNonWhitespace",
      "a": "vim::InsertAfter",
-      "shift-a": "vim::InsertEndOfLine",
-      "o": "vim::InsertLineBelow",
-      "shift-o": "vim::InsertLineAbove",
-      "~": "vim::ChangeCase",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "before": true }],
-      "u": "vim::Undo",
-      "ctrl-r": "vim::Redo",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      ">": "vim::Indent",
-      "<": "vim::Outdent",
-      "=": "vim::AutoIndent",
-      "g u": "vim::PushLowercase",
-      "g shift-u": "vim::PushUppercase",
-      "g ~": "vim::PushOppositeCase",
-      "\"": "vim::PushRegister",
-      "g q": "vim::PushRewrap",
-      "g w": "vim::PushRewrap",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "insert": "vim::InsertBefore",
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPreviousDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPreviousHunk",
-      // Goto mode
-      "g n": "pane::ActivateNextItem",
-      "g p": "pane::ActivatePreviousItem",
-      // "tab": "pane::ActivateNextItem",
-      // "shift-tab": "pane::ActivatePrevItem",
-      "shift-h": "pane::ActivatePreviousItem",
-      "shift-l": "pane::ActivateNextItem",
-      "g l": "vim::EndOfLine",
-      "g h": "vim::StartOfLine",
-      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
-      "g e": "vim::EndOfDocument",
-      "g y": "editor::GoToTypeDefinition",
-      "g r": "editor::FindAllReferences", // zed specific
-      "g t": "vim::WindowTop",
-      "g c": "vim::WindowMiddle",
-      "g b": "vim::WindowBottom",
-
-      "x": "editor::SelectLine",
-      "shift-x": "editor::SelectLine",
-      // Window mode
-      "space w h": "workspace::ActivatePaneLeft",
-      "space w l": "workspace::ActivatePaneRight",
-      "space w k": "workspace::ActivatePaneUp",
-      "space w j": "workspace::ActivatePaneDown",
-      "space w q": "pane::CloseActiveItem",
-      "space w s": "pane::SplitRight",
-      "space w r": "pane::SplitRight",
-      "space w v": "pane::SplitDown",
-      "space w d": "pane::SplitDown",
-      // Space mode
-      "space f": "file_finder::Toggle",
-      "space k": "editor::Hover",
-      "space s": "outline::Toggle",
-      "space shift-s": "project_symbols::Toggle",
-      "space d": "editor::GoToDiagnostic",
-      "space r": "editor::Rename",
-      "space a": "editor::ToggleCodeActions",
-      "space h": "editor::SelectAllMatches",
-      "space c": "editor::ToggleComments",
-      "space y": "editor::Copy",
-      "space p": "editor::Paste",
-      // Match mode
-      "m m": "vim::Matching",
-      "m i w": ["workspace::SendKeystrokes", "v i w"],
-      "shift-u": "editor::Redo",
-      "ctrl-c": "editor::ToggleComments",
      "d": "vim::HelixDelete",
-      "c": "vim::Substitute",
-      "shift-c": "editor::AddSelectionBelow"
+      "w": "vim::NextWordStart",
+      "e": "vim::NextWordEnd",
+      "b": "vim::PreviousWordStart",
+
+      "h": "vim::Left",
+      "j": "vim::Down",
+      "k": "vim::Up",
+      "l": "vim::Right"
    }
  },
+
  {
    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
    "bindings": {
-      "ctrl-p": "editor::ShowWordCompletions",
-      "ctrl-n": "editor::ShowWordCompletions"
+      "ctrl-p": "editor::ShowCompletions",
+      "ctrl-n": "editor::ShowCompletions"
    }
  },
  {
@@ -560,13 +476,6 @@
      "~": "vim::CurrentLine"
    }
  },
-  {
-    "context": "vim_operator == g?",
-    "bindings": {
-      "g ?": "vim::CurrentLine",
-      "?": "vim::CurrentLine"
-    }
-  },
  {
    "context": "vim_operator == gq",
    "bindings": {
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -1,37 +1,17 @@
-You are an AI assistant integrated into a code editor. You have the programming ability of an expert programmer who takes pride in writing high-quality code and is driven to the point of obsession about solving problems effectively. Your goal is to do one of the following two things:
+You are an AI assistant integrated into a text editor. Your goal is to do one of the following two things:

 1. Help users answer questions and perform tasks related to their codebase.
 2. Answer general-purpose questions unrelated to their particular codebase.

 It will be up to you to decide which of these you are doing based on what the user has told you. When unclear, ask clarifying questions to understand the user's intent before proceeding.

-You should only perform actions that modify the user's system if explicitly requested by the user:
+You should only perform actions that modify the user’s system if explicitly requested by the user:
 - If the user asks a question about how to accomplish a task, provide guidance or information, and use read-only tools (e.g., search) to assist. You may suggest potential actions, but do not directly modify the user’s system without explicit instruction.
 - If the user clearly requests that you perform an action, carry out the action directly without explaining why you are doing so.
-
-Editing code:
- Make sure to take previous edits into account.
- The edits you perform might lead to errors or warnings. At the end of your changes, check whether you introduced any problems, and fix them before providing a summary of the changes you made.
- You may only attempt to fix these up to 3 times. If you have tried 3 times to fix them, and there are still problems remaining, you must not continue trying to fix them, and must instead tell the user that there are problems remaining - and ask if the user would like you to attempt to solve them further.
+- The editing actions you perform might produce errors or warnings. At the end of your changes, check whether you introduced any problems, and fix them before providing a summary of the changes you made.
 - Do not fix errors unrelated to your changes unless the user explicitly asks you to do so.
- Prefer to move files over recreating them. The move can be followed by minor edits if required.

-Tool use:
- Make sure to adhere to the tools schema.
- Provide every required argument.
- DO NOT use tools to access items that are already available in the context section.
- Use only the tools that are currently available.
- DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-
-Responding:
- Be concise and direct in your responses.
- Never apologize or thank the user.
- Don't comment that you have just realized or understood something.
- When you are going to make a tool call, tersely explain your reasoning for choosing to use that tool, with no flourishes or commentary beyond that information.
-    For example, rather than saying "You're absolutely right! Thank you for providing that context. Now I understand that we're missing a dependency, and I need to add it:" say "I'll add that missing dependency:" instead.
- Also, don't restate what a tool call is about to do (or just did).
-    For example, don't say "Now I'm going to check diagnostics to see if there are any warnings or errors," followed by running a tool which checks diagnostics and reports warnings or errors; instead, just request the tool call without saying anything.
- All tool results are provided to you automatically, so DO NOT thank the user when this happens.
+Be concise and direct in your responses.

 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:

--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -633,45 +633,41 @@
      // The model to use.
      "model": "claude-3-5-sonnet-latest"
    },
-    // When enabled, the agent can run potentially destructive actions without asking for your confirmation.
-    "always_allow_tool_actions": false,
    "default_profile": "write",
    "profiles": {
      "ask": {
        "name": "Ask",
-        // We don't know which of the context server tools are safe for the "Ask" profile, so we don't enable them by default.
-        // "enable_all_context_servers": true,
        "tools": {
          "diagnostics": true,
          "fetch": true,
-          "list_directory": false,
+          "list-directory": true,
          "now": true,
-          "path_search": true,
-          "read_file": true,
-          "regex_search": true,
+          "path-search": true,
+          "read-file": true,
+          "regex-search": true,
          "thinking": true
        }
      },
      "write": {
        "name": "Write",
-        "enable_all_context_servers": true,
        "tools": {
          "bash": true,
-          "batch_tool": true,
-          "code_symbols": true,
-          "copy_path": false,
-          "create_file": true,
-          "delete_path": false,
+          "batch-tool": true,
+          "code-symbols": true,
+          "copy-path": true,
+          "create-file": true,
+          "delete-path": true,
          "diagnostics": true,
-          "find_replace_file": true,
+          "find-replace-file": true,
+          "edit-files": false,
          "fetch": true,
-          "list_directory": false,
-          "move_path": false,
+          "list-directory": true,
+          "move-path": true,
          "now": true,
-          "path_search": true,
-          "read_file": true,
-          "regex_search": true,
-          "symbol_info": true,
+          "path-search": true,
+          "read-file": true,
+          "regex-search": true,
+          "symbol-info": true,
          "thinking": true
        }
      }
@@ -1200,27 +1196,7 @@
    // When set to 0, waits indefinitely.
    //
    // Default: 0
-    "lsp_fetch_timeout_ms": 0,
-    // Controls what range to replace when accepting LSP completions.
-    //
-    // When LSP servers give an `InsertReplaceEdit` completion, they provides two ranges: `insert` and `replace`. Usually, `insert`
-    // contains the word prefix before your cursor and `replace` contains the whole word.
-    //
-    // Effectively, this setting just changes whether Zed will use the received range for `insert` or `replace`, so the results may
-    // differ depending on the underlying LSP server.
-    //
-    // Possible values:
-    // 1. "insert"
-    //   Replaces text before the cursor, using the `insert` range described in the LSP specification.
-    // 2. "replace"
-    //   Replaces text before and after the cursor, using the `replace` range described in the LSP specification.
-    // 3. "replace_subsequence"
-    //   Behaves like `"replace"` if the text that would be replaced is a subsequence of the completion text,
-    //   and like `"insert"` otherwise.
-    // 4. "replace_suffix"
-    //   Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
-    //   `"insert"` otherwise.
-    "lsp_insert_mode": "replace_suffix"
+    "lsp_fetch_timeout_ms": 0
  },
  // Different settings for specific languages.
  "languages": {
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -43,8 +43,6 @@
    //           "args": ["--login"]
    //         }
    //     }
-    "shell": "system",
-    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    "tags": []
+    "shell": "system"
  }
 ]
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -25,7 +25,6 @@ smallvec.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -3,20 +3,20 @@ use editor::Editor;
 use extension_host::ExtensionStore;
 use futures::StreamExt;
 use gpui::{
-    Animation, AnimationExt as _, App, Context, CursorStyle, Entity, EventEmitter,
-    InteractiveElement as _, ParentElement as _, Render, SharedString, StatefulInteractiveElement,
-    Styled, Transformation, Window, actions, percentage,
+    actions, percentage, Animation, AnimationExt as _, App, Context, CursorStyle, Entity,
+    EventEmitter, InteractiveElement as _, ParentElement as _, Render, SharedString,
+    StatefulInteractiveElement, Styled, Transformation, Window,
 };
 use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
 use project::{
    EnvironmentErrorMessage, LanguageServerProgress, LspStoreEvent, Project,
-    ProjectEnvironmentEvent,
+    ProjectEnvironmentEvent, WorktreeId,
 };
 use smallvec::SmallVec;
-use std::{cmp::Reverse, fmt::Write, path::Path, sync::Arc, time::Duration};
-use ui::{ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
+use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
+use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
 use util::truncate_and_trailoff;
-use workspace::{StatusItemView, Workspace, item::ItemHandle};
+use workspace::{item::ItemHandle, StatusItemView, Workspace};

 actions!(activity_indicator, [ShowErrorMessage]);

@@ -190,7 +190,7 @@ impl ActivityIndicator {
    fn pending_language_server_work<'a>(
        &self,
        cx: &'a App,
-    ) -> impl Iterator<Item = PendingWork<'a>> {
+    ) -> impl Iterator<Item = PendingWork<'a>> + use<'a> {
        self.project
            .read(cx)
            .language_server_statuses(cx)
@@ -218,14 +218,13 @@ impl ActivityIndicator {
    fn pending_environment_errors<'a>(
        &'a self,
        cx: &'a App,
-    ) -> impl Iterator<Item = (&'a Arc<Path>, &'a EnvironmentErrorMessage)> {
+    ) -> impl Iterator<Item = (&'a WorktreeId, &'a EnvironmentErrorMessage)> {
        self.project.read(cx).shell_environment_errors(cx)
    }

    fn content_to_render(&mut self, cx: &mut Context<Self>) -> Option<Content> {
        // Show if any direnv calls failed
-        if let Some((abs_path, error)) = self.pending_environment_errors(cx).next() {
-            let abs_path = abs_path.clone();
+        if let Some((&worktree_id, error)) = self.pending_environment_errors(cx).next() {
            return Some(Content {
                icon: Some(
                    Icon::new(IconName::Warning)
@@ -235,7 +234,7 @@ impl ActivityIndicator {
                message: error.0.clone(),
                on_click: Some(Arc::new(move |this, window, cx| {
                    this.project.update(cx, |project, cx| {
-                        project.remove_environment_error(&abs_path, cx);
+                        project.remove_environment_error(worktree_id, cx);
                    });
                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
                })),
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -1,244 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use gpui::{App, Entity, SharedString};
-use language::{Buffer, File};
-use language_model::LanguageModelRequestMessage;
-use project::ProjectPath;
-use serde::{Deserialize, Serialize};
-use text::{Anchor, BufferId};
-use ui::IconName;
-use util::post_inc;
-
-use crate::thread::Thread;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-pub struct ContextId(pub(crate) usize);
-
-impl ContextId {
-    pub fn post_inc(&mut self) -> Self {
-        Self(post_inc(&mut self.0))
-    }
-}
-pub enum ContextKind {
-    File,
-    Directory,
-    Symbol,
-    FetchedUrl,
-    Thread,
-}
-
-impl ContextKind {
-    pub fn icon(&self) -> IconName {
-        match self {
-            ContextKind::File => IconName::File,
-            ContextKind::Directory => IconName::Folder,
-            ContextKind::Symbol => IconName::Code,
-            ContextKind::FetchedUrl => IconName::Globe,
-            ContextKind::Thread => IconName::MessageBubbles,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum AssistantContext {
-    File(FileContext),
-    Directory(DirectoryContext),
-    Symbol(SymbolContext),
-    FetchedUrl(FetchedUrlContext),
-    Thread(ThreadContext),
-}
-
-impl AssistantContext {
-    pub fn id(&self) -> ContextId {
-        match self {
-            Self::File(file) => file.id,
-            Self::Directory(directory) => directory.id,
-            Self::Symbol(symbol) => symbol.id,
-            Self::FetchedUrl(url) => url.id,
-            Self::Thread(thread) => thread.id,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct FileContext {
-    pub id: ContextId,
-    pub context_buffer: ContextBuffer,
-}
-
-#[derive(Debug, Clone)]
-pub struct DirectoryContext {
-    pub id: ContextId,
-    pub project_path: ProjectPath,
-    pub context_buffers: Vec<ContextBuffer>,
-}
-
-#[derive(Debug, Clone)]
-pub struct SymbolContext {
-    pub id: ContextId,
-    pub context_symbol: ContextSymbol,
-}
-
-#[derive(Debug, Clone)]
-pub struct FetchedUrlContext {
-    pub id: ContextId,
-    pub url: SharedString,
-    pub text: SharedString,
-}
-
-// TODO: Model<Thread> holds onto the thread even if the thread is deleted. Can either handle this
-// explicitly or have a WeakModel<Thread> and remove during snapshot.
-
-#[derive(Debug, Clone)]
-pub struct ThreadContext {
-    pub id: ContextId,
-    pub thread: Entity<Thread>,
-    pub text: SharedString,
-}
-
-impl ThreadContext {
-    pub fn summary(&self, cx: &App) -> SharedString {
-        self.thread
-            .read(cx)
-            .summary()
-            .unwrap_or("New thread".into())
-    }
-}
-
-// TODO: Model<Buffer> holds onto the buffer even if the file is deleted and closed. Should remove
-// the context from the message editor in this case.
-
-#[derive(Clone)]
-pub struct ContextBuffer {
-    pub id: BufferId,
-    pub buffer: Entity<Buffer>,
-    pub file: Arc<dyn File>,
-    pub version: clock::Global,
-    pub text: SharedString,
-}
-
-impl std::fmt::Debug for ContextBuffer {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("ContextBuffer")
-            .field("id", &self.id)
-            .field("buffer", &self.buffer)
-            .field("version", &self.version)
-            .field("text", &self.text)
-            .finish()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct ContextSymbol {
-    pub id: ContextSymbolId,
-    pub buffer: Entity<Buffer>,
-    pub buffer_version: clock::Global,
-    /// The range that the symbol encloses, e.g. for function symbol, this will
-    /// include not only the signature, but also the body
-    pub enclosing_range: Range<Anchor>,
-    pub text: SharedString,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ContextSymbolId {
-    pub path: ProjectPath,
-    pub name: SharedString,
-    pub range: Range<Anchor>,
-}
-
-/// Formats a collection of contexts into a string representation
-pub fn format_context_as_string<'a>(
-    contexts: impl Iterator<Item = &'a AssistantContext>,
-    cx: &App,
-) -> Option<String> {
-    let mut file_context = Vec::new();
-    let mut directory_context = Vec::new();
-    let mut symbol_context = Vec::new();
-    let mut fetch_context = Vec::new();
-    let mut thread_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::FetchedUrl(context) => fetch_context.push(context),
-            AssistantContext::Thread(context) => thread_context.push(context),
-        }
-    }
-
-    if file_context.is_empty()
-        && directory_context.is_empty()
-        && symbol_context.is_empty()
-        && fetch_context.is_empty()
-        && thread_context.is_empty()
-    {
-        return None;
-    }
-
-    let mut result = String::new();
-    result.push_str("\n<context>\n\
-        The following items were attached by the user. You don't need to use other tools to read them.\n\n");
-
-    if !file_context.is_empty() {
-        result.push_str("<files>\n");
-        for context in file_context {
-            result.push_str(&context.context_buffer.text);
-        }
-        result.push_str("</files>\n");
-    }
-
-    if !directory_context.is_empty() {
-        result.push_str("<directories>\n");
-        for context in directory_context {
-            for context_buffer in &context.context_buffers {
-                result.push_str(&context_buffer.text);
-            }
-        }
-        result.push_str("</directories>\n");
-    }
-
-    if !symbol_context.is_empty() {
-        result.push_str("<symbols>\n");
-        for context in symbol_context {
-            result.push_str(&context.context_symbol.text);
-            result.push('\n');
-        }
-        result.push_str("</symbols>\n");
-    }
-
-    if !fetch_context.is_empty() {
-        result.push_str("<fetched_urls>\n");
-        for context in &fetch_context {
-            result.push_str(&context.url);
-            result.push('\n');
-            result.push_str(&context.text);
-            result.push('\n');
-        }
-        result.push_str("</fetched_urls>\n");
-    }
-
-    if !thread_context.is_empty() {
-        result.push_str("<conversation_threads>\n");
-        for context in &thread_context {
-            result.push_str(&context.summary(cx));
-            result.push('\n');
-            result.push_str(&context.text);
-            result.push('\n');
-        }
-        result.push_str("</conversation_threads>\n");
-    }
-
-    result.push_str("</context>\n");
-    Some(result)
-}
-
-pub fn attach_context_to_message<'a>(
-    message: &mut LanguageModelRequestMessage,
-    contexts: impl Iterator<Item = &'a AssistantContext>,
-    cx: &App,
-) {
-    if let Some(context_string) = format_context_as_string(contexts, cx) {
-        message.content.push(context_string.into());
-    }
-}
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -26,4 +26,3 @@ serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 util.workspace = true
-workspace-hack.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,10 +1,10 @@
 mod supported_countries;

-use std::str::FromStr;
+use std::{pin::Pin, str::FromStr};

-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use chrono::{DateTime, Utc};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
+use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, Stream, StreamExt};
 use http_client::http::{HeaderMap, HeaderValue};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
@@ -220,23 +220,16 @@ impl Model {
            .map(|header| header.to_string())
            .collect::<Vec<_>>();

-        match self {
-            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => {
-                // Try beta token-efficient tool use (supported in Claude 3.7 Sonnet only)
-                // https://docs.anthropic.com/en/docs/build-with-claude/tool-use/token-efficient-tool-use
-                headers.push("token-efficient-tools-2025-02-19".to_string());
-            }
-            Self::Custom {
-                extra_beta_headers, ..
-            } => {
-                headers.extend(
-                    extra_beta_headers
-                        .iter()
-                        .filter(|header| !header.trim().is_empty())
-                        .cloned(),
-                );
-            }
-            _ => {}
+        if let Self::Custom {
+            extra_beta_headers, ..
+        } = self
+        {
+            headers.extend(
+                extra_beta_headers
+                    .iter()
+                    .filter(|header| !header.trim().is_empty())
+                    .cloned(),
+            );
        }

        headers.join(",")
@@ -321,54 +314,38 @@ pub async fn stream_completion(
        .map(|output| output.0)
 }

-/// An individual rate limit.
-#[derive(Debug)]
-pub struct RateLimit {
-    pub limit: usize,
-    pub remaining: usize,
-    pub reset: DateTime<Utc>,
-}
-
-impl RateLimit {
-    fn from_headers(resource: &str, headers: &HeaderMap<HeaderValue>) -> Result<Self> {
-        let limit =
-            get_header(&format!("anthropic-ratelimit-{resource}-limit"), headers)?.parse()?;
-        let remaining = get_header(
-            &format!("anthropic-ratelimit-{resource}-remaining"),
-            headers,
-        )?
-        .parse()?;
-        let reset = DateTime::parse_from_rfc3339(get_header(
-            &format!("anthropic-ratelimit-{resource}-reset"),
-            headers,
-        )?)?
-        .to_utc();
-
-        Ok(Self {
-            limit,
-            remaining,
-            reset,
-        })
-    }
-}
-
 /// <https://docs.anthropic.com/en/api/rate-limits#response-headers>
 #[derive(Debug)]
 pub struct RateLimitInfo {
-    pub requests: Option<RateLimit>,
-    pub tokens: Option<RateLimit>,
-    pub input_tokens: Option<RateLimit>,
-    pub output_tokens: Option<RateLimit>,
+    pub requests_limit: usize,
+    pub requests_remaining: usize,
+    pub requests_reset: DateTime<Utc>,
+    pub tokens_limit: usize,
+    pub tokens_remaining: usize,
+    pub tokens_reset: DateTime<Utc>,
 }

 impl RateLimitInfo {
-    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Self {
-        Self {
-            requests: RateLimit::from_headers("requests", headers).log_err(),
-            tokens: RateLimit::from_headers("tokens", headers).log_err(),
-            input_tokens: RateLimit::from_headers("input-tokens", headers).log_err(),
-            output_tokens: RateLimit::from_headers("output-tokens", headers).log_err(),
-        }
+    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Result<Self> {
+        let tokens_limit = get_header("anthropic-ratelimit-tokens-limit", headers)?.parse()?;
+        let requests_limit = get_header("anthropic-ratelimit-requests-limit", headers)?.parse()?;
+        let tokens_remaining =
+            get_header("anthropic-ratelimit-tokens-remaining", headers)?.parse()?;
+        let requests_remaining =
+            get_header("anthropic-ratelimit-requests-remaining", headers)?.parse()?;
+        let requests_reset = get_header("anthropic-ratelimit-requests-reset", headers)?;
+        let tokens_reset = get_header("anthropic-ratelimit-tokens-reset", headers)?;
+        let requests_reset = DateTime::parse_from_rfc3339(requests_reset)?.to_utc();
+        let tokens_reset = DateTime::parse_from_rfc3339(tokens_reset)?.to_utc();
+
+        Ok(Self {
+            requests_limit,
+            tokens_limit,
+            requests_remaining,
+            tokens_remaining,
+            requests_reset,
+            tokens_reset,
+        })
    }
 }

@@ -434,7 +411,7 @@ pub async fn stream_completion_with_rate_limit_info(
                }
            })
            .boxed();
-        Ok((stream, Some(rate_limits)))
+        Ok((stream, rate_limits.log_err()))
    } else {
        let mut body = Vec::new();
        response
@@ -460,6 +437,50 @@ pub async fn stream_completion_with_rate_limit_info(
    }
 }

+pub async fn extract_tool_args_from_events(
+    tool_name: String,
+    mut events: Pin<Box<dyn Send + Stream<Item = Result<Event>>>>,
+) -> Result<impl Send + Stream<Item = Result<String>>> {
+    let mut tool_use_index = None;
+    while let Some(event) = events.next().await {
+        if let Event::ContentBlockStart {
+            index,
+            content_block: ResponseContent::ToolUse { name, .. },
+        } = event?
+        {
+            if name == tool_name {
+                tool_use_index = Some(index);
+                break;
+            }
+        }
+    }
+
+    let Some(tool_use_index) = tool_use_index else {
+        return Err(anyhow!("tool not used"));
+    };
+
+    Ok(events.filter_map(move |event| {
+        let result = match event {
+            Err(error) => Some(Err(error)),
+            Ok(Event::ContentBlockDelta { index, delta }) => match delta {
+                ContentDelta::TextDelta { .. } => None,
+                ContentDelta::ThinkingDelta { .. } => None,
+                ContentDelta::SignatureDelta { .. } => None,
+                ContentDelta::InputJsonDelta { partial_json } => {
+                    if index == tool_use_index {
+                        Some(Ok(partial_json))
+                    } else {
+                        None
+                    }
+                }
+            },
+            _ => None,
+        };
+
+        async move { result }
+    }))
+}
+
 #[derive(Debug, Serialize, Deserialize, Copy, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum CacheControlType {
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -19,4 +19,3 @@ smol.workspace = true
 tempfile.workspace = true
 util.workspace = true
 which.workspace = true
-workspace-hack.workspace = true
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -5,9 +5,9 @@ use std::time::Duration;
 use anyhow::Context as _;
 use futures::channel::{mpsc, oneshot};
 #[cfg(unix)]
-use futures::{AsyncBufReadExt as _, io::BufReader};
+use futures::{io::BufReader, AsyncBufReadExt as _};
 #[cfg(unix)]
-use futures::{AsyncWriteExt as _, FutureExt as _, select_biased};
+use futures::{select_biased, AsyncWriteExt as _, FutureExt as _};
 use futures::{SinkExt, StreamExt};
 use gpui::{AsyncApp, BackgroundExecutor, Task};
 #[cfg(unix)]
@@ -89,22 +89,25 @@ impl AskPassSession {
                    buffer.clear();
                }
                let prompt = String::from_utf8_lossy(&buffer);
-                if let Some(password) = delegate
+                match delegate
                    .ask_password(prompt.to_string())
                    .await
                    .context("failed to get askpass password")
                    .log_err()
                {
-                    stream.write_all(password.as_bytes()).await.log_err();
-                } else {
-                    if let Some(kill_tx) = kill_tx.take() {
-                        kill_tx.send(()).log_err();
+                    Some(password) => {
+                        stream.write_all(password.as_bytes()).await.log_err();
+                    }
+                    _ => {
+                        if let Some(kill_tx) = kill_tx.take() {
+                            kill_tx.send(()).log_err();
+                        }
+                        // note: we expect the caller to drop this task when it's done.
+                        // We need to keep the stream open until the caller is done to avoid
+                        // spurious errors from ssh.
+                        std::future::pending::<()>().await;
+                        drop(stream);
                    }
-                    // note: we expect the caller to drop this task when it's done.
-                    // We need to keep the stream open until the caller is done to avoid
-                    // spurious errors from ssh.
-                    std::future::pending::<()>().await;
-                    drop(stream);
                }
            }
            drop(temp_dir)
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -15,4 +15,3 @@ workspace = true
 anyhow.workspace = true
 gpui.workspace = true
 rust-embed.workspace = true
-workspace-hack.workspace = true
--- a/crates/assets/src/assets.rs
+++ b/crates/assets/src/assets.rs
@@ -57,11 +57,10 @@ impl Assets {

    pub fn load_test_fonts(&self, cx: &App) {
        cx.text_system()
-            .add_fonts(vec![
-                self.load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
-                    .unwrap()
-                    .unwrap(),
-            ])
+            .add_fonts(vec![self
+                .load("fonts/plex-mono/ZedPlexMono-Regular.ttf")
+                .unwrap()
+                .unwrap()])
            .unwrap()
    }
 }
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -69,7 +69,6 @@ ui.workspace = true
 util.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 ctor.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -14,7 +14,7 @@ use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
-use gpui::{App, Global, ReadGlobal, UpdateGlobal, actions};
+use gpui::{actions, App, Global, ReadGlobal, UpdateGlobal};
 use language_model::{
    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
 };
@@ -161,38 +161,12 @@ fn init_language_model_settings(cx: &mut App) {

 fn update_active_language_model_from_settings(cx: &mut App) {
    let settings = AssistantSettings::get_global(cx);
-    // Default model - used as fallback
    let active_model_provider_name =
        LanguageModelProviderId::from(settings.default_model.provider.clone());
    let active_model_id = LanguageModelId::from(settings.default_model.model.clone());
-
-    // Inline assistant model
-    let inline_assistant_model = settings
-        .inline_assistant_model
-        .as_ref()
-        .unwrap_or(&settings.default_model);
-    let inline_assistant_provider_name =
-        LanguageModelProviderId::from(inline_assistant_model.provider.clone());
-    let inline_assistant_model_id = LanguageModelId::from(inline_assistant_model.model.clone());
-
-    // Commit message model
-    let commit_message_model = settings
-        .commit_message_model
-        .as_ref()
-        .unwrap_or(&settings.default_model);
-    let commit_message_provider_name =
-        LanguageModelProviderId::from(commit_message_model.provider.clone());
-    let commit_message_model_id = LanguageModelId::from(commit_message_model.model.clone());
-
-    // Thread summary model
-    let thread_summary_model = settings
-        .thread_summary_model
-        .as_ref()
-        .unwrap_or(&settings.default_model);
-    let thread_summary_provider_name =
-        LanguageModelProviderId::from(thread_summary_model.provider.clone());
-    let thread_summary_model_id = LanguageModelId::from(thread_summary_model.model.clone());
-
+    let editor_provider_name =
+        LanguageModelProviderId::from(settings.editor_model.provider.clone());
+    let editor_model_id = LanguageModelId::from(settings.editor_model.model.clone());
    let inline_alternatives = settings
        .inline_alternatives
        .iter()
@@ -203,29 +177,9 @@ fn update_active_language_model_from_settings(cx: &mut App) {
            )
        })
        .collect::<Vec<_>>();
-
    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-        // Set the default model
-        registry.select_default_model(&active_model_provider_name, &active_model_id, cx);
-
-        // Set the specific models
-        registry.select_inline_assistant_model(
-            &inline_assistant_provider_name,
-            &inline_assistant_model_id,
-            cx,
-        );
-        registry.select_commit_message_model(
-            &commit_message_provider_name,
-            &commit_message_model_id,
-            cx,
-        );
-        registry.select_thread_summary_model(
-            &thread_summary_provider_name,
-            &thread_summary_model_id,
-            cx,
-        );
-
-        // Set the alternatives
+        registry.select_active_model(&active_model_provider_name, &active_model_id, cx);
+        registry.select_editor_model(&editor_provider_name, &editor_model_id, cx);
        registry.select_inline_alternative_models(inline_alternatives, cx);
    });
 }
--- a/crates/assistant/src/assistant_configuration.rs
+++ b/crates/assistant/src/assistant_configuration.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;

 use collections::HashMap;
-use gpui::{AnyView, App, EventEmitter, FocusHandle, Focusable, Subscription, canvas};
+use gpui::{canvas, AnyView, App, EventEmitter, FocusHandle, Focusable, Subscription};
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
-use ui::{ElevationIndex, prelude::*};
+use ui::{prelude::*, ElevationIndex};
 use workspace::Item;

 pub struct ConfigurationView {
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -1,45 +1,43 @@
-use crate::Assistant;
 use crate::assistant_configuration::{ConfigurationView, ConfigurationViewEvent};
+use crate::Assistant;
 use crate::{
-    DeployHistory, InlineAssistant, NewChat, terminal_inline_assistant::TerminalInlineAssistant,
+    terminal_inline_assistant::TerminalInlineAssistant, DeployHistory, InlineAssistant, NewChat,
 };
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use assistant_context_editor::{
-    AssistantContext, AssistantPanelDelegate, ContextEditor, ContextEditorToolbarItem,
-    ContextEditorToolbarItemEvent, ContextHistory, ContextId, ContextStore, ContextStoreEvent,
-    DEFAULT_TAB_TITLE, InsertDraggedFiles, SlashCommandCompletionProvider,
-    make_lsp_adapter_delegate,
+    make_lsp_adapter_delegate, AssistantContext, AssistantPanelDelegate, ContextEditor,
+    ContextEditorToolbarItem, ContextEditorToolbarItemEvent, ContextHistory, ContextId,
+    ContextStore, ContextStoreEvent, InsertDraggedFiles, SlashCommandCompletionProvider,
+    DEFAULT_TAB_TITLE,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
-use client::{Client, Status, proto};
+use client::{proto, Client, Status};
 use editor::{Editor, EditorEvent};
 use fs::Fs;
 use gpui::{
-    Action, App, AsyncWindowContext, Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Pixels, Render, Styled, Subscription, Task,
-    UpdateGlobal, WeakEntity, prelude::*,
+    prelude::*, Action, App, AsyncWindowContext, Entity, EventEmitter, ExternalPaths, FocusHandle,
+    Focusable, InteractiveElement, IntoElement, ParentElement, Pixels, Render, Styled,
+    Subscription, Task, UpdateGlobal, WeakEntity,
 };
 use language::LanguageRegistry;
 use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModelProviderId, LanguageModelRegistry,
-    ZED_CLOUD_PROVIDER_ID,
+    AuthenticateError, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
 };
 use project::Project;
-use prompt_library::{PromptLibrary, open_prompt_library};
+use prompt_library::{open_prompt_library, PromptLibrary};
 use prompt_store::PromptBuilder;
-use search::{BufferSearchBar, buffer_search::DivRegistrar};
-use settings::{Settings, update_settings_file};
+use search::{buffer_search::DivRegistrar, BufferSearchBar};
+use settings::{update_settings_file, Settings};
 use smol::stream::StreamExt;
 use std::{ops::ControlFlow, path::PathBuf, sync::Arc};
-use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
-use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
-use util::{ResultExt, maybe};
+use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
+use ui::{prelude::*, ContextMenu, PopoverMenu, Tooltip};
+use util::{maybe, ResultExt};
 use workspace::DraggedTab;
 use workspace::{
-    DraggedSelection, Pane, ShowConfiguration, ToggleZoom, Workspace,
    dock::{DockPosition, Panel, PanelEvent},
-    pane,
+    pane, DraggedSelection, Pane, ShowConfiguration, ToggleZoom, Workspace,
 };
 use zed_actions::assistant::{InlineAssist, OpenPromptLibrary, ToggleFocus};

@@ -299,10 +297,8 @@ impl AssistantPanel {
                &LanguageModelRegistry::global(cx),
                window,
                |this, _, event: &language_model::Event, window, cx| match event {
-                    language_model::Event::DefaultModelChanged
-                    | language_model::Event::InlineAssistantModelChanged
-                    | language_model::Event::CommitMessageModelChanged
-                    | language_model::Event::ThreadSummaryModelChanged => {
+                    language_model::Event::ActiveModelChanged
+                    | language_model::Event::EditorModelChanged => {
                        this.completion_provider_changed(window, cx);
                    }
                    language_model::Event::ProviderStateChanged => {
@@ -471,12 +467,12 @@ impl AssistantPanel {
    }

    fn update_zed_ai_notice_visibility(&mut self, client_status: Status, cx: &mut Context<Self>) {
-        let model = LanguageModelRegistry::read_global(cx).default_model();
+        let active_provider = LanguageModelRegistry::read_global(cx).active_provider();

        // If we're signed out and don't have a provider configured, or we're signed-out AND Zed.dev is
        // the provider, we want to show a nudge to sign in.
        let show_zed_ai_notice = client_status.is_signed_out()
-            && model.map_or(true, |model| model.provider.id().0 == ZED_CLOUD_PROVIDER_ID);
+            && active_provider.map_or(true, |provider| provider.id().0 == ZED_CLOUD_PROVIDER_ID);

        self.show_zed_ai_notice = show_zed_ai_notice;
        cx.notify();
@@ -544,8 +540,8 @@ impl AssistantPanel {
        }

        let Some(new_provider_id) = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider.id())
+            .active_provider()
+            .map(|p| p.id())
        else {
            return;
        };
@@ -571,9 +567,7 @@ impl AssistantPanel {
            return;
        }

-        let Some(ConfiguredModel { provider, .. }) =
-            LanguageModelRegistry::read_global(cx).default_model()
-        else {
+        let Some(provider) = LanguageModelRegistry::read_global(cx).active_provider() else {
            return;
        };

@@ -747,20 +741,29 @@ impl AssistantPanel {
                    }
                });

-        if let Some(context_editor) = context_editor {
-            Some(InlineAssistTarget::Editor(context_editor, false))
-        } else if let Some(workspace_editor) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-        {
-            Some(InlineAssistTarget::Editor(workspace_editor, true))
-        } else if let Some(terminal_view) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<TerminalView>(cx))
-        {
-            Some(InlineAssistTarget::Terminal(terminal_view))
-        } else {
-            None
+        match context_editor {
+            Some(context_editor) => Some(InlineAssistTarget::Editor(context_editor, false)),
+            _ => {
+                match workspace
+                    .active_item(cx)
+                    .and_then(|item| item.act_as::<Editor>(cx))
+                {
+                    Some(workspace_editor) => {
+                        Some(InlineAssistTarget::Editor(workspace_editor, true))
+                    }
+                    _ => {
+                        match workspace
+                            .active_item(cx)
+                            .and_then(|item| item.act_as::<TerminalView>(cx))
+                        {
+                            Some(terminal_view) => {
+                                Some(InlineAssistTarget::Terminal(terminal_view))
+                            }
+                            _ => None,
+                        }
+                    }
+                }
+            }
        }
    }

@@ -981,8 +984,8 @@ impl AssistantPanel {
                |this, _, event: &ConfigurationViewEvent, window, cx| match event {
                    ConfigurationViewEvent::NewProviderContextEditor(provider) => {
                        if LanguageModelRegistry::read_global(cx)
-                            .default_model()
-                            .map_or(true, |default| default.provider.id() != provider.id())
+                            .active_provider()
+                            .map_or(true, |p| p.id() != provider.id())
                        {
                            if let Some(model) = provider.default_model(cx) {
                                update_settings_file::<AssistantSettings>(
@@ -1160,8 +1163,8 @@ impl AssistantPanel {

    fn is_authenticated(&mut self, cx: &mut Context<Self>) -> bool {
        LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map_or(false, |default| default.provider.is_authenticated(cx))
+            .active_provider()
+            .map_or(false, |provider| provider.is_authenticated(cx))
    }

    fn authenticate(
@@ -1169,8 +1172,8 @@ impl AssistantPanel {
        cx: &mut Context<Self>,
    ) -> Option<Task<Result<(), AuthenticateError>>> {
        LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map_or(None, |default| Some(default.provider.authenticate(cx)))
+            .active_provider()
+            .map_or(None, |provider| Some(provider.authenticate(cx)))
    }

    fn restart_context_servers(
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -2,40 +2,39 @@ use crate::{
    Assistant, AssistantPanel, AssistantPanelEvent, CycleNextInlineAssist,
    CyclePreviousInlineAssist,
 };
-use anyhow::{Context as _, Result, anyhow};
-use assistant_context_editor::{RequestType, humanize_token_count};
+use anyhow::{anyhow, Context as _, Result};
+use assistant_context_editor::{humanize_token_count, RequestType};
 use assistant_settings::AssistantSettings;
-use client::{ErrorExt, telemetry::Telemetry};
-use collections::{HashMap, HashSet, VecDeque, hash_map};
+use client::{telemetry::Telemetry, ErrorExt};
+use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
-    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorElement, EditorEvent, EditorMode,
-    EditorStyle, ExcerptId, ExcerptRange, GutterDimensions, MultiBuffer, MultiBufferSnapshot,
-    ToOffset as _, ToPoint,
    actions::{MoveDown, MoveUp, SelectAll},
    display_map::{
        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
        ToDisplayPoint,
    },
+    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorElement, EditorEvent, EditorMode,
+    EditorStyle, ExcerptId, ExcerptRange, GutterDimensions, MultiBuffer, MultiBufferSnapshot,
+    ToOffset as _, ToPoint,
 };
 use feature_flags::{
    Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedPro,
 };
 use fs::Fs;
 use futures::{
-    SinkExt, Stream, StreamExt,
    channel::mpsc,
    future::{BoxFuture, LocalBoxFuture},
-    join,
+    join, SinkExt, Stream, StreamExt,
 };
 use gpui::{
-    AnyElement, App, ClickEvent, Context, CursorStyle, Entity, EventEmitter, FocusHandle,
-    Focusable, FontWeight, Global, HighlightStyle, Subscription, Task, TextStyle, UpdateGlobal,
-    WeakEntity, Window, anchored, deferred, point,
+    anchored, deferred, point, AnyElement, App, ClickEvent, Context, CursorStyle, Entity,
+    EventEmitter, FocusHandle, Focusable, FontWeight, Global, HighlightStyle, Subscription, Task,
+    TextStyle, UpdateGlobal, WeakEntity, Window,
 };
-use language::{Buffer, IndentKind, Point, Selection, TransactionId, line_diff};
+use language::{line_diff, Buffer, IndentKind, Point, Selection, TransactionId};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelTextStream, Role, report_assistant_event,
+    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelTextStream, Role,
 };
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
@@ -43,7 +42,7 @@ use parking_lot::Mutex;
 use project::{CodeAction, LspAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use rope::Rope;
-use settings::{Settings, SettingsStore, update_settings_file};
+use settings::{update_settings_file, Settings, SettingsStore};
 use smol::future::FutureExt;
 use std::{
    cmp,
@@ -62,10 +61,10 @@ use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
 use ui::{
-    CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, Tooltip, prelude::*, text_for_action,
+    prelude::*, text_for_action, CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, Tooltip,
 };
 use util::{RangeExt, ResultExt};
-use workspace::{ItemHandle, Toast, Workspace, notifications::NotificationId};
+use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};

 pub fn init(
    fs: Arc<dyn Fs>,
@@ -251,33 +250,35 @@ impl InlineAssistant {
                selection.end.column = snapshot
                    .buffer_snapshot
                    .line_len(MultiBufferRow(selection.end.row));
-            } else if let Some(fold) =
-                snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
-            {
-                selection.start = fold.range().start;
-                selection.end = fold.range().end;
-                if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot.max_row() {
-                    let chars = snapshot
-                        .buffer_snapshot
-                        .chars_at(Point::new(selection.end.row + 1, 0));
-
-                    for c in chars {
-                        if c == '\n' {
-                            break;
-                        }
-                        if c.is_whitespace() {
-                            continue;
-                        }
-                        if snapshot
-                            .language_at(selection.end)
-                            .is_some_and(|language| language.config().brackets.is_closing_brace(c))
-                        {
-                            selection.end.row += 1;
-                            selection.end.column = snapshot
+            } else {
+                match snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row)) {
+                    Some(fold) => {
+                        selection.start = fold.range().start;
+                        selection.end = fold.range().end;
+                        if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot.max_row() {
+                            let chars = snapshot
                                .buffer_snapshot
-                                .line_len(MultiBufferRow(selection.end.row));
+                                .chars_at(Point::new(selection.end.row + 1, 0));
+
+                            for c in chars {
+                                if c == '\n' {
+                                    break;
+                                }
+                                if c.is_whitespace() {
+                                    continue;
+                                }
+                                if snapshot.language_at(selection.end).is_some_and(|language| {
+                                    language.config().brackets.is_closing_brace(c)
+                                }) {
+                                    selection.end.row += 1;
+                                    selection.end.column = snapshot
+                                        .buffer_snapshot
+                                        .line_len(MultiBufferRow(selection.end.row));
+                                }
+                            }
                        }
                    }
+                    _ => {}
                }
            }

@@ -312,9 +313,7 @@ impl InlineAssistant {
                start..end,
            ));

-            if let Some(ConfiguredModel { model, .. }) =
-                LanguageModelRegistry::read_global(cx).default_model()
-            {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                self.telemetry.report_assistant_event(AssistantEvent {
                    conversation_id: None,
                    kind: AssistantKind::Inline,
@@ -879,9 +878,7 @@ impl InlineAssistant {
            let active_alternative = assist.codegen.read(cx).active_alternative().clone();
            let message_id = active_alternative.read(cx).message_id.clone();

-            if let Some(ConfiguredModel { model, .. }) =
-                LanguageModelRegistry::read_global(cx).default_model()
-            {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let language_name = assist.editor.upgrade().and_then(|editor| {
                    let multibuffer = editor.read(cx).buffer().read(cx);
                    let multibuffer_snapshot = multibuffer.snapshot(cx);
@@ -1036,24 +1033,27 @@ impl InlineAssistant {

            let mut scroll_target_top;
            let mut scroll_target_bottom;
-            if let Some(decorations) = assist.decorations.as_ref() {
-                scroll_target_top = editor
-                    .row_for_block(decorations.prompt_block_id, cx)
-                    .unwrap()
-                    .0 as f32;
-                scroll_target_bottom = editor
-                    .row_for_block(decorations.end_block_id, cx)
-                    .unwrap()
-                    .0 as f32;
-            } else {
-                let snapshot = editor.snapshot(window, cx);
-                let start_row = assist
-                    .range
-                    .start
-                    .to_display_point(&snapshot.display_snapshot)
-                    .row();
-                scroll_target_top = start_row.0 as f32;
-                scroll_target_bottom = scroll_target_top + 1.;
+            match assist.decorations.as_ref() {
+                Some(decorations) => {
+                    scroll_target_top = editor
+                        .row_for_block(decorations.prompt_block_id, cx)
+                        .unwrap()
+                        .0 as f32;
+                    scroll_target_bottom = editor
+                        .row_for_block(decorations.end_block_id, cx)
+                        .unwrap()
+                        .0 as f32;
+                }
+                _ => {
+                    let snapshot = editor.snapshot(window, cx);
+                    let start_row = assist
+                        .range
+                        .start
+                        .to_display_point(&snapshot.display_snapshot)
+                        .row();
+                    scroll_target_top = start_row.0 as f32;
+                    scroll_target_bottom = scroll_target_top + 1.;
+                }
            }
            scroll_target_top -= editor.vertical_scroll_margin() as f32;
            scroll_target_bottom += editor.vertical_scroll_margin() as f32;
@@ -1098,10 +1098,11 @@ impl InlineAssistant {
    }

    pub fn start_assist(&mut self, assist_id: InlineAssistId, window: &mut Window, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        let assist_group_id = assist.group_id;
@@ -1133,10 +1134,11 @@ impl InlineAssistant {
    }

    pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
@@ -1274,7 +1276,10 @@ impl InlineAssistant {
                    multi_buffer.update(cx, |multi_buffer, cx| {
                        multi_buffer.push_excerpts(
                            old_buffer.clone(),
-                            Some(ExcerptRange::new(buffer_start..buffer_end)),
+                            Some(ExcerptRange {
+                                context: buffer_start..buffer_end,
+                                primary: None,
+                            }),
                            cx,
                        );
                    });
@@ -1633,8 +1638,8 @@ impl Render for PromptEditor {
                                format!(
                                    "Using {}",
                                    LanguageModelRegistry::read_global(cx)
-                                        .default_model()
-                                        .map(|default| default.model.name().0)
+                                        .active_model()
+                                        .map(|model| model.name().0)
                                        .unwrap_or_else(|| "No model selected".into()),
                                ),
                                None,
@@ -2081,7 +2086,7 @@ impl PromptEditor {
        let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);

        let model_registry = LanguageModelRegistry::read_global(cx);
-        let default_model = model_registry.default_model().map(|default| default.model);
+        let default_model = model_registry.active_model();
        let alternative_models = model_registry.inline_alternative_models();

        let get_model_name = |index: usize| -> String {
@@ -2186,10 +2191,8 @@ impl PromptEditor {
            .into_any_element()
    }

-    fn render_token_count(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let model = LanguageModelRegistry::read_global(cx)
-            .default_model()?
-            .model;
+    fn render_token_count(&self, cx: &mut Context<Self>) -> Option<impl IntoElement + use<>> {
+        let model = LanguageModelRegistry::read_global(cx).active_model()?;
        let token_counts = self.token_counts?;
        let max_token_count = model.max_token_count();

@@ -2216,40 +2219,43 @@ impl PromptEditor {
                    .size(LabelSize::Small)
                    .color(Color::Muted),
            );
-        if let Some(workspace) = self.workspace.clone() {
-            token_count = token_count
-                .tooltip(move |window, cx| {
-                    Tooltip::with_meta(
-                        format!(
-                            "Tokens Used ({} from the Assistant Panel)",
-                            humanize_token_count(token_counts.assistant_panel)
-                        ),
-                        None,
-                        "Click to open the Assistant Panel",
-                        window,
-                        cx,
-                    )
-                })
-                .cursor_pointer()
-                .on_mouse_down(gpui::MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .on_click(move |_, window, cx| {
-                    cx.stop_propagation();
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.focus_panel::<AssistantPanel>(window, cx)
-                        })
-                        .ok();
-                });
-        } else {
-            token_count = token_count
-                .cursor_default()
-                .tooltip(Tooltip::text("Tokens used"));
+        match self.workspace.clone() {
+            Some(workspace) => {
+                token_count = token_count
+                    .tooltip(move |window, cx| {
+                        Tooltip::with_meta(
+                            format!(
+                                "Tokens Used ({} from the Assistant Panel)",
+                                humanize_token_count(token_counts.assistant_panel)
+                            ),
+                            None,
+                            "Click to open the Assistant Panel",
+                            window,
+                            cx,
+                        )
+                    })
+                    .cursor_pointer()
+                    .on_mouse_down(gpui::MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                    .on_click(move |_, window, cx| {
+                        cx.stop_propagation();
+                        workspace
+                            .update(cx, |workspace, cx| {
+                                workspace.focus_panel::<AssistantPanel>(window, cx)
+                            })
+                            .ok();
+                    });
+            }
+            _ => {
+                token_count = token_count
+                    .cursor_default()
+                    .tooltip(Tooltip::text("Tokens used"));
+            }
        }

        Some(token_count)
    }

-    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
        let settings = ThemeSettings::get_global(cx);
        let text_style = TextStyle {
            color: if self.editor.read(cx).read_only(cx) {
@@ -2275,7 +2281,7 @@ impl PromptEditor {
        )
    }

-    fn render_rate_limit_notice(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_rate_limit_notice(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
        Popover::new().child(
            v_flex()
                .occlude()
@@ -2434,10 +2440,11 @@ impl InlineAssist {
                    InlineAssistant::update_global(cx, |this, cx| match event {
                        CodegenEvent::Undone => this.finish_assist(assist_id, false, window, cx),
                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
+                            let assist = match this.assists.get(&assist_id) {
+                                Some(assist) => assist,
+                                _ => {
+                                    return;
+                                }
                            };

                            if let CodegenStatus::Error(error) = codegen.read(cx).status(cx) {
@@ -2644,9 +2651,8 @@ impl Codegen {
        }

        let primary_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .context("no active model")?
-            .model;
+            .active_model()
+            .context("no active model")?;

        for (model, alternative) in iter::once(primary_model)
            .chain(alternative_models)
@@ -2870,29 +2876,28 @@ impl CodegenAlternative {
        assistant_panel_context: Option<LanguageModelRequest>,
        cx: &App,
    ) -> BoxFuture<'static, Result<TokenCounts>> {
-        if let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        {
-            let request = self.build_request(user_prompt, assistant_panel_context.clone(), cx);
-            match request {
-                Ok(request) => {
-                    let total_count = model.count_tokens(request.clone(), cx);
-                    let assistant_panel_count = assistant_panel_context
-                        .map(|context| model.count_tokens(context, cx))
-                        .unwrap_or_else(|| future::ready(Ok(0)).boxed());
+        match LanguageModelRegistry::read_global(cx).active_model() {
+            Some(model) => {
+                let request = self.build_request(user_prompt, assistant_panel_context.clone(), cx);
+                match request {
+                    Ok(request) => {
+                        let total_count = model.count_tokens(request.clone(), cx);
+                        let assistant_panel_count = assistant_panel_context
+                            .map(|context| model.count_tokens(context, cx))
+                            .unwrap_or_else(|| future::ready(Ok(0)).boxed());

-                    async move {
-                        Ok(TokenCounts {
-                            total: total_count.await?,
-                            assistant_panel: assistant_panel_count.await?,
-                        })
+                        async move {
+                            Ok(TokenCounts {
+                                total: total_count.await?,
+                                assistant_panel: assistant_panel_count.await?,
+                            })
+                        }
+                        .boxed()
                    }
-                    .boxed()
+                    Err(error) => futures::future::ready(Err(error)).boxed(),
                }
-                Err(error) => futures::future::ready(Err(error)).boxed(),
            }
-        } else {
-            future::ready(Err(anyhow!("no active model"))).boxed()
+            _ => future::ready(Err(anyhow!("no active model"))).boxed(),
        }
    }

@@ -3228,10 +3233,13 @@ impl CodegenAlternative {
                .update(cx, |this, cx| {
                    this.message_id = message_id;
                    this.last_equal_ranges.clear();
-                    if let Err(error) = result {
-                        this.status = CodegenStatus::Error(error);
-                    } else {
-                        this.status = CodegenStatus::Done;
+                    match result {
+                        Err(error) => {
+                            this.status = CodegenStatus::Error(error);
+                        }
+                        _ => {
+                            this.status = CodegenStatus::Done;
+                        }
                    }
                    this.elapsed_time = Some(elapsed_time);
                    this.completion = Some(completion.lock().clone());
@@ -3717,8 +3725,8 @@ mod tests {
    use gpui::TestAppContext;
    use indoc::indoc;
    use language::{
-        Buffer, Language, LanguageConfig, LanguageMatcher, Point, language_settings,
-        tree_sitter_rust,
+        language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
+        Point,
    };
    use language_model::{LanguageModelRegistry, TokenUsage};
    use rand::prelude::*;
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -1,27 +1,27 @@
 use crate::{AssistantPanel, AssistantPanelEvent, DEFAULT_CONTEXT_LINES};
 use anyhow::{Context as _, Result};
-use assistant_context_editor::{RequestType, humanize_token_count};
+use assistant_context_editor::{humanize_token_count, RequestType};
 use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{
-    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
    actions::{MoveDown, MoveUp, SelectAll},
+    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
 };
 use fs::Fs;
-use futures::{SinkExt, StreamExt, channel::mpsc};
+use futures::{channel::mpsc, SinkExt, StreamExt};
 use gpui::{
    App, Context, Entity, EventEmitter, FocusHandle, Focusable, Global, Subscription, Task,
    TextStyle, UpdateGlobal, WeakEntity,
 };
 use language::Buffer;
 use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    Role, report_assistant_event,
+    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, Role,
 };
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use prompt_store::PromptBuilder;
-use settings::{Settings, update_settings_file};
+use settings::{update_settings_file, Settings};
 use std::{
    cmp,
    sync::Arc,
@@ -31,9 +31,9 @@ use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;
 use terminal_view::TerminalView;
 use theme::ThemeSettings;
-use ui::{IconButtonShape, Tooltip, prelude::*, text_for_action};
+use ui::{prelude::*, text_for_action, IconButtonShape, Tooltip};
 use util::ResultExt;
-use workspace::{Toast, Workspace, notifications::NotificationId};
+use workspace::{notifications::NotificationId, Toast, Workspace};

 pub fn init(
    fs: Arc<dyn Fs>,
@@ -184,10 +184,11 @@ impl TerminalInlineAssistant {
    }

    fn start_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        let Some(user_prompt) = assist
@@ -222,10 +223,11 @@ impl TerminalInlineAssistant {
    }

    fn stop_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
@@ -318,9 +320,7 @@ impl TerminalInlineAssistant {
                })
                .log_err();

-            if let Some(ConfiguredModel { model, .. }) =
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let codegen = assist.codegen.read(cx);
                let executor = cx.background_executor().clone();
                report_assistant_event(
@@ -438,10 +438,11 @@ impl TerminalInlineAssist {
                window.subscribe(&codegen, cx, move |codegen, event, window, cx| {
                    TerminalInlineAssistant::update_global(cx, |this, cx| match event {
                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
+                            let assist = match this.assists.get(&assist_id) {
+                                Some(assist) => assist,
+                                _ => {
+                                    return;
+                                }
                            };

                            if let CodegenStatus::Error(error) = &codegen.read(cx).status {
@@ -654,8 +655,8 @@ impl Render for PromptEditor {
                                format!(
                                    "Using {}",
                                    LanguageModelRegistry::read_global(cx)
-                                        .inline_assistant_model()
-                                        .map(|inline_assistant| inline_assistant.model.name().0)
+                                        .active_model()
+                                        .map(|model| model.name().0)
                                        .unwrap_or_else(|| "No model selected".into()),
                                ),
                                None,
@@ -666,8 +667,8 @@ impl Render for PromptEditor {
                        },
                        gpui::Corner::TopRight,
                    ))
-                    .children(
-                        if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
+                    .children(match &self.codegen.read(cx).status {
+                        CodegenStatus::Error(error) => {
                            let error_message = SharedString::from(error.to_string());
                            Some(
                                div()
@@ -679,10 +680,9 @@ impl Render for PromptEditor {
                                            .color(Color::Error),
                                    ),
                            )
-                        } else {
-                            None
-                        },
-                    ),
+                        }
+                        _ => None,
+                    }),
            )
            .child(div().flex_1().child(self.render_prompt_editor(cx)))
            .child(
@@ -824,9 +824,7 @@ impl PromptEditor {

    fn count_tokens(&mut self, cx: &mut Context<Self>) {
        let assist_id = self.id;
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };
        self.pending_token_count = cx.spawn(async move |this, cx| {
@@ -983,10 +981,8 @@ impl PromptEditor {
        }
    }

-    fn render_token_count(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let model = LanguageModelRegistry::read_global(cx)
-            .inline_assistant_model()?
-            .model;
+    fn render_token_count(&self, cx: &mut Context<Self>) -> Option<impl IntoElement + use<>> {
+        let model = LanguageModelRegistry::read_global(cx).active_model()?;
        let token_count = self.token_count?;
        let max_token_count = model.max_token_count();

@@ -1013,37 +1009,40 @@ impl PromptEditor {
                    .size(LabelSize::Small)
                    .color(Color::Muted),
            );
-        if let Some(workspace) = self.workspace.clone() {
-            token_count = token_count
-                .tooltip(|window, cx| {
-                    Tooltip::with_meta(
-                        "Tokens Used by Inline Assistant",
-                        None,
-                        "Click to Open Assistant Panel",
-                        window,
-                        cx,
-                    )
-                })
-                .cursor_pointer()
-                .on_mouse_down(gpui::MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .on_click(move |_, window, cx| {
-                    cx.stop_propagation();
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.focus_panel::<AssistantPanel>(window, cx)
-                        })
-                        .ok();
-                });
-        } else {
-            token_count = token_count
-                .cursor_default()
-                .tooltip(Tooltip::text("Tokens Used by Inline Assistant"));
+        match self.workspace.clone() {
+            Some(workspace) => {
+                token_count = token_count
+                    .tooltip(|window, cx| {
+                        Tooltip::with_meta(
+                            "Tokens Used by Inline Assistant",
+                            None,
+                            "Click to Open Assistant Panel",
+                            window,
+                            cx,
+                        )
+                    })
+                    .cursor_pointer()
+                    .on_mouse_down(gpui::MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                    .on_click(move |_, window, cx| {
+                        cx.stop_propagation();
+                        workspace
+                            .update(cx, |workspace, cx| {
+                                workspace.focus_panel::<AssistantPanel>(window, cx)
+                            })
+                            .ok();
+                    });
+            }
+            _ => {
+                token_count = token_count
+                    .cursor_default()
+                    .tooltip(Tooltip::text("Tokens Used by Inline Assistant"));
+            }
        }

        Some(token_count)
    }

-    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
        let settings = ThemeSettings::get_global(cx);
        let text_style = TextStyle {
            color: if self.editor.read(cx).read_only(cx) {
@@ -1137,9 +1136,7 @@ impl Codegen {
    }

    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };

@@ -1225,10 +1222,13 @@ impl Codegen {
            let result = generate.await;

            this.update(cx, |this, cx| {
-                if let Err(error) = result {
-                    this.status = CodegenStatus::Error(error);
-                } else {
-                    this.status = CodegenStatus::Done;
+                match result {
+                    Err(error) => {
+                        this.status = CodegenStatus::Error(error);
+                    }
+                    _ => {
+                        this.status = CodegenStatus::Done;
+                    }
                }
                cx.emit(CodegenEvent::Finished);
                cx.notify();
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "agent"
+name = "assistant2"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -81,13 +81,11 @@ theme.workspace = true
 time.workspace = true
 time_format.workspace = true
 ui.workspace = true
-ui_input.workspace = true
 util.workspace = true
 uuid.workspace = true
 vim_mode_setting.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 buffer_diff = { workspace = true, features = ["test-support"] }
--- a/crates/assistant2/LICENSE-GPL
+++ b/crates/assistant2/LICENSE-GPL
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -1,6 +1,6 @@
 mod active_thread;
-mod agent_diff;
 mod assistant_configuration;
+mod assistant_diff;
 mod assistant_model_selector;
 mod assistant_panel;
 mod buffer_codegen;
@@ -23,17 +23,16 @@ mod ui;

 use std::sync::Arc;

-use assistant_settings::{AgentProfileId, AssistantSettings};
+use assistant_settings::AssistantSettings;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
-use gpui::{App, actions, impl_actions};
+use gpui::{actions, impl_actions, App};
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use settings::Settings as _;
-use thread::ThreadId;

 pub use crate::active_thread::ActiveThread;
 use crate::assistant_configuration::{AddContextServerModal, ManageProfilesModal};
@@ -41,11 +40,12 @@ pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate}
 pub use crate::inline_assistant::InlineAssistant;
 pub use crate::thread::{Message, RequestKind, Thread, ThreadEvent};
 pub use crate::thread_store::ThreadStore;
-pub use agent_diff::{AgentDiff, AgentDiffToolbar};
+pub use assistant_diff::{AssistantDiff, AssistantDiffToolbar};

 actions!(
-    agent,
+    assistant2,
    [
+        NewThread,
        NewPromptEditor,
        ToggleContextPicker,
        ToggleProfileSelector,
@@ -65,39 +65,33 @@ actions!(
        RemoveFocusedContext,
        AcceptSuggestedContext,
        OpenActiveThreadAsMarkdown,
-        OpenAgentDiff,
-        Keep,
+        OpenAssistantDiff,
+        ToggleKeep,
        Reject,
        RejectAll,
        KeepAll
    ]
 );

-#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema)]
-pub struct NewThread {
-    #[serde(default)]
-    from_thread_id: Option<ThreadId>,
-}
-
 #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema)]
 pub struct ManageProfiles {
    #[serde(default)]
-    pub customize_tools: Option<AgentProfileId>,
+    pub customize_tools: Option<Arc<str>>,
 }

 impl ManageProfiles {
-    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
+    pub fn customize_tools(profile_id: Arc<str>) -> Self {
        Self {
            customize_tools: Some(profile_id),
        }
    }
 }

-impl_actions!(agent, [NewThread, ManageProfiles]);
+impl_actions!(assistant, [ManageProfiles]);

-const NAMESPACE: &str = "agent";
+const NAMESPACE: &str = "assistant2";

-/// Initializes the `agent` crate.
+/// Initializes the `assistant2` crate.
 pub fn init(
    fs: Arc<dyn Fs>,
    client: Arc<Client>,
@@ -123,10 +117,10 @@ pub fn init(
    cx.observe_new(AddContextServerModal::register).detach();
    cx.observe_new(ManageProfilesModal::register).detach();

-    feature_gate_agent_actions(cx);
+    feature_gate_assistant2_actions(cx);
 }

-fn feature_gate_agent_actions(cx: &mut App) {
+fn feature_gate_assistant2_actions(cx: &mut App) {
    CommandPaletteFilter::update_global(cx, |filter, _cx| {
        filter.hide_namespace(NAMESPACE);
    });
--- a/crates/assistant2/src/assistant_configuration.rs
+++ b/crates/assistant2/src/assistant_configuration.rs
@@ -4,15 +4,12 @@ mod tool_picker;

 use std::sync::Arc;

-use assistant_settings::AssistantSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use collections::HashMap;
 use context_server::manager::ContextServerManager;
-use fs::Fs;
 use gpui::{Action, AnyView, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription};
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
-use settings::{Settings, update_settings_file};
-use ui::{Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Switch, prelude::*};
+use ui::{prelude::*, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Switch};
 use util::ResultExt as _;
 use zed_actions::ExtensionCategoryFilter;

@@ -22,7 +19,6 @@ pub(crate) use manage_profiles_modal::ManageProfilesModal;
 use crate::AddContextServer;

 pub struct AssistantConfiguration {
-    fs: Arc<dyn Fs>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_manager: Entity<ContextServerManager>,
@@ -33,7 +29,6 @@ pub struct AssistantConfiguration {

 impl AssistantConfiguration {
    pub fn new(
-        fs: Arc<dyn Fs>,
        context_server_manager: Entity<ContextServerManager>,
        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
@@ -59,7 +54,6 @@ impl AssistantConfiguration {
        );

        let mut this = Self {
-            fs,
            focus_handle,
            configuration_views_by_provider: HashMap::default(),
            context_server_manager,
@@ -173,56 +167,10 @@ impl AssistantConfiguration {
            )
    }

-    fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let always_allow_tool_actions = AssistantSettings::get_global(cx).always_allow_tool_actions;
-
-        const HEADING: &str = "Allow running tools without asking for confirmation";
-
-        v_flex()
-            .p(DynamicSpacing::Base16.rems(cx))
-            .gap_2()
-            .flex_1()
-            .child(Headline::new("General Settings").size(HeadlineSize::Small))
-            .child(
-                h_flex()
-                    .p_2p5()
-                    .rounded_sm()
-                    .bg(cx.theme().colors().editor_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .gap_4()
-                    .justify_between()
-                    .flex_wrap()
-                    .child(
-                        v_flex()
-                            .gap_0p5()
-                            .max_w_5_6()
-                            .child(Label::new(HEADING))
-                            .child(Label::new("When enabled, the agent can perform potentially destructive actions without asking for your confirmation.").color(Color::Muted)),
-                    )
-                    .child(
-                        Switch::new(
-                            "always-allow-tool-actions-switch",
-                            always_allow_tool_actions.into(),
-                        )
-                        .on_click({
-                            let fs = self.fs.clone();
-                            move |state, _window, cx| {
-                                let allow = state == &ToggleState::Selected;
-                                update_settings_file::<AssistantSettings>(
-                                    fs.clone(),
-                                    cx,
-                                    move |settings, _| {
-                                        settings.set_always_allow_tool_actions(allow);
-                                    },
-                                );
-                            }
-                        }),
-                    ),
-            )
-    }
-
-    fn render_context_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_context_servers_section(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
        let context_servers = self.context_server_manager.read(cx).all_servers().clone();
        let tools_by_source = self.tools.tools_by_source(cx);
        let empty = Vec::new();
@@ -413,8 +361,6 @@ impl Render for AssistantConfiguration {
            .bg(cx.theme().colors().panel_background)
            .size_full()
            .overflow_y_scroll()
-            .child(self.render_command_permission(cx))
-            .child(Divider::horizontal().color(DividerColor::Border))
            .child(self.render_context_servers_section(cx))
            .child(Divider::horizontal().color(DividerColor::Border))
            .child(
--- a/crates/assistant2/src/assistant_configuration/add_context_server_modal.rs
+++ b/crates/assistant2/src/assistant_configuration/add_context_server_modal.rs
@@ -1,17 +1,17 @@
 use context_server::{ContextServerSettings, ServerCommand, ServerConfig};
-use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, WeakEntity, prelude::*};
+use editor::Editor;
+use gpui::{prelude::*, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, WeakEntity};
 use serde_json::json;
 use settings::update_settings_file;
-use ui::{Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
-use ui_input::SingleLineInput;
+use ui::{prelude::*, Modal, ModalFooter, ModalHeader, Section, Tooltip};
 use workspace::{ModalView, Workspace};

 use crate::AddContextServer;

 pub struct AddContextServerModal {
    workspace: WeakEntity<Workspace>,
-    name_editor: Entity<SingleLineInput>,
-    command_editor: Entity<SingleLineInput>,
+    name_editor: Entity<Editor>,
+    command_editor: Entity<Editor>,
 }

 impl AddContextServerModal {
@@ -33,10 +33,15 @@ impl AddContextServerModal {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let name_editor =
-            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 context server")
+        let name_editor = cx.new(|cx| Editor::single_line(window, cx));
+        let command_editor = cx.new(|cx| Editor::single_line(window, cx));
+
+        name_editor.update(cx, |editor, cx| {
+            editor.set_placeholder_text("Context server name", cx);
+        });
+
+        command_editor.update(cx, |editor, cx| {
+            editor.set_placeholder_text("Command to run the context server", cx);
        });

        Self {
@@ -47,22 +52,8 @@ impl AddContextServerModal {
    }

    fn confirm(&mut self, cx: &mut Context<Self>) {
-        let name = self
-            .name_editor
-            .read(cx)
-            .editor()
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
-        let command = self
-            .command_editor
-            .read(cx)
-            .editor()
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
+        let name = self.name_editor.read(cx).text(cx).trim().to_string();
+        let command = self.command_editor.read(cx).text(cx).trim().to_string();

        if name.is_empty() || command.is_empty() {
            return;
@@ -113,8 +104,8 @@ impl EventEmitter<DismissEvent> for AddContextServerModal {}

 impl Render for AddContextServerModal {
    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 is_name_empty = self.name_editor.read(cx).text(cx).trim().is_empty();
+        let is_command_empty = self.command_editor.read(cx).text(cx).trim().is_empty();

        div()
            .elevation_3(cx)
@@ -131,8 +122,18 @@ impl Render for AddContextServerModal {
                    .header(ModalHeader::new().headline("Add Context Server"))
                    .section(
                        Section::new()
-                            .child(self.name_editor.clone())
-                            .child(self.command_editor.clone()),
+                            .child(
+                                v_flex()
+                                    .gap_1()
+                                    .child(Label::new("Name"))
+                                    .child(self.name_editor.clone()),
+                            )
+                            .child(
+                                v_flex()
+                                    .gap_1()
+                                    .child(Label::new("Command"))
+                                    .child(self.command_editor.clone()),
+                            ),
                    )
                    .footer(
                        ModalFooter::new()
--- a/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/assistant2/src/assistant_configuration/manage_profiles_modal.rs
@@ -2,20 +2,22 @@ mod profile_modal_header;

 use std::sync::Arc;

-use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
+use assistant_settings::{
+    AgentProfile, AgentProfileContent, AssistantSettings, AssistantSettingsContent,
+    ContextServerPresetContent, VersionedAssistantSettingsContent,
+};
 use assistant_tool::ToolWorkingSet;
 use convert_case::{Case, Casing as _};
 use editor::Editor;
 use fs::Fs;
 use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, WeakEntity,
-    prelude::*,
+    prelude::*, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription,
+    WeakEntity,
 };
-use settings::{Settings as _, update_settings_file};
+use settings::{update_settings_file, Settings as _};
 use ui::{
-    KeyBinding, ListItem, ListItemSpacing, ListSeparator, Navigable, NavigableEntry, prelude::*,
+    prelude::*, KeyBinding, ListItem, ListItemSpacing, ListSeparator, Navigable, NavigableEntry,
 };
-use util::ResultExt as _;
 use workspace::{ModalView, Workspace};

 use crate::assistant_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
@@ -27,7 +29,7 @@ enum Mode {
    NewProfile(NewProfileMode),
    ViewProfile(ViewProfileMode),
    ConfigureTools {
-        profile_id: AgentProfileId,
+        profile_id: Arc<str>,
        tool_picker: Entity<ToolPicker>,
        _subscription: Subscription,
    },
@@ -58,7 +60,7 @@ impl Mode {

 #[derive(Clone)]
 struct ProfileEntry {
-    pub id: AgentProfileId,
+    pub id: Arc<str>,
    pub name: SharedString,
    pub navigation: NavigableEntry,
 }
@@ -71,7 +73,7 @@ pub struct ChooseProfileMode {

 #[derive(Clone)]
 pub struct ViewProfileMode {
-    profile_id: AgentProfileId,
+    profile_id: Arc<str>,
    fork_profile: NavigableEntry,
    configure_tools: NavigableEntry,
 }
@@ -79,7 +81,7 @@ pub struct ViewProfileMode {
 #[derive(Clone)]
 pub struct NewProfileMode {
    name_editor: Entity<Editor>,
-    base_profile_id: Option<AgentProfileId>,
+    base_profile_id: Option<Arc<str>>,
 }

 pub struct ManageProfilesModal {
@@ -140,7 +142,7 @@ impl ManageProfilesModal {

    fn new_profile(
        &mut self,
-        base_profile_id: Option<AgentProfileId>,
+        base_profile_id: Option<Arc<str>>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
@@ -158,7 +160,7 @@ impl ManageProfilesModal {

    pub fn view_profile(
        &mut self,
-        profile_id: AgentProfileId,
+        profile_id: Arc<str>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
@@ -172,7 +174,7 @@ impl ManageProfilesModal {

    fn configure_tools(
        &mut self,
-        profile_id: AgentProfileId,
+        profile_id: Arc<str>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
@@ -219,7 +221,7 @@ impl ManageProfilesModal {
                    .and_then(|profile_id| settings.profiles.get(profile_id).cloned());

                let name = mode.name_editor.read(cx).text(cx);
-                let profile_id = AgentProfileId(name.to_case(Case::Kebab).into());
+                let profile_id: Arc<str> = name.to_case(Case::Kebab).into();

                let profile = AgentProfile {
                    name: name.into(),
@@ -227,10 +229,6 @@ impl ManageProfilesModal {
                        .as_ref()
                        .map(|profile| profile.tools.clone())
                        .unwrap_or_default(),
-                    enable_all_context_servers: base_profile
-                        .as_ref()
-                        .map(|profile| profile.enable_all_context_servers)
-                        .unwrap_or_default(),
                    context_servers: base_profile
                        .map(|profile| profile.context_servers)
                        .unwrap_or_default(),
@@ -261,15 +259,39 @@ impl ManageProfilesModal {
        }
    }

-    fn create_profile(
-        &self,
-        profile_id: AgentProfileId,
-        profile: AgentProfile,
-        cx: &mut Context<Self>,
-    ) {
+    fn create_profile(&self, profile_id: Arc<str>, profile: AgentProfile, cx: &mut Context<Self>) {
        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
-            move |settings, _cx| {
-                settings.create_profile(profile_id, profile).log_err();
+            move |settings, _cx| match settings {
+                AssistantSettingsContent::Versioned(VersionedAssistantSettingsContent::V2(
+                    settings,
+                )) => {
+                    let profiles = settings.profiles.get_or_insert_default();
+                    if profiles.contains_key(&profile_id) {
+                        log::error!("profile with ID '{profile_id}' already exists");
+                        return;
+                    }
+
+                    profiles.insert(
+                        profile_id,
+                        AgentProfileContent {
+                            name: profile.name.into(),
+                            tools: profile.tools,
+                            context_servers: profile
+                                .context_servers
+                                .into_iter()
+                                .map(|(server_id, preset)| {
+                                    (
+                                        server_id,
+                                        ContextServerPresetContent {
+                                            tools: preset.tools,
+                                        },
+                                    )
+                                })
+                                .collect(),
+                        },
+                    );
+                }
+                _ => {}
            }
        });
    }
@@ -296,7 +318,7 @@ impl ManageProfilesModal {
        mode: ChooseProfileMode,
        window: &mut Window,
        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    ) -> impl IntoElement + use<> {
        Navigable::new(
            div()
                .track_focus(&self.focus_handle(cx))
@@ -396,7 +418,7 @@ impl ManageProfilesModal {
        mode: NewProfileMode,
        _window: &mut Window,
        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    ) -> impl IntoElement + use<> {
        let settings = AssistantSettings::get_global(cx);

        let base_profile_name = mode.base_profile_id.as_ref().map(|base_profile_id| {
@@ -426,7 +448,7 @@ impl ManageProfilesModal {
        mode: ViewProfileMode,
        window: &mut Window,
        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    ) -> impl IntoElement + use<> {
        let settings = AssistantSettings::get_global(cx);

        let profile_name = settings
--- a/crates/assistant2/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
+++ b/crates/assistant2/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
--- a/crates/assistant2/src/assistant_configuration/tool_picker.rs
+++ b/crates/assistant2/src/assistant_configuration/tool_picker.rs
@@ -1,16 +1,16 @@
 use std::sync::Arc;

 use assistant_settings::{
-    AgentProfile, AgentProfileContent, AgentProfileId, AssistantSettings, AssistantSettingsContent,
+    AgentProfile, AgentProfileContent, AssistantSettings, AssistantSettingsContent,
    ContextServerPresetContent, VersionedAssistantSettingsContent,
 };
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
+use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
 use gpui::{App, Context, DismissEvent, Entity, EventEmitter, Focusable, Task, WeakEntity, Window};
 use picker::{Picker, PickerDelegate};
-use settings::{Settings as _, update_settings_file};
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
+use settings::{update_settings_file, Settings as _};
+use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
 use util::ResultExt as _;

 use crate::ThreadStore;
@@ -51,7 +51,7 @@ pub struct ToolPickerDelegate {
    thread_store: WeakEntity<ThreadStore>,
    fs: Arc<dyn Fs>,
    tools: Vec<ToolEntry>,
-    profile_id: AgentProfileId,
+    profile_id: Arc<str>,
    profile: AgentProfile,
    matches: Vec<StringMatch>,
    selected_index: usize,
@@ -62,7 +62,7 @@ impl ToolPickerDelegate {
        fs: Arc<dyn Fs>,
        tool_set: Arc<ToolWorkingSet>,
        thread_store: WeakEntity<ThreadStore>,
-        profile_id: AgentProfileId,
+        profile_id: Arc<str>,
        profile: AgentProfile,
        cx: &mut Context<ToolPicker>,
    ) -> Self {
@@ -191,8 +191,8 @@ impl PickerDelegate for ToolPickerDelegate {
        let active_profile_id = &AssistantSettings::get_global(cx).default_profile;
        if active_profile_id == &self.profile_id {
            self.thread_store
-                .update(cx, |this, cx| {
-                    this.load_profile(&self.profile, cx);
+                .update(cx, |this, _cx| {
+                    this.load_profile(&self.profile);
                })
                .log_err();
        }
@@ -202,43 +202,40 @@ impl PickerDelegate for ToolPickerDelegate {
            let default_profile = self.profile.clone();
            let tool = tool.clone();
            move |settings, _cx| match settings {
-                AssistantSettingsContent::Versioned(boxed) => {
-                    if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-                        let profiles = settings.profiles.get_or_insert_default();
-                        let profile =
-                            profiles
-                                .entry(profile_id)
-                                .or_insert_with(|| AgentProfileContent {
-                                    name: default_profile.name.into(),
-                                    tools: default_profile.tools,
-                                    enable_all_context_servers: Some(
-                                        default_profile.enable_all_context_servers,
-                                    ),
-                                    context_servers: default_profile
-                                        .context_servers
-                                        .into_iter()
-                                        .map(|(server_id, preset)| {
-                                            (
-                                                server_id,
-                                                ContextServerPresetContent {
-                                                    tools: preset.tools,
-                                                },
-                                            )
-                                        })
-                                        .collect(),
-                                });
-
-                        match tool.source {
-                            ToolSource::Native => {
-                                *profile.tools.entry(tool.name).or_default() = is_enabled;
-                            }
-                            ToolSource::ContextServer { id } => {
-                                let preset = profile
+                AssistantSettingsContent::Versioned(VersionedAssistantSettingsContent::V2(
+                    settings,
+                )) => {
+                    let profiles = settings.profiles.get_or_insert_default();
+                    let profile =
+                        profiles
+                            .entry(profile_id)
+                            .or_insert_with(|| AgentProfileContent {
+                                name: default_profile.name.into(),
+                                tools: default_profile.tools,
+                                context_servers: default_profile
                                    .context_servers
-                                    .entry(id.clone().into())
-                                    .or_default();
-                                *preset.tools.entry(tool.name.clone()).or_default() = is_enabled;
-                            }
+                                    .into_iter()
+                                    .map(|(server_id, preset)| {
+                                        (
+                                            server_id,
+                                            ContextServerPresetContent {
+                                                tools: preset.tools,
+                                            },
+                                        )
+                                    })
+                                    .collect(),
+                            });
+
+                    match tool.source {
+                        ToolSource::Native => {
+                            *profile.tools.entry(tool.name).or_default() = is_enabled;
+                        }
+                        ToolSource::ContextServer { id } => {
+                            let preset = profile
+                                .context_servers
+                                .entry(id.clone().into())
+                                .or_default();
+                            *preset.tools.entry(tool.name.clone()).or_default() = is_enabled;
                        }
                    }
                }
--- a/crates/assistant2/src/assistant_diff.rs
+++ b/crates/assistant2/src/assistant_diff.rs
@@ -1,15 +1,14 @@
-use crate::{Keep, Reject, Thread, ThreadEvent};
+use crate::{Thread, ThreadEvent, ToggleKeep};
 use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
 use collections::HashSet;
 use editor::{
-    Direction, Editor, EditorEvent, MultiBuffer, ToPoint,
    actions::{GoToHunk, GoToPreviousHunk},
-    scroll::Autoscroll,
+    Direction, Editor, EditorEvent, MultiBuffer, ToPoint,
 };
 use gpui::{
-    Action, AnyElement, AnyView, App, Entity, EventEmitter, FocusHandle, Focusable, SharedString,
-    Subscription, Task, WeakEntity, Window, prelude::*,
+    prelude::*, Action, AnyElement, AnyView, App, Entity, EventEmitter, FocusHandle, Focusable,
+    SharedString, Subscription, Task, WeakEntity, Window,
 };
 use language::{Capability, DiskState, OffsetRangeExt, Point};
 use multi_buffer::PathKey;
@@ -19,16 +18,15 @@ use std::{
    ops::Range,
    sync::Arc,
 };
-use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*};
+use ui::{prelude::*, IconButtonShape, KeyBinding, Tooltip};
 use workspace::{
-    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
    item::{BreadcrumbText, ItemEvent, TabContentParams},
    searchable::SearchableItemHandle,
+    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
 };
-use zed_actions::assistant::ToggleFocus;

-pub struct AgentDiff {
+pub struct AssistantDiff {
    multibuffer: Entity<MultiBuffer>,
    editor: Entity<Editor>,
    thread: Entity<Thread>,
@@ -38,30 +36,29 @@ pub struct AgentDiff {
    _subscriptions: Vec<Subscription>,
 }

-impl AgentDiff {
+impl AssistantDiff {
    pub fn deploy(
        thread: Entity<Thread>,
        workspace: WeakEntity<Workspace>,
        window: &mut Window,
        cx: &mut App,
-    ) -> Result<Entity<Self>> {
+    ) -> Result<()> {
        let existing_diff = workspace.update(cx, |workspace, cx| {
            workspace
-                .items_of_type::<AgentDiff>(cx)
+                .items_of_type::<AssistantDiff>(cx)
                .find(|diff| diff.read(cx).thread == thread)
        })?;
-        if let Some(existing_diff) = existing_diff {
-            workspace.update(cx, |workspace, cx| {
+        match existing_diff {
+            Some(existing_diff) => workspace.update(cx, |workspace, cx| {
                workspace.activate_item(&existing_diff, true, true, window, cx);
-            })?;
-            Ok(existing_diff)
-        } else {
-            let agent_diff =
-                cx.new(|cx| AgentDiff::new(thread.clone(), workspace.clone(), window, cx));
-            workspace.update(cx, |workspace, cx| {
-                workspace.add_item_to_center(Box::new(agent_diff.clone()), window, cx);
-            })?;
-            Ok(agent_diff)
+            }),
+            _ => {
+                let assistant_diff =
+                    cx.new(|cx| AssistantDiff::new(thread.clone(), workspace.clone(), window, cx));
+                workspace.update(cx, |workspace, cx| {
+                    workspace.add_item_to_center(Box::new(assistant_diff), window, cx);
+                })
+            }
        }
    }

@@ -76,13 +73,13 @@ impl AgentDiff {

        let project = thread.read(cx).project().clone();
        let render_diff_hunk_controls = Arc::new({
-            let agent_diff = cx.entity();
+            let assistant_diff = cx.entity();
            move |row,
                  status: &DiffHunkStatus,
                  hunk_range,
                  is_created_file,
                  line_height,
-                  editor: &Entity<Editor>,
+                  _editor: &Entity<Editor>,
                  window: &mut Window,
                  cx: &mut App| {
                render_diff_hunk_controls(
@@ -91,8 +88,7 @@ impl AgentDiff {
                    hunk_range,
                    is_created_file,
                    line_height,
-                    &agent_diff,
-                    editor,
+                    &assistant_diff,
                    window,
                    cx,
                )
@@ -104,7 +100,7 @@ impl AgentDiff {
            editor.disable_inline_diagnostics();
            editor.set_expand_all_diff_hunks(cx);
            editor.set_render_diff_hunk_controls(render_diff_hunk_controls, cx);
-            editor.register_addon(AgentDiffAddon);
+            editor.register_addon(AssistantDiffAddon);
            editor
        });

@@ -135,17 +131,16 @@ impl AgentDiff {
        let changed_buffers = thread.action_log().read(cx).changed_buffers(cx);
        let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::<HashSet<_>>();

-        for (buffer, diff_handle) in changed_buffers {
-            if buffer.read(cx).file().is_none() {
+        for (buffer, changed) in changed_buffers {
+            let Some(file) = buffer.read(cx).file().cloned() else {
                continue;
-            }
+            };

-            let path_key = PathKey::for_buffer(&buffer, cx);
+            let path_key = PathKey::namespaced("", file.full_path(cx).into());
            paths_to_delete.remove(&path_key);

            let snapshot = buffer.read(cx).snapshot();
-            let diff = diff_handle.read(cx);
-
+            let diff = changed.diff.read(cx);
            let diff_hunk_ranges = diff
                .hunks_intersecting_range(
                    language::Anchor::MIN..language::Anchor::MAX,
@@ -158,38 +153,22 @@ impl AgentDiff {
            let (was_empty, is_excerpt_newly_added) =
                self.multibuffer.update(cx, |multibuffer, cx| {
                    let was_empty = multibuffer.is_empty();
-                    let (_, is_excerpt_newly_added) = multibuffer.set_excerpts_for_path(
+                    let is_excerpt_newly_added = multibuffer.set_excerpts_for_path(
                        path_key.clone(),
                        buffer.clone(),
                        diff_hunk_ranges,
                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
                        cx,
                    );
-                    multibuffer.add_diff(diff_handle, cx);
+                    multibuffer.add_diff(changed.diff.clone(), cx);
                    (was_empty, is_excerpt_newly_added)
                });

            self.editor.update(cx, |editor, cx| {
                if was_empty {
-                    let first_hunk = editor
-                        .diff_hunks_in_ranges(
-                            &[editor::Anchor::min()..editor::Anchor::max()],
-                            &self.multibuffer.read(cx).read(cx),
-                        )
-                        .next();
-
-                    if let Some(first_hunk) = first_hunk {
-                        let first_hunk_start = first_hunk.multi_buffer_range().start;
-                        editor.change_selections(
-                            Some(Autoscroll::fit()),
-                            window,
-                            cx,
-                            |selections| {
-                                selections
-                                    .select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                            },
-                        )
-                    }
+                    editor.change_selections(None, window, cx, |selections| {
+                        selections.select_ranges([0..0])
+                    });
                }

                if is_excerpt_newly_added
@@ -238,57 +217,51 @@ impl AgentDiff {

    fn handle_thread_event(&mut self, event: &ThreadEvent, cx: &mut Context<Self>) {
        match event {
-            ThreadEvent::SummaryGenerated => self.update_title(cx),
+            ThreadEvent::SummaryChanged => self.update_title(cx),
            _ => {}
        }
    }

-    pub fn move_to_path(&mut self, path_key: PathKey, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
-            self.editor.update(cx, |editor, cx| {
-                let first_hunk = editor
-                    .diff_hunks_in_ranges(
-                        &[position..editor::Anchor::max()],
-                        &self.multibuffer.read(cx).read(cx),
-                    )
-                    .next();
-
-                if let Some(first_hunk) = first_hunk {
-                    let first_hunk_start = first_hunk.multi_buffer_range().start;
-                    editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
-                        selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                    })
-                }
-            });
-        }
-    }
-
-    fn keep(&mut self, _: &crate::Keep, window: &mut Window, cx: &mut Context<Self>) {
+    fn toggle_keep(&mut self, _: &crate::ToggleKeep, _window: &mut Window, cx: &mut Context<Self>) {
        let ranges = self
            .editor
            .read(cx)
            .selections
            .disjoint_anchor_ranges()
            .collect::<Vec<_>>();
-        self.keep_edits_in_ranges(ranges, window, cx);
+
+        let snapshot = self.multibuffer.read(cx).snapshot(cx);
+        let diff_hunks_in_ranges = self
+            .editor
+            .read(cx)
+            .diff_hunks_in_ranges(&ranges, &snapshot)
+            .collect::<Vec<_>>();
+
+        for hunk in diff_hunks_in_ranges {
+            let buffer = self.multibuffer.read(cx).buffer(hunk.buffer_id);
+            if let Some(buffer) = buffer {
+                self.thread.update(cx, |thread, cx| {
+                    let accept = hunk.status().has_secondary_hunk();
+                    thread.review_edits_in_range(buffer, hunk.buffer_range, accept, cx)
+                });
+            }
+        }
    }

    fn reject(&mut self, _: &crate::Reject, window: &mut Window, cx: &mut Context<Self>) {
        let ranges = self
            .editor
-            .read(cx)
-            .selections
-            .disjoint_anchor_ranges()
-            .collect::<Vec<_>>();
-        self.reject_edits_in_ranges(ranges, window, cx);
+            .update(cx, |editor, cx| editor.selections.ranges(cx));
+        self.editor.update(cx, |editor, cx| {
+            editor.restore_hunks_in_ranges(ranges, window, cx)
+        })
    }

    fn reject_all(&mut self, _: &crate::RejectAll, window: &mut Window, cx: &mut Context<Self>) {
-        self.reject_edits_in_ranges(
-            vec![editor::Anchor::min()..editor::Anchor::max()],
-            window,
-            cx,
-        );
+        self.editor.update(cx, |editor, cx| {
+            let max_point = editor.buffer().read(cx).read(cx).max_point();
+            editor.restore_hunks_in_ranges(vec![Point::zero()..max_point], window, cx)
+        })
    }

    fn keep_all(&mut self, _: &crate::KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
@@ -296,115 +269,33 @@ impl AgentDiff {
            .update(cx, |thread, cx| thread.keep_all_edits(cx));
    }

-    fn keep_edits_in_ranges(
+    fn review_diff_hunks(
        &mut self,
-        ranges: Vec<Range<editor::Anchor>>,
-        window: &mut Window,
+        hunk_ranges: Vec<Range<editor::Anchor>>,
+        accept: bool,
        cx: &mut Context<Self>,
    ) {
        let snapshot = self.multibuffer.read(cx).snapshot(cx);
        let diff_hunks_in_ranges = self
            .editor
            .read(cx)
-            .diff_hunks_in_ranges(&ranges, &snapshot)
+            .diff_hunks_in_ranges(&hunk_ranges, &snapshot)
            .collect::<Vec<_>>();
-        let newest_cursor = self.editor.update(cx, |editor, cx| {
-            editor.selections.newest::<Point>(cx).head()
-        });
-        if diff_hunks_in_ranges.iter().any(|hunk| {
-            hunk.row_range
-                .contains(&multi_buffer::MultiBufferRow(newest_cursor.row))
-        }) {
-            self.update_selection(&diff_hunks_in_ranges, window, cx);
-        }

-        for hunk in &diff_hunks_in_ranges {
+        for hunk in diff_hunks_in_ranges {
            let buffer = self.multibuffer.read(cx).buffer(hunk.buffer_id);
            if let Some(buffer) = buffer {
                self.thread.update(cx, |thread, cx| {
-                    thread.keep_edits_in_range(buffer, hunk.buffer_range.clone(), cx)
+                    thread.review_edits_in_range(buffer, hunk.buffer_range, accept, cx)
                });
            }
        }
    }
-
-    fn reject_edits_in_ranges(
-        &mut self,
-        ranges: Vec<Range<editor::Anchor>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.multibuffer.read(cx).snapshot(cx);
-        let diff_hunks_in_ranges = self
-            .editor
-            .read(cx)
-            .diff_hunks_in_ranges(&ranges, &snapshot)
-            .collect::<Vec<_>>();
-        let newest_cursor = self.editor.update(cx, |editor, cx| {
-            editor.selections.newest::<Point>(cx).head()
-        });
-        if diff_hunks_in_ranges.iter().any(|hunk| {
-            hunk.row_range
-                .contains(&multi_buffer::MultiBufferRow(newest_cursor.row))
-        }) {
-            self.update_selection(&diff_hunks_in_ranges, window, cx);
-        }
-
-        for hunk in &diff_hunks_in_ranges {
-            let buffer = self.multibuffer.read(cx).buffer(hunk.buffer_id);
-            if let Some(buffer) = buffer {
-                self.thread
-                    .update(cx, |thread, cx| {
-                        thread.reject_edits_in_range(buffer, hunk.buffer_range.clone(), cx)
-                    })
-                    .detach_and_log_err(cx);
-            }
-        }
-    }
-
-    fn update_selection(
-        &mut self,
-        diff_hunks: &[multi_buffer::MultiBufferDiffHunk],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.multibuffer.read(cx).snapshot(cx);
-        let target_hunk = diff_hunks
-            .last()
-            .and_then(|last_kept_hunk| {
-                let last_kept_hunk_end = last_kept_hunk.multi_buffer_range().end;
-                self.editor
-                    .read(cx)
-                    .diff_hunks_in_ranges(&[last_kept_hunk_end..editor::Anchor::max()], &snapshot)
-                    .skip(1)
-                    .next()
-            })
-            .or_else(|| {
-                let first_kept_hunk = diff_hunks.first()?;
-                let first_kept_hunk_start = first_kept_hunk.multi_buffer_range().start;
-                self.editor
-                    .read(cx)
-                    .diff_hunks_in_ranges(
-                        &[editor::Anchor::min()..first_kept_hunk_start],
-                        &snapshot,
-                    )
-                    .next()
-            });
-
-        if let Some(target_hunk) = target_hunk {
-            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
-                    let next_hunk_start = target_hunk.multi_buffer_range().start;
-                    selections.select_anchor_ranges([next_hunk_start..next_hunk_start]);
-                })
-            });
-        }
-    }
 }

-impl EventEmitter<EditorEvent> for AgentDiff {}
+impl EventEmitter<EditorEvent> for AssistantDiff {}

-impl Focusable for AgentDiff {
+impl Focusable for AssistantDiff {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        if self.multibuffer.read(cx).is_empty() {
            self.focus_handle.clone()
@@ -414,7 +305,7 @@ impl Focusable for AgentDiff {
    }
 }

-impl Item for AgentDiff {
+impl Item for AssistantDiff {
    type Event = EditorEvent;

    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
@@ -441,7 +332,7 @@ impl Item for AgentDiff {
    }

    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Agent Diff".into())
+        Some("Assistant Diff".into())
    }

    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
@@ -578,15 +469,18 @@ impl Item for AgentDiff {
    }
 }

-impl Render for AgentDiff {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+impl Render for AssistantDiff {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let is_empty = self.multibuffer.read(cx).is_empty();
-        let focus_handle = &self.focus_handle;

        div()
-            .track_focus(focus_handle)
-            .key_context(if is_empty { "EmptyPane" } else { "AgentDiff" })
-            .on_action(cx.listener(Self::keep))
+            .track_focus(&self.focus_handle)
+            .key_context(if is_empty {
+                "EmptyPane"
+            } else {
+                "AssistantDiff"
+            })
+            .on_action(cx.listener(Self::toggle_keep))
            .on_action(cx.listener(Self::reject))
            .on_action(cx.listener(Self::reject_all))
            .on_action(cx.listener(Self::keep_all))
@@ -595,48 +489,23 @@ impl Render for AgentDiff {
            .items_center()
            .justify_center()
            .size_full()
-            .when(is_empty, |el| {
-                el.child(
-                    v_flex()
-                        .items_center()
-                        .gap_2()
-                        .child("No changes to review")
-                        .child(
-                            Button::new("continue-iterating", "Continue Iterating")
-                                .style(ButtonStyle::Filled)
-                                .icon(IconName::ForwardArrow)
-                                .icon_position(IconPosition::Start)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .full_width()
-                                .key_binding(KeyBinding::for_action_in(
-                                    &ToggleFocus,
-                                    &focus_handle.clone(),
-                                    window,
-                                    cx,
-                                ))
-                                .on_click(|_event, window, cx| {
-                                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                                }),
-                        ),
-                )
-            })
+            .when(is_empty, |el| el.child("No changes to review"))
            .when(!is_empty, |el| el.child(self.editor.clone()))
    }
 }

 fn render_diff_hunk_controls(
    row: u32,
-    _status: &DiffHunkStatus,
+    status: &DiffHunkStatus,
    hunk_range: Range<editor::Anchor>,
    is_created_file: bool,
    line_height: Pixels,
-    agent_diff: &Entity<AgentDiff>,
-    editor: &Entity<Editor>,
+    assistant_diff: &Entity<AssistantDiff>,
    window: &mut Window,
    cx: &mut App,
 ) -> AnyElement {
-    let editor = editor.clone();
+    let editor = assistant_diff.read(cx).editor.clone();
+
    h_flex()
        .h(line_height)
        .mr_0p5()
@@ -651,48 +520,73 @@ fn render_diff_hunk_controls(
        .gap_1()
        .occlude()
        .shadow_md()
-        .children(vec![
-            Button::new(("reject", row as u64), "Reject")
-                .disabled(is_created_file)
-                .key_binding(
-                    KeyBinding::for_action_in(
-                        &Reject,
-                        &editor.read(cx).focus_handle(cx),
-                        window,
-                        cx,
-                    )
-                    .map(|kb| kb.size(rems_from_px(12.))),
-                )
-                .on_click({
-                    let agent_diff = agent_diff.clone();
-                    move |_event, window, cx| {
-                        agent_diff.update(cx, |diff, cx| {
-                            diff.reject_edits_in_ranges(
-                                vec![hunk_range.start..hunk_range.start],
-                                window,
-                                cx,
-                            );
-                        });
-                    }
-                }),
-            Button::new(("keep", row as u64), "Keep")
-                .key_binding(
-                    KeyBinding::for_action_in(&Keep, &editor.read(cx).focus_handle(cx), window, cx)
+        .children(if status.has_secondary_hunk() {
+            vec![
+                Button::new("reject", "Reject")
+                    .disabled(is_created_file)
+                    .key_binding(
+                        KeyBinding::for_action_in(
+                            &crate::Reject,
+                            &editor.read(cx).focus_handle(cx),
+                            window,
+                            cx,
+                        )
                        .map(|kb| kb.size(rems_from_px(12.))),
-                )
+                    )
+                    .on_click({
+                        let editor = editor.clone();
+                        move |_event, window, cx| {
+                            editor.update(cx, |editor, cx| {
+                                let snapshot = editor.snapshot(window, cx);
+                                let point = hunk_range.start.to_point(&snapshot.buffer_snapshot);
+                                editor.restore_hunks_in_ranges(vec![point..point], window, cx);
+                            });
+                        }
+                    }),
+                Button::new(("keep", row as u64), "Keep")
+                    .key_binding(
+                        KeyBinding::for_action_in(
+                            &crate::ToggleKeep,
+                            &editor.read(cx).focus_handle(cx),
+                            window,
+                            cx,
+                        )
+                        .map(|kb| kb.size(rems_from_px(12.))),
+                    )
+                    .on_click({
+                        let assistant_diff = assistant_diff.clone();
+                        move |_event, _window, cx| {
+                            assistant_diff.update(cx, |diff, cx| {
+                                diff.review_diff_hunks(
+                                    vec![hunk_range.start..hunk_range.start],
+                                    true,
+                                    cx,
+                                );
+                            });
+                        }
+                    }),
+            ]
+        } else {
+            vec![Button::new(("review", row as u64), "Review")
+                .key_binding(KeyBinding::for_action_in(
+                    &ToggleKeep,
+                    &editor.read(cx).focus_handle(cx),
+                    window,
+                    cx,
+                ))
                .on_click({
-                    let agent_diff = agent_diff.clone();
-                    move |_event, window, cx| {
-                        agent_diff.update(cx, |diff, cx| {
-                            diff.keep_edits_in_ranges(
+                    let assistant_diff = assistant_diff.clone();
+                    move |_event, _window, cx| {
+                        assistant_diff.update(cx, |diff, cx| {
+                            diff.review_diff_hunks(
                                vec![hunk_range.start..hunk_range.start],
-                                window,
+                                false,
                                cx,
                            );
                        });
                    }
-                }),
-        ])
+                })]
+        })
        .when(
            !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
            |el| {
@@ -773,38 +667,38 @@ fn render_diff_hunk_controls(
        .into_any_element()
 }

-struct AgentDiffAddon;
+struct AssistantDiffAddon;

-impl editor::Addon for AgentDiffAddon {
+impl editor::Addon for AssistantDiffAddon {
    fn to_any(&self) -> &dyn std::any::Any {
        self
    }

    fn extend_key_context(&self, key_context: &mut gpui::KeyContext, _: &App) {
-        key_context.add("agent_diff");
+        key_context.add("assistant_diff");
    }
 }

-pub struct AgentDiffToolbar {
-    agent_diff: Option<WeakEntity<AgentDiff>>,
+pub struct AssistantDiffToolbar {
+    assistant_diff: Option<WeakEntity<AssistantDiff>>,
    _workspace: WeakEntity<Workspace>,
 }

-impl AgentDiffToolbar {
+impl AssistantDiffToolbar {
    pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
        Self {
-            agent_diff: None,
+            assistant_diff: None,
            _workspace: workspace.weak_handle(),
        }
    }

-    fn agent_diff(&self, _: &App) -> Option<Entity<AgentDiff>> {
-        self.agent_diff.as_ref()?.upgrade()
+    fn assistant_diff(&self, _: &App) -> Option<Entity<AssistantDiff>> {
+        self.assistant_diff.as_ref()?.upgrade()
    }

    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(agent_diff) = self.agent_diff(cx) {
-            agent_diff.focus_handle(cx).focus(window);
+        if let Some(assistant_diff) = self.assistant_diff(cx) {
+            assistant_diff.focus_handle(cx).focus(window);
        }
        let action = action.boxed_clone();
        cx.defer(move |cx| {
@@ -813,19 +707,19 @@ impl AgentDiffToolbar {
    }
 }

-impl EventEmitter<ToolbarItemEvent> for AgentDiffToolbar {}
+impl EventEmitter<ToolbarItemEvent> for AssistantDiffToolbar {}

-impl ToolbarItemView for AgentDiffToolbar {
+impl ToolbarItemView for AssistantDiffToolbar {
    fn set_active_pane_item(
        &mut self,
        active_pane_item: Option<&dyn ItemHandle>,
        _: &mut Window,
        cx: &mut Context<Self>,
    ) -> ToolbarItemLocation {
-        self.agent_diff = active_pane_item
-            .and_then(|item| item.act_as::<AgentDiff>(cx))
+        self.assistant_diff = active_pane_item
+            .and_then(|item| item.act_as::<AssistantDiff>(cx))
            .map(|entity| entity.downgrade());
-        if self.agent_diff.is_some() {
+        if self.assistant_diff.is_some() {
            ToolbarItemLocation::PrimaryRight
        } else {
            ToolbarItemLocation::Hidden
@@ -841,14 +735,14 @@ impl ToolbarItemView for AgentDiffToolbar {
    }
 }

-impl Render for AgentDiffToolbar {
+impl Render for AssistantDiffToolbar {
    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let agent_diff = match self.agent_diff(cx) {
+        let assistant_diff = match self.assistant_diff(cx) {
            Some(ad) => ad,
            None => return div(),
        };

-        let is_empty = agent_diff.read(cx).multibuffer.read(cx).is_empty();
+        let is_empty = assistant_diff.read(cx).multibuffer.read(cx).is_empty();

        if is_empty {
            return div();
@@ -875,161 +769,3 @@ impl Render for AgentDiffToolbar {
            )
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{ThreadStore, thread_store};
-    use assistant_settings::AssistantSettings;
-    use context_server::ContextServerSettings;
-    use editor::EditorSettings;
-    use gpui::TestAppContext;
-    use project::{FakeFs, Project};
-    use prompt_store::PromptBuilder;
-    use serde_json::json;
-    use settings::{Settings, SettingsStore};
-    use std::sync::Arc;
-    use theme::ThemeSettings;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_agent_diff(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-            AssistantSettings::register(cx);
-            thread_store::init(cx);
-            workspace::init_settings(cx);
-            ThemeSettings::register(cx);
-            ContextServerSettings::register(cx);
-            EditorSettings::register(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            json!({"file1": "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz"}),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-        let buffer_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("test/file1", cx)
-            })
-            .unwrap();
-
-        let thread_store = cx.update(|cx| {
-            ThreadStore::new(
-                project.clone(),
-                Arc::default(),
-                Arc::new(PromptBuilder::new(None).unwrap()),
-                cx,
-            )
-            .unwrap()
-        });
-        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let agent_diff = cx.new_window_entity(|window, cx| {
-            AgentDiff::new(thread.clone(), workspace.downgrade(), window, cx)
-        });
-        let editor = agent_diff.read_with(cx, |diff, _cx| diff.editor.clone());
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(buffer_path, cx))
-            .await
-            .unwrap();
-        cx.update(|_, cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit(
-                        [
-                            (Point::new(1, 1)..Point::new(1, 2), "E"),
-                            (Point::new(3, 2)..Point::new(3, 3), "L"),
-                            (Point::new(5, 0)..Point::new(5, 1), "P"),
-                            (Point::new(7, 1)..Point::new(7, 2), "W"),
-                        ],
-                        None,
-                        cx,
-                    )
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-
-        // When opening the assistant diff, the cursor is positioned on the first hunk.
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndef\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
-                .range(),
-            Point::new(1, 0)..Point::new(1, 0)
-        );
-
-        // After keeping a hunk, the cursor should be positioned on the second hunk.
-        agent_diff.update_in(cx, |diff, window, cx| diff.keep(&crate::Keep, window, cx));
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(None, window, cx, |selections| {
-                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
-            });
-        });
-        agent_diff.update_in(cx, |diff, window, cx| {
-            diff.reject(&crate::Reject, window, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Keeping a range that doesn't intersect the current selection doesn't move it.
-        agent_diff.update_in(cx, |diff, window, cx| {
-            let position = editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .read(cx)
-                .anchor_before(Point::new(7, 0));
-            diff.keep_edits_in_ranges(vec![position..position], window, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor.selections.newest::<Point>(cx))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-    }
-}
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -7,19 +7,12 @@ use language_model_selector::{
 };
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::{ButtonLike, PopoverMenuHandle, Tooltip, prelude::*};
-
-#[derive(Clone, Copy)]
-pub enum ModelType {
-    Default,
-    InlineAssistant,
-}
+use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};

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

 impl AssistantModelSelector {
@@ -27,7 +20,6 @@ impl AssistantModelSelector {
        fs: Arc<dyn Fs>,
        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
        focus_handle: FocusHandle,
-        model_type: ModelType,
        window: &mut Window,
        cx: &mut App,
    ) -> Self {
@@ -36,32 +28,11 @@ impl AssistantModelSelector {
                let fs = fs.clone();
                LanguageModelSelector::new(
                    move |model, cx| {
-                        let provider = model.provider_id().0.to_string();
-                        let model_id = model.id().0.to_string();
-
-                        match model_type {
-                            ModelType::Default => {
-                                update_settings_file::<AssistantSettings>(
-                                    fs.clone(),
-                                    cx,
-                                    move |settings, _cx| {
-                                        settings.set_model(model.clone());
-                                    },
-                                );
-                            }
-                            ModelType::InlineAssistant => {
-                                update_settings_file::<AssistantSettings>(
-                                    fs.clone(),
-                                    cx,
-                                    move |settings, _cx| {
-                                        settings.set_inline_assistant_model(
-                                            provider.clone(),
-                                            model_id.clone(),
-                                        );
-                                    },
-                                );
-                            }
-                        }
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _cx| settings.set_model(model.clone()),
+                        );
                    },
                    window,
                    cx,
@@ -69,7 +40,6 @@ impl AssistantModelSelector {
            }),
            menu_handle,
            focus_handle,
-            model_type,
        }
    }

@@ -80,16 +50,10 @@ impl AssistantModelSelector {

 impl Render for AssistantModelSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        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 active_model = LanguageModelRegistry::read_global(cx).active_model();
        let focus_handle = self.focus_handle.clone();
-        let model_name = match model {
-            Some(model) => model.model.name().0,
+        let model_name = match active_model {
+            Some(model) => model.name().0,
            _ => SharedString::from("No model selected"),
        };

--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -1,50 +1,46 @@
 use std::path::PathBuf;
 use std::sync::Arc;
-use std::time::Duration;

-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use assistant_context_editor::{
-    AssistantPanelDelegate, ConfigurationError, ContextEditor, SlashCommandCompletionProvider,
-    make_lsp_adapter_delegate, render_remaining_tokens,
+    make_lsp_adapter_delegate, render_remaining_tokens, AssistantPanelDelegate, ConfigurationError,
+    ContextEditor, SlashCommandCompletionProvider,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;

 use client::zed_urls;
-use editor::{Editor, EditorEvent, MultiBuffer};
+use editor::{Editor, MultiBuffer};
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyElement, App, AsyncWindowContext, Corner, Entity,
-    EventEmitter, FocusHandle, Focusable, FontWeight, KeyContext, Pixels, Subscription, Task,
-    UpdateGlobal, WeakEntity, action_with_deprecated_aliases, prelude::*, pulsating_between,
+    action_with_deprecated_aliases, prelude::*, Action, AnyElement, App, AsyncWindowContext,
+    Corner, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, KeyContext, Pixels,
+    Subscription, Task, UpdateGlobal, WeakEntity,
 };
 use language::LanguageRegistry;
 use language_model::{LanguageModelProviderTosView, LanguageModelRegistry};
-use language_model_selector::ToggleModelSelector;
 use project::Project;
-use prompt_library::{PromptLibrary, open_prompt_library};
+use prompt_library::{open_prompt_library, PromptLibrary};
 use prompt_store::PromptBuilder;
-use settings::{Settings, update_settings_file};
+use settings::{update_settings_file, Settings};
 use time::UtcOffset;
-use ui::{
-    Banner, ContextMenu, KeyBinding, PopoverMenu, PopoverMenuHandle, Tab, Tooltip, prelude::*,
-};
+use ui::{prelude::*, ContextMenu, KeyBinding, PopoverMenu, PopoverMenuHandle, Tab, Tooltip};
 use util::ResultExt as _;
-use workspace::Workspace;
 use workspace::dock::{DockPosition, Panel, PanelEvent};
+use workspace::Workspace;
 use zed_actions::assistant::ToggleFocus;

 use crate::active_thread::ActiveThread;
 use crate::assistant_configuration::{AssistantConfiguration, AssistantConfigurationEvent};
 use crate::history_store::{HistoryEntry, HistoryStore};
 use crate::message_editor::MessageEditor;
-use crate::thread::{Thread, ThreadError, ThreadId, TokenUsageRatio};
+use crate::thread::{Thread, ThreadError, ThreadId};
 use crate::thread_history::{PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::{
-    AgentDiff, InlineAssistant, NewPromptEditor, NewThread, OpenActiveThreadAsMarkdown,
-    OpenAgentDiff, OpenConfiguration, OpenHistory, ThreadEvent, ToggleContextPicker,
+    AssistantDiff, InlineAssistant, NewPromptEditor, NewThread, OpenActiveThreadAsMarkdown,
+    OpenAssistantDiff, OpenConfiguration, OpenHistory,
 };

 action_with_deprecated_aliases!(
@@ -57,9 +53,9 @@ pub fn init(cx: &mut App) {
    cx.observe_new(
        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
            workspace
-                .register_action(|workspace, action: &NewThread, window, cx| {
+                .register_action(|workspace, _: &NewThread, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        panel.update(cx, |panel, cx| panel.new_thread(action, window, cx));
+                        panel.update(cx, |panel, cx| panel.new_thread(window, cx));
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                    }
                })
@@ -89,11 +85,17 @@ pub fn init(cx: &mut App) {
                        });
                    }
                })
-                .register_action(|workspace, _: &OpenAgentDiff, window, cx| {
+                .register_action(|workspace, _: &OpenConfiguration, window, cx| {
+                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                        panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
+                    }
+                })
+                .register_action(|workspace, _: &OpenAssistantDiff, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.open_agent_diff(&OpenAgentDiff, window, cx);
+                            panel.open_assistant_diff(&OpenAssistantDiff, window, cx);
                        });
                    }
                });
@@ -103,72 +105,12 @@ pub fn init(cx: &mut App) {
 }

 enum ActiveView {
-    Thread {
-        change_title_editor: Entity<Editor>,
-        _subscriptions: Vec<gpui::Subscription>,
-    },
+    Thread,
    PromptEditor,
    History,
    Configuration,
 }

-impl ActiveView {
-    pub fn thread(thread: Entity<Thread>, window: &mut Window, cx: &mut App) -> Self {
-        let summary = thread.read(cx).summary_or_default();
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text(summary, window, cx);
-            editor
-        });
-
-        let subscriptions = vec![
-            window.subscribe(&editor, cx, {
-                {
-                    let thread = thread.clone();
-                    move |editor, event, window, cx| match event {
-                        EditorEvent::BufferEdited => {
-                            let new_summary = editor.read(cx).text(cx);
-
-                            thread.update(cx, |thread, cx| {
-                                thread.set_summary(new_summary, cx);
-                            })
-                        }
-                        EditorEvent::Blurred => {
-                            if editor.read(cx).text(cx).is_empty() {
-                                let summary = thread.read(cx).summary_or_default();
-
-                                editor.update(cx, |editor, cx| {
-                                    editor.set_text(summary, window, cx);
-                                });
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }),
-            window.subscribe(&thread, cx, {
-                let editor = editor.clone();
-                move |thread, event, window, cx| match event {
-                    ThreadEvent::SummaryGenerated => {
-                        let summary = thread.read(cx).summary_or_default();
-
-                        editor.update(cx, |editor, cx| {
-                            editor.set_text(summary, window, cx);
-                        })
-                    }
-                    _ => {}
-                }
-            }),
-        ];
-
-        Self::Thread {
-            change_title_editor: editor,
-            _subscriptions: subscriptions,
-        }
-    }
-}
-
 pub struct AssistantPanel {
    workspace: WeakEntity<Workspace>,
    project: Entity<Project>,
@@ -236,12 +178,8 @@ impl AssistantPanel {
        let workspace = workspace.weak_handle();
        let weak_self = cx.entity().downgrade();

-        let message_editor_context_store = cx.new(|_cx| {
-            crate::context_store::ContextStore::new(
-                workspace.clone(),
-                Some(thread_store.downgrade()),
-            )
-        });
+        let message_editor_context_store =
+            cx.new(|_cx| crate::context_store::ContextStore::new(workspace.clone()));

        let message_editor = cx.new(|cx| {
            MessageEditor::new(
@@ -258,7 +196,6 @@ impl AssistantPanel {
        let history_store =
            cx.new(|cx| HistoryStore::new(thread_store.clone(), context_store.clone(), cx));

-        let active_view = ActiveView::thread(thread.clone(), window, cx);
        let thread = cx.new(|cx| {
            ActiveThread::new(
                thread.clone(),
@@ -272,7 +209,7 @@ impl AssistantPanel {
        });

        Self {
-            active_view,
+            active_view: ActiveView::Thread,
            workspace,
            project: project.clone(),
            fs: fs.clone(),
@@ -289,7 +226,7 @@ impl AssistantPanel {
            )
            .unwrap(),
            history_store: history_store.clone(),
-            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
+            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, cx)),
            assistant_dropdown_menu_handle: PopoverMenuHandle::default(),
            width: None,
            height: None,
@@ -328,39 +265,15 @@ impl AssistantPanel {
            .update(cx, |thread, cx| thread.cancel_last_completion(cx));
    }

-    fn new_thread(&mut self, action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
+    fn new_thread(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let thread = self
            .thread_store
            .update(cx, |this, cx| this.create_thread(cx));

-        self.active_view = ActiveView::thread(thread.clone(), window, cx);
+        self.active_view = ActiveView::Thread;

-        let message_editor_context_store = cx.new(|_cx| {
-            crate::context_store::ContextStore::new(
-                self.workspace.clone(),
-                Some(self.thread_store.downgrade()),
-            )
-        });
-
-        if let Some(other_thread_id) = action.from_thread_id.clone() {
-            let other_thread_task = self
-                .thread_store
-                .update(cx, |this, cx| this.open_thread(&other_thread_id, cx));
-
-            cx.spawn({
-                let context_store = message_editor_context_store.clone();
-
-                async move |_panel, cx| {
-                    let other_thread = other_thread_task.await?;
-
-                    context_store.update(cx, |this, cx| {
-                        this.add_thread(other_thread, false, cx);
-                    })?;
-                    anyhow::Ok(())
-                }
-            })
-            .detach_and_log_err(cx);
-        }
+        let message_editor_context_store =
+            cx.new(|_cx| crate::context_store::ContextStore::new(self.workspace.clone()));

        self.thread = cx.new(|cx| {
            ActiveThread::new(
@@ -497,13 +410,9 @@ impl AssistantPanel {
        cx.spawn_in(window, async move |this, cx| {
            let thread = open_thread_task.await?;
            this.update_in(cx, |this, window, cx| {
-                this.active_view = ActiveView::thread(thread.clone(), window, cx);
-                let message_editor_context_store = cx.new(|_cx| {
-                    crate::context_store::ContextStore::new(
-                        this.workspace.clone(),
-                        Some(this.thread_store.downgrade()),
-                    )
-                });
+                this.active_view = ActiveView::Thread;
+                let message_editor_context_store =
+                    cx.new(|_cx| crate::context_store::ContextStore::new(this.workspace.clone()));
                this.thread = cx.new(|cx| {
                    ActiveThread::new(
                        thread.clone(),
@@ -531,26 +440,24 @@ impl AssistantPanel {
        })
    }

-    pub fn open_agent_diff(
+    pub fn open_assistant_diff(
        &mut self,
-        _: &OpenAgentDiff,
+        _: &OpenAssistantDiff,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let thread = self.thread.read(cx).thread().clone();
-        AgentDiff::deploy(thread, self.workspace.clone(), window, cx).log_err();
+        AssistantDiff::deploy(thread, self.workspace.clone(), window, cx).log_err();
    }

    pub(crate) fn open_configuration(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let context_server_manager = self.thread_store.read(cx).context_server_manager();
        let tools = self.thread_store.read(cx).tools();
-        let fs = self.fs.clone();

        self.active_view = ActiveView::Configuration;
-        self.configuration =
-            Some(cx.new(|cx| {
-                AssistantConfiguration::new(fs, context_server_manager, tools, window, cx)
-            }));
+        self.configuration = Some(
+            cx.new(|cx| AssistantConfiguration::new(context_server_manager, tools, window, cx)),
+        );

        if let Some(configuration) = self.configuration.as_ref() {
            self.configuration_subscription = Some(cx.subscribe_in(
@@ -632,8 +539,10 @@ impl AssistantPanel {
        match event {
            AssistantConfigurationEvent::NewThread(provider) => {
                if LanguageModelRegistry::read_global(cx)
-                    .default_model()
-                    .map_or(true, |model| model.provider.id() != provider.id())
+                    .active_provider()
+                    .map_or(true, |active_provider| {
+                        active_provider.id() != provider.id()
+                    })
                {
                    if let Some(model) = provider.default_model(cx) {
                        update_settings_file::<AssistantSettings>(
@@ -644,7 +553,7 @@ impl AssistantPanel {
                    }
                }

-                self.new_thread(&NewThread::default(), window, cx);
+                self.new_thread(window, cx);
            }
        }
    }
@@ -673,22 +582,16 @@ impl AssistantPanel {
 impl Focusable for AssistantPanel {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        match self.active_view {
-            ActiveView::Thread { .. } => self.message_editor.focus_handle(cx),
+            ActiveView::Thread => self.message_editor.focus_handle(cx),
            ActiveView::History => self.history.focus_handle(cx),
-            ActiveView::PromptEditor => {
-                if let Some(context_editor) = self.context_editor.as_ref() {
-                    context_editor.focus_handle(cx)
-                } else {
-                    cx.focus_handle()
-                }
-            }
-            ActiveView::Configuration => {
-                if let Some(configuration) = self.configuration.as_ref() {
-                    configuration.focus_handle(cx)
-                } else {
-                    cx.focus_handle()
-                }
-            }
+            ActiveView::PromptEditor => match self.context_editor.as_ref() {
+                Some(context_editor) => context_editor.focus_handle(cx),
+                _ => cx.focus_handle(),
+            },
+            ActiveView::Configuration => match self.configuration.as_ref() {
+                Some(configuration) => configuration.focus_handle(cx),
+                _ => cx.focus_handle(),
+            },
        }
    }
 }
@@ -697,7 +600,7 @@ impl EventEmitter<PanelEvent> for AssistantPanel {}

 impl Panel for AssistantPanel {
    fn persistent_name() -> &'static str {
-        "AgentPanel"
+        "AssistantPanel2"
    }

    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
@@ -757,7 +660,7 @@ impl Panel for AssistantPanel {
    }

    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Agent Panel")
+        Some("Assistant Panel")
    }

    fn toggle_action(&self) -> Box<dyn Action> {
@@ -774,159 +677,71 @@ impl Panel for AssistantPanel {
 }

 impl AssistantPanel {
-    fn render_title_view(&self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        const LOADING_SUMMARY_PLACEHOLDER: &str = "Loading Summary…";
-
-        let content = match &self.active_view {
-            ActiveView::Thread {
-                change_title_editor,
-                ..
-            } => {
-                let active_thread = self.thread.read(cx);
-                let is_empty = active_thread.is_empty();
-
-                let summary = active_thread.summary(cx);
-
-                if is_empty {
-                    Label::new(Thread::DEFAULT_SUMMARY.clone())
-                        .truncate()
-                        .into_any_element()
-                } else if summary.is_none() {
-                    Label::new(LOADING_SUMMARY_PLACEHOLDER)
-                        .truncate()
-                        .into_any_element()
-                } else {
-                    change_title_editor.clone().into_any_element()
-                }
-            }
-            ActiveView::PromptEditor => {
-                let title = self
-                    .context_editor
-                    .as_ref()
-                    .map(|context_editor| {
-                        SharedString::from(context_editor.read(cx).title(cx).to_string())
-                    })
-                    .unwrap_or_else(|| SharedString::from(LOADING_SUMMARY_PLACEHOLDER));
-
-                Label::new(title).truncate().into_any_element()
-            }
-            ActiveView::History => Label::new("History").truncate().into_any_element(),
-            ActiveView::Configuration => Label::new("Settings").truncate().into_any_element(),
-        };
-
-        h_flex()
-            .key_context("TitleEditor")
-            .id("TitleEditor")
-            .pl_2()
-            .flex_grow()
-            .w_full()
-            .max_w_full()
-            .overflow_x_scroll()
-            .child(content)
-            .into_any()
-    }
-
-    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let active_thread = self.thread.read(cx);
-        let thread = active_thread.thread().read(cx);
-        let token_usage = thread.total_token_usage(cx);
-        let thread_id = thread.id().clone();
-
-        let is_generating = thread.is_generating();
-        let is_empty = active_thread.is_empty();
+    fn render_toolbar(
+        &self,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
+        let thread = self.thread.read(cx);
        let focus_handle = self.focus_handle(cx);

-        let show_token_count = match &self.active_view {
-            ActiveView::Thread { .. } => !is_empty,
-            ActiveView::PromptEditor => self.context_editor.is_some(),
-            _ => false,
+        let title = match self.active_view {
+            ActiveView::Thread => {
+                if thread.is_empty() {
+                    thread.summary_or_default(cx)
+                } else {
+                    thread
+                        .summary(cx)
+                        .unwrap_or_else(|| SharedString::from("Loading Summary…"))
+                }
+            }
+            ActiveView::PromptEditor => self
+                .context_editor
+                .as_ref()
+                .map(|context_editor| {
+                    SharedString::from(context_editor.read(cx).title(cx).to_string())
+                })
+                .unwrap_or_else(|| SharedString::from("Loading Summary…")),
+            ActiveView::History => "History".into(),
+            ActiveView::Configuration => "Settings".into(),
        };

        h_flex()
            .id("assistant-toolbar")
            .h(Tab::container_height(cx))
-            .max_w_full()
            .flex_none()
            .justify_between()
-            .gap_2()
+            .gap(DynamicSpacing::Base08.rems(cx))
            .bg(cx.theme().colors().tab_bar_background)
            .border_b_1()
            .border_color(cx.theme().colors().border)
-            .child(self.render_title_view(window, cx))
+            .child(
+                div()
+                    .id("title")
+                    .overflow_x_scroll()
+                    .px(DynamicSpacing::Base08.rems(cx))
+                    .child(Label::new(title).truncate()),
+            )
            .child(
                h_flex()
                    .h_full()
+                    .pl_2()
                    .gap_2()
-                    .when(show_token_count, |parent| match self.active_view {
-                        ActiveView::Thread { .. } => {
-                            if token_usage.total == 0 {
-                                return parent;
-                            }
-
-                            let token_color = match token_usage.ratio {
-                                TokenUsageRatio::Normal => Color::Muted,
-                                TokenUsageRatio::Warning => Color::Warning,
-                                TokenUsageRatio::Exceeded => Color::Error,
-                            };
-
-                            parent.child(
-                                h_flex()
-                                    .flex_shrink_0()
-                                    .gap_0p5()
-                                    .child(
-                                        Label::new(assistant_context_editor::humanize_token_count(
-                                            token_usage.total,
-                                        ))
-                                        .size(LabelSize::Small)
-                                        .color(token_color)
-                                        .map(|label| {
-                                            if is_generating {
-                                                label
-                                                    .with_animation(
-                                                        "used-tokens-label",
-                                                        Animation::new(Duration::from_secs(2))
-                                                            .repeat()
-                                                            .with_easing(pulsating_between(
-                                                                0.6, 1.,
-                                                            )),
-                                                        |label, delta| label.alpha(delta),
-                                                    )
-                                                    .into_any()
-                                            } else {
-                                                label.into_any_element()
-                                            }
-                                        }),
-                                    )
-                                    .child(
-                                        Label::new("/").size(LabelSize::Small).color(Color::Muted),
-                                    )
-                                    .child(
-                                        Label::new(assistant_context_editor::humanize_token_count(
-                                            token_usage.max,
-                                        ))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                    ),
-                            )
-                        }
-                        ActiveView::PromptEditor => {
-                            let Some(editor) = self.context_editor.as_ref() else {
-                                return parent;
-                            };
-                            let Some(element) = render_remaining_tokens(editor, cx) else {
-                                return parent;
-                            };
-                            parent.child(element)
-                        }
-                        _ => parent,
+                    .bg(cx.theme().colors().tab_bar_background)
+                    .children(if matches!(self.active_view, ActiveView::PromptEditor) {
+                        self.context_editor
+                            .as_ref()
+                            .and_then(|editor| render_remaining_tokens(editor, cx))
+                    } else {
+                        None
                    })
                    .child(
                        h_flex()
                            .h_full()
-                            .gap(DynamicSpacing::Base02.rems(cx))
                            .px(DynamicSpacing::Base08.rems(cx))
                            .border_l_1()
                            .border_color(cx.theme().colors().border)
+                            .gap(DynamicSpacing::Base02.rems(cx))
                            .child(
                                IconButton::new("new", IconName::Plus)
                                    .icon_size(IconSize::Small)
@@ -934,17 +749,14 @@ impl AssistantPanel {
                                    .tooltip(move |window, cx| {
                                        Tooltip::for_action_in(
                                            "New Thread",
-                                            &NewThread::default(),
+                                            &NewThread,
                                            &focus_handle,
                                            window,
                                            cx,
                                        )
                                    })
                                    .on_click(move |_event, window, cx| {
-                                        window.dispatch_action(
-                                            NewThread::default().boxed_clone(),
-                                            cx,
-                                        );
+                                        window.dispatch_action(NewThread.boxed_clone(), cx);
                                    }),
                            )
                            .child(
@@ -953,7 +765,7 @@ impl AssistantPanel {
                                        IconButton::new("new", IconName::Ellipsis)
                                            .icon_size(IconSize::Small)
                                            .style(ButtonStyle::Subtle),
-                                        Tooltip::text("Toggle Agent Menu"),
+                                        Tooltip::text("Toggle Assistant Menu"),
                                    )
                                    .anchor(Corner::TopRight)
                                    .with_handle(self.assistant_dropdown_menu_handle.clone())
@@ -963,23 +775,9 @@ impl AssistantPanel {
                                            cx,
                                            |menu, _window, _cx| {
                                                menu.action(
-                                                    "New Thread",
-                                                    Box::new(NewThread {
-                                                        from_thread_id: None,
-                                                    }),
-                                                )
-                                                .action(
                                                    "New Prompt Editor",
                                                    NewPromptEditor.boxed_clone(),
                                                )
-                                                .when(!is_empty, |menu| {
-                                                    menu.action(
-                                                        "Continue in New Thread",
-                                                        Box::new(NewThread {
-                                                            from_thread_id: Some(thread_id.clone()),
-                                                        }),
-                                                    )
-                                                })
                                                .separator()
                                                .action("History", OpenHistory.boxed_clone())
                                                .action("Settings", OpenConfiguration.boxed_clone())
@@ -1006,18 +804,16 @@ impl AssistantPanel {
    }

    fn configuration_error(&self, cx: &App) -> Option<ConfigurationError> {
-        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
+        let Some(provider) = LanguageModelRegistry::read_global(cx).active_provider() else {
            return Some(ConfigurationError::NoProvider);
        };

-        if !model.provider.is_authenticated(cx) {
+        if !provider.is_authenticated(cx) {
            return Some(ConfigurationError::ProviderNotAuthenticated);
        }

-        if model.provider.must_accept_terms(cx) {
-            return Some(ConfigurationError::ProviderPendingTermsAcceptance(
-                model.provider,
-            ));
+        if provider.must_accept_terms(cx) {
+            return Some(ConfigurationError::ProviderPendingTermsAcceptance(provider));
        }

        None
@@ -1027,161 +823,71 @@ impl AssistantPanel {
        &self,
        window: &mut Window,
        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    ) -> impl IntoElement + use<> {
        let recent_history = self
            .history_store
            .update(cx, |this, cx| this.recent_entries(6, cx));

+        let create_welcome_heading = || {
+            h_flex()
+                .w_full()
+                .child(Headline::new("Welcome to the Assistant Panel").size(HeadlineSize::Small))
+        };
+
        let configuration_error = self.configuration_error(cx);
        let no_error = configuration_error.is_none();
-        let focus_handle = self.focus_handle(cx);

        v_flex()
+            .p_1p5()
            .size_full()
-            .when(recent_history.is_empty(), |this| {
-                let configuration_error_ref = &configuration_error;
-                this.child(
-                    v_flex()
-                        .size_full()
-                        .max_w_80()
-                        .mx_auto()
-                        .justify_center()
-                        .items_center()
-                        .gap_1()
-                        .child(
-                            h_flex().child(
-                                Headline::new("Welcome to the Agent Panel")
-                            ),
-                        )
-                        .when(no_error, |parent| {
-                            parent
+            .justify_end()
+            .gap_1()
+            .map(|parent| {
+                match configuration_error {
+                    Some(ConfigurationError::ProviderNotAuthenticated)
+                    | Some(ConfigurationError::NoProvider) => {
+                        parent.child(
+                            v_flex()
+                                .px_1p5()
+                                .gap_0p5()
+                                .child(create_welcome_heading())
                                .child(
-                                    h_flex().child(
-                                        Label::new("Ask and build anything.")
-                                            .color(Color::Muted)
-                                            .mb_2p5(),
-                                    ),
-                                )
-                                .child(
-                                    Button::new("new-thread", "Start New Thread")
-                                        .icon(IconName::Plus)
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &NewThread::default(),
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(NewThread::default().boxed_clone(), cx)
-                                        }),
-                                )
-                                .child(
-                                    Button::new("context", "Add Context")
-                                        .icon(IconName::FileCode)
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &ToggleContextPicker,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(ToggleContextPicker.boxed_clone(), cx)
-                                        }),
-                                )
-                                .child(
-                                    Button::new("mode", "Switch Model")
-                                        .icon(IconName::DatabaseZap)
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &ToggleModelSelector,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(ToggleModelSelector.boxed_clone(), cx)
-                                        }),
-                                )
-                                .child(
-                                    Button::new("settings", "View Settings")
-                                        .icon(IconName::Settings)
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .full_width()
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &OpenConfiguration,
-                                            &focus_handle,
-                                            window,
-                                            cx,
-                                        ))
-                                        .on_click(|_event, window, cx| {
-                                            window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
-                                        }),
-                                )
-                        })
-                        .map(|parent| {
-                            match configuration_error_ref {
-                                Some(ConfigurationError::ProviderNotAuthenticated)
-                                | Some(ConfigurationError::NoProvider) => {
-                                    parent
-                                        .child(
-                                            h_flex().child(
-                                                Label::new("To start using the agent, configure at least one LLM provider.")
-                                                    .color(Color::Muted)
-                                                    .mb_2p5()
-                                            )
-                                        )
-                                        .child(
-                                            Button::new("settings", "Configure a Provider")
-                                                .icon(IconName::Settings)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .full_width()
-                                                .key_binding(KeyBinding::for_action_in(
-                                                    &OpenConfiguration,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                ))
-                                                .on_click(|_event, window, cx| {
-                                                    window.dispatch_action(OpenConfiguration.boxed_clone(), cx)
-                                                }),
-                                        )
-                                }
-                                Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
-                                    parent.children(
-                                        provider.render_accept_terms(
-                                            LanguageModelProviderTosView::ThreadFreshStart,
-                                            cx,
-                                        ),
+                                    Label::new(
+                                        "To start using the assistant, configure at least one LLM provider.",
                                    )
-                                }
-                                None => parent,
-                            }
-                        })
-                )
+                                    .color(Color::Muted),
+                                )
+                                .child(
+                                    h_flex().mt_1().w_full().child(
+                                        Button::new("open-configuration", "Configure a Provider")
+                                            .size(ButtonSize::Compact)
+                                            .icon(Some(IconName::Sliders))
+                                            .icon_size(IconSize::Small)
+                                            .icon_position(IconPosition::Start)
+                                            .on_click(cx.listener(|this, _, window, cx| {
+                                                this.open_configuration(window, cx);
+                                            })),
+                                    ),
+                                ),
+                        )
+                    }
+                    Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => parent
+                        .child(v_flex().px_1p5().gap_0p5().child(create_welcome_heading()).children(
+                            provider.render_accept_terms(
+                                LanguageModelProviderTosView::ThreadEmptyState,
+                                cx,
+                            ),
+                        )),
+                    None => parent,
+                }
+            })
+            .when(recent_history.is_empty() && no_error, |parent| {
+                parent.child(v_flex().gap_0p5().child(create_welcome_heading()).child(
+                    Label::new("Start typing to chat with your codebase").color(Color::Muted),
+                ))
            })
            .when(!recent_history.is_empty(), |parent| {
-                let focus_handle = focus_handle.clone();
-                let configuration_error_ref = &configuration_error;
-
                parent
-                    .p_1p5()
-                    .justify_end()
-                    .gap_1()
                    .child(
                        h_flex()
                            .pl_1p5()
@@ -1199,94 +905,32 @@ impl AssistantPanel {
                                Button::new("view-history", "View All")
                                    .style(ButtonStyle::Subtle)
                                    .label_size(LabelSize::Small)
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &OpenHistory,
-                                            &self.focus_handle(cx),
-                                            window,
-                                            cx,
-                                        ).map(|kb| kb.size(rems_from_px(12.))),
-                                    )
+                                    .key_binding(KeyBinding::for_action_in(
+                                        &OpenHistory,
+                                        &self.focus_handle(cx),
+                                        window,
+                                        cx,
+                                    ))
                                    .on_click(move |_event, window, cx| {
                                        window.dispatch_action(OpenHistory.boxed_clone(), cx);
                                    }),
                            ),
                    )
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .children(
-                                recent_history.into_iter().map(|entry| {
-                                    // TODO: Add keyboard navigation.
-                                    match entry {
-                                        HistoryEntry::Thread(thread) => {
-                                            PastThread::new(thread, cx.entity().downgrade(), false, vec![])
-                                                .into_any_element()
-                                        }
-                                        HistoryEntry::Context(context) => {
-                                            PastContext::new(context, cx.entity().downgrade(), false, vec![])
-                                                .into_any_element()
-                                        }
-                                    }
-                                }),
-                            )
-                    )
-                    .map(|parent| {
-                        match configuration_error_ref {
-                            Some(ConfigurationError::ProviderNotAuthenticated)
-                            | Some(ConfigurationError::NoProvider) => {
-                                parent
-                                    .child(
-                                        Banner::new()
-                                            .severity(ui::Severity::Warning)
-                                            .children(
-                                                Label::new(
-                                                    "Configure at least one LLM provider to start using the panel.",
-                                                )
-                                                .size(LabelSize::Small),
-                                            )
-                                            .action_slot(
-                                                Button::new("settings", "Configure Provider")
-                                                    .style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                                    .label_size(LabelSize::Small)
-                                                    .key_binding(
-                                                        KeyBinding::for_action_in(
-                                                            &OpenConfiguration,
-                                                            &focus_handle,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                                    )
-                                                    .on_click(|_event, window, cx| {
-                                                        window.dispatch_action(
-                                                            OpenConfiguration.boxed_clone(),
-                                                            cx,
-                                                        )
-                                                    }),
-                                            ),
-                                    )
+                    .child(v_flex().gap_1().children(
+                        recent_history.into_iter().map(|entry| {
+                            // TODO: Add keyboard navigation.
+                            match entry {
+                                HistoryEntry::Thread(thread) => {
+                                    PastThread::new(thread, cx.entity().downgrade(), false)
+                                        .into_any_element()
+                                }
+                                HistoryEntry::Context(context) => {
+                                    PastContext::new(context, cx.entity().downgrade(), false)
+                                        .into_any_element()
+                                }
                            }
-                            Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
-                                parent
-                                    .child(
-                                        Banner::new()
-                                            .severity(ui::Severity::Warning)
-                                            .children(
-                                                h_flex()
-                                                    .w_full()
-                                                    .children(
-                                                        provider.render_accept_terms(
-                                                            LanguageModelProviderTosView::ThreadtEmptyState,
-                                                            cx,
-                                                        ),
-                                                    ),
-                                            ),
-                                    )
-                            }
-                            None => parent,
-                        }
-                    })
+                        }),
+                    ))
            })
    }

@@ -1451,7 +1095,7 @@ impl AssistantPanel {

    fn key_context(&self) -> KeyContext {
        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("AgentPanel");
+        key_context.add("AssistantPanel2");
        if matches!(self.active_view, ActiveView::PromptEditor) {
            key_context.add("prompt_editor");
        }
@@ -1466,8 +1110,8 @@ impl Render for AssistantPanel {
            .justify_between()
            .size_full()
            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|this, action: &NewThread, window, cx| {
-                this.new_thread(action, window, cx);
+            .on_action(cx.listener(|this, _: &NewThread, window, cx| {
+                this.new_thread(window, cx);
            }))
            .on_action(cx.listener(|this, _: &OpenHistory, window, cx| {
                this.open_history(window, cx);
@@ -1477,10 +1121,10 @@ impl Render for AssistantPanel {
            }))
            .on_action(cx.listener(Self::open_active_thread_as_markdown))
            .on_action(cx.listener(Self::deploy_prompt_library))
-            .on_action(cx.listener(Self::open_agent_diff))
+            .on_action(cx.listener(Self::open_assistant_diff))
            .child(self.render_toolbar(window, cx))
            .map(|parent| match self.active_view {
-                ActiveView::Thread { .. } => parent
+                ActiveView::Thread => parent
                    .child(self.render_active_thread_or_empty_state(window, cx))
                    .child(h_flex().child(self.message_editor.clone()))
                    .children(self.render_last_error(cx)),
@@ -1547,7 +1191,7 @@ impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
        cx: &mut Context<Workspace>,
    ) -> Task<Result<()>> {
        let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
-            return Task::ready(Err(anyhow!("Agent panel not found")));
+            return Task::ready(Err(anyhow!("Assistant panel not found")));
        };

        panel.update(cx, |panel, cx| {
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -5,12 +5,12 @@ use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use futures::{SinkExt, Stream, StreamExt, channel::mpsc, future::LocalBoxFuture, join};
+use futures::{channel::mpsc, future::LocalBoxFuture, join, SinkExt, Stream, StreamExt};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
-use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
+use language::{line_diff, Buffer, IndentKind, Point, TransactionId};
 use language_model::{
-    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelTextStream, Role, report_assistant_event,
+    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelTextStream, Role,
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
@@ -156,9 +156,8 @@ impl BufferCodegen {
        }

        let primary_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .context("no active model")?
-            .model;
+            .active_model()
+            .context("no active model")?;

        for (model, alternative) in iter::once(primary_model)
            .chain(alternative_models)
@@ -415,11 +414,7 @@ impl CodegenAlternative {
        };

        if let Some(context_store) = &self.context_store {
-            attach_context_to_message(
-                &mut request_message,
-                context_store.read(cx).context().iter(),
-                cx,
-            );
+            attach_context_to_message(&mut request_message, context_store.read(cx).snapshot(cx));
        }

        request_message.content.push(prompt.into());
@@ -681,10 +676,13 @@ impl CodegenAlternative {
                .update(cx, |this, cx| {
                    this.message_id = message_id;
                    this.last_equal_ranges.clear();
-                    if let Err(error) = result {
-                        this.status = CodegenStatus::Error(error);
-                    } else {
-                        this.status = CodegenStatus::Done;
+                    match result {
+                        Err(error) => {
+                            this.status = CodegenStatus::Error(error);
+                        }
+                        _ => {
+                            this.status = CodegenStatus::Done;
+                        }
                    }
                    this.elapsed_time = Some(elapsed_time);
                    this.completion = Some(completion.lock().clone());
@@ -1033,14 +1031,14 @@ impl Diff {
 mod tests {
    use super::*;
    use futures::{
-        Stream,
        stream::{self},
+        Stream,
    };
    use gpui::TestAppContext;
    use indoc::indoc;
    use language::{
-        Buffer, Language, LanguageConfig, LanguageMatcher, Point, language_settings,
-        tree_sitter_rust,
+        language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
+        Point,
    };
    use language_model::{LanguageModelRegistry, TokenUsage};
    use rand::prelude::*;
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -0,0 +1,381 @@
+use std::ops::Range;
+
+use file_icons::FileIcons;
+use gpui::{App, Entity, SharedString};
+use language::Buffer;
+use language_model::{LanguageModelRequestMessage, MessageContent};
+use project::ProjectPath;
+use serde::{Deserialize, Serialize};
+use text::{Anchor, BufferId};
+use ui::IconName;
+use util::post_inc;
+
+use crate::{context_store::buffer_path_log_err, thread::Thread};
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
+pub struct ContextId(pub(crate) usize);
+
+impl ContextId {
+    pub fn post_inc(&mut self) -> Self {
+        Self(post_inc(&mut self.0))
+    }
+}
+
+/// Some context attached to a message in a thread.
+#[derive(Debug, Clone)]
+pub struct ContextSnapshot {
+    pub id: ContextId,
+    pub name: SharedString,
+    pub parent: Option<SharedString>,
+    pub tooltip: Option<SharedString>,
+    pub icon_path: Option<SharedString>,
+    pub kind: ContextKind,
+    /// Joining these strings separated by \n yields text for model. Not refreshed by `snapshot`.
+    pub text: Box<[SharedString]>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ContextKind {
+    File,
+    Directory,
+    Symbol,
+    FetchedUrl,
+    Thread,
+}
+
+impl ContextKind {
+    pub fn icon(&self) -> IconName {
+        match self {
+            ContextKind::File => IconName::File,
+            ContextKind::Directory => IconName::Folder,
+            ContextKind::Symbol => IconName::Code,
+            ContextKind::FetchedUrl => IconName::Globe,
+            ContextKind::Thread => IconName::MessageBubbles,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum AssistantContext {
+    File(FileContext),
+    Directory(DirectoryContext),
+    Symbol(SymbolContext),
+    FetchedUrl(FetchedUrlContext),
+    Thread(ThreadContext),
+}
+
+impl AssistantContext {
+    pub fn id(&self) -> ContextId {
+        match self {
+            Self::File(file) => file.id,
+            Self::Directory(directory) => directory.snapshot.id,
+            Self::Symbol(symbol) => symbol.id,
+            Self::FetchedUrl(url) => url.id,
+            Self::Thread(thread) => thread.id,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct FileContext {
+    pub id: ContextId,
+    pub context_buffer: ContextBuffer,
+}
+
+#[derive(Debug)]
+pub struct DirectoryContext {
+    pub path: ProjectPath,
+    pub context_buffers: Vec<ContextBuffer>,
+    pub snapshot: ContextSnapshot,
+}
+
+#[derive(Debug)]
+pub struct SymbolContext {
+    pub id: ContextId,
+    pub context_symbol: ContextSymbol,
+}
+
+#[derive(Debug)]
+pub struct FetchedUrlContext {
+    pub id: ContextId,
+    pub url: SharedString,
+    pub text: SharedString,
+}
+
+// TODO: Model<Thread> holds onto the thread even if the thread is deleted. Can either handle this
+// explicitly or have a WeakModel<Thread> and remove during snapshot.
+
+#[derive(Debug)]
+pub struct ThreadContext {
+    pub id: ContextId,
+    pub thread: Entity<Thread>,
+    pub text: SharedString,
+}
+
+// TODO: Model<Buffer> holds onto the buffer even if the file is deleted and closed. Should remove
+// the context from the message editor in this case.
+
+#[derive(Debug, Clone)]
+pub struct ContextBuffer {
+    pub id: BufferId,
+    pub buffer: Entity<Buffer>,
+    pub version: clock::Global,
+    pub text: SharedString,
+}
+
+#[derive(Debug, Clone)]
+pub struct ContextSymbol {
+    pub id: ContextSymbolId,
+    pub buffer: Entity<Buffer>,
+    pub buffer_version: clock::Global,
+    /// The range that the symbol encloses, e.g. for function symbol, this will
+    /// include not only the signature, but also the body
+    pub enclosing_range: Range<Anchor>,
+    pub text: SharedString,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ContextSymbolId {
+    pub path: ProjectPath,
+    pub name: SharedString,
+    pub range: Range<Anchor>,
+}
+
+impl AssistantContext {
+    pub fn snapshot(&self, cx: &App) -> Option<ContextSnapshot> {
+        match &self {
+            Self::File(file_context) => file_context.snapshot(cx),
+            Self::Directory(directory_context) => Some(directory_context.snapshot()),
+            Self::Symbol(symbol_context) => symbol_context.snapshot(cx),
+            Self::FetchedUrl(fetched_url_context) => Some(fetched_url_context.snapshot()),
+            Self::Thread(thread_context) => Some(thread_context.snapshot(cx)),
+        }
+    }
+}
+
+impl FileContext {
+    pub fn snapshot(&self, cx: &App) -> Option<ContextSnapshot> {
+        let buffer = self.context_buffer.buffer.read(cx);
+        let path = buffer_path_log_err(buffer)?;
+        let full_path: SharedString = path.to_string_lossy().into_owned().into();
+        let name = match path.file_name() {
+            Some(name) => name.to_string_lossy().into_owned().into(),
+            None => full_path.clone(),
+        };
+        let parent = path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|p| p.to_string_lossy().into_owned().into());
+
+        let icon_path = FileIcons::get_icon(&path, cx);
+
+        Some(ContextSnapshot {
+            id: self.id,
+            name,
+            parent,
+            tooltip: Some(full_path),
+            icon_path,
+            kind: ContextKind::File,
+            text: Box::new([self.context_buffer.text.clone()]),
+        })
+    }
+}
+
+impl DirectoryContext {
+    pub fn new(
+        id: ContextId,
+        project_path: ProjectPath,
+        context_buffers: Vec<ContextBuffer>,
+    ) -> DirectoryContext {
+        let full_path: SharedString = project_path.path.to_string_lossy().into_owned().into();
+
+        let name = match project_path.path.file_name() {
+            Some(name) => name.to_string_lossy().into_owned().into(),
+            None => full_path.clone(),
+        };
+
+        let parent = project_path
+            .path
+            .parent()
+            .and_then(|p| p.file_name())
+            .map(|p| p.to_string_lossy().into_owned().into());
+
+        // TODO: include directory path in text?
+        let text = context_buffers
+            .iter()
+            .map(|b| b.text.clone())
+            .collect::<Vec<_>>()
+            .into();
+
+        DirectoryContext {
+            path: project_path,
+            context_buffers,
+            snapshot: ContextSnapshot {
+                id,
+                name,
+                parent,
+                tooltip: Some(full_path),
+                icon_path: None,
+                kind: ContextKind::Directory,
+                text,
+            },
+        }
+    }
+
+    pub fn snapshot(&self) -> ContextSnapshot {
+        self.snapshot.clone()
+    }
+}
+
+impl SymbolContext {
+    pub fn snapshot(&self, cx: &App) -> Option<ContextSnapshot> {
+        let buffer = self.context_symbol.buffer.read(cx);
+        let name = self.context_symbol.id.name.clone();
+        let path = buffer_path_log_err(buffer)?
+            .to_string_lossy()
+            .into_owned()
+            .into();
+
+        Some(ContextSnapshot {
+            id: self.id,
+            name,
+            parent: Some(path),
+            tooltip: None,
+            icon_path: None,
+            kind: ContextKind::Symbol,
+            text: Box::new([self.context_symbol.text.clone()]),
+        })
+    }
+}
+
+impl FetchedUrlContext {
+    pub fn snapshot(&self) -> ContextSnapshot {
+        ContextSnapshot {
+            id: self.id,
+            name: self.url.clone(),
+            parent: None,
+            tooltip: None,
+            icon_path: None,
+            kind: ContextKind::FetchedUrl,
+            text: Box::new([self.text.clone()]),
+        }
+    }
+}
+
+impl ThreadContext {
+    pub fn snapshot(&self, cx: &App) -> ContextSnapshot {
+        let thread = self.thread.read(cx);
+        ContextSnapshot {
+            id: self.id,
+            name: thread.summary().unwrap_or("New thread".into()),
+            parent: None,
+            tooltip: None,
+            icon_path: None,
+            kind: ContextKind::Thread,
+            text: Box::new([self.text.clone()]),
+        }
+    }
+}
+
+pub fn attach_context_to_message(
+    message: &mut LanguageModelRequestMessage,
+    contexts: impl Iterator<Item = ContextSnapshot>,
+) {
+    let mut file_context = Vec::new();
+    let mut directory_context = Vec::new();
+    let mut symbol_context = Vec::new();
+    let mut fetch_context = Vec::new();
+    let mut thread_context = Vec::new();
+
+    let mut capacity = 0;
+    for context in contexts {
+        capacity += context.text.len();
+        match context.kind {
+            ContextKind::File => file_context.push(context),
+            ContextKind::Directory => directory_context.push(context),
+            ContextKind::Symbol => symbol_context.push(context),
+            ContextKind::FetchedUrl => fetch_context.push(context),
+            ContextKind::Thread => thread_context.push(context),
+        }
+    }
+    if !file_context.is_empty() {
+        capacity += 1;
+    }
+    if !directory_context.is_empty() {
+        capacity += 1;
+    }
+    if !symbol_context.is_empty() {
+        capacity += 1;
+    }
+    if !fetch_context.is_empty() {
+        capacity += 1 + fetch_context.len();
+    }
+    if !thread_context.is_empty() {
+        capacity += 1 + thread_context.len();
+    }
+    if capacity == 0 {
+        return;
+    }
+
+    let mut context_chunks = Vec::with_capacity(capacity);
+
+    if !file_context.is_empty() {
+        context_chunks.push("The following files are available:\n");
+        for context in &file_context {
+            for chunk in &context.text {
+                context_chunks.push(&chunk);
+            }
+        }
+    }
+
+    if !directory_context.is_empty() {
+        context_chunks.push("The following directories are available:\n");
+        for context in &directory_context {
+            for chunk in &context.text {
+                context_chunks.push(&chunk);
+            }
+        }
+    }
+
+    if !symbol_context.is_empty() {
+        context_chunks.push("The following symbols are available:\n");
+        for context in &symbol_context {
+            for chunk in &context.text {
+                context_chunks.push(&chunk);
+            }
+        }
+    }
+
+    if !fetch_context.is_empty() {
+        context_chunks.push("The following fetched results are available:\n");
+        for context in &fetch_context {
+            context_chunks.push(&context.name);
+            for chunk in &context.text {
+                context_chunks.push(&chunk);
+            }
+        }
+    }
+
+    if !thread_context.is_empty() {
+        context_chunks.push("The following previous conversation threads are available:\n");
+        for context in &thread_context {
+            context_chunks.push(&context.name);
+            for chunk in &context.text {
+                context_chunks.push(&chunk);
+            }
+        }
+    }
+
+    debug_assert!(
+        context_chunks.len() == capacity,
+        "attach_context_message calculated capacity of {}, but length was {}",
+        capacity,
+        context_chunks.len()
+    );
+
+    if !context_chunks.is_empty() {
+        message
+            .content
+            .push(MessageContent::Text(context_chunks.join("\n")));
+    }
+}
--- a/crates/assistant2/src/context_picker.rs
+++ b/crates/assistant2/src/context_picker.rs
@@ -8,7 +8,7 @@ use std::ops::Range;
 use std::path::PathBuf;
 use std::sync::Arc;

-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use editor::display_map::{Crease, FoldId};
 use editor::{Anchor, AnchorRangeExt as _, Editor, ExcerptId, FoldPlaceholder, ToOffset};
 use file_context_picker::render_file_context_entry;
@@ -16,22 +16,21 @@ use gpui::{
    App, DismissEvent, Empty, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity,
 };
 use multi_buffer::MultiBufferRow;
-use project::{Entry, ProjectPath};
+use project::ProjectPath;
 use symbol_context_picker::SymbolContextPicker;
-use thread_context_picker::{ThreadContextEntry, render_thread_context_entry};
+use thread_context_picker::{render_thread_context_entry, ThreadContextEntry};
 use ui::{
-    ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
+    prelude::*, ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor,
 };
-use workspace::{Workspace, notifications::NotifyResultExt};
+use workspace::{notifications::NotifyResultExt, Workspace};

-use crate::AssistantPanel;
 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::thread_context_picker::ThreadContextPicker;
 use crate::context_store::ContextStore;
-use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;
+use crate::AssistantPanel;

 #[derive(Debug, Clone, Copy)]
 pub enum ConfirmBehavior {
@@ -76,7 +75,7 @@ impl ContextPickerMode {
            Self::File => "Files & Directories",
            Self::Symbol => "Symbols",
            Self::Fetch => "Fetch",
-            Self::Thread => "Threads",
+            Self::Thread => "Thread",
        }
    }

@@ -360,15 +359,73 @@ impl ContextPicker {
    }

    fn recent_entries(&self, cx: &mut App) -> Vec<RecentEntry> {
-        let Some(workspace) = self.workspace.upgrade() else {
+        let Some(workspace) = self.workspace.upgrade().map(|w| w.read(cx)) else {
            return vec![];
        };

-        let Some(context_store) = self.context_store.upgrade() else {
+        let Some(context_store) = self.context_store.upgrade().map(|cs| cs.read(cx)) else {
            return vec![];
        };

-        recent_context_picker_entries(context_store, self.thread_store.clone(), workspace, cx)
+        let mut recent = Vec::with_capacity(6);
+
+        let mut current_files = context_store.file_paths(cx);
+
+        if let Some(active_path) = active_singleton_buffer_path(&workspace, cx) {
+            current_files.insert(active_path);
+        }
+
+        let project = workspace.project().read(cx);
+
+        recent.extend(
+            workspace
+                .recent_navigation_history_iter(cx)
+                .filter(|(path, _)| !current_files.contains(&path.path.to_path_buf()))
+                .take(4)
+                .filter_map(|(project_path, _)| {
+                    project
+                        .worktree_for_id(project_path.worktree_id, cx)
+                        .map(|worktree| RecentEntry::File {
+                            project_path,
+                            path_prefix: worktree.read(cx).root_name().into(),
+                        })
+                }),
+        );
+
+        let mut current_threads = context_store.thread_ids();
+
+        if let Some(active_thread) = workspace
+            .panel::<AssistantPanel>(cx)
+            .map(|panel| panel.read(cx).active_thread(cx))
+        {
+            current_threads.insert(active_thread.read(cx).id().clone());
+        }
+
+        let Some(thread_store) = self
+            .thread_store
+            .as_ref()
+            .and_then(|thread_store| thread_store.upgrade())
+        else {
+            return recent;
+        };
+
+        thread_store.update(cx, |thread_store, _cx| {
+            recent.extend(
+                thread_store
+                    .threads()
+                    .into_iter()
+                    .filter(|thread| !current_threads.contains(&thread.id))
+                    .take(2)
+                    .map(|thread| {
+                        RecentEntry::Thread(ThreadContextEntry {
+                            id: thread.id,
+                            summary: thread.summary,
+                        })
+                    }),
+            )
+        });
+
+        recent
    }
 }

@@ -422,6 +479,16 @@ fn supported_context_picker_modes(
    modes
 }

+fn active_singleton_buffer_path(workspace: &Workspace, cx: &App) -> Option<PathBuf> {
+    let active_item = workspace.active_item(cx)?;
+
+    let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
+    let buffer = editor.buffer().read(cx).as_singleton()?;
+
+    let path = buffer.read(cx).file()?.path().to_path_buf();
+    Some(path)
+}
+
 fn recent_context_picker_entries(
    context_store: Entity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
@@ -430,8 +497,14 @@ fn recent_context_picker_entries(
 ) -> Vec<RecentEntry> {
    let mut recent = Vec::with_capacity(6);

-    let current_files = context_store.read(cx).file_paths(cx);
+    let mut current_files = context_store.read(cx).file_paths(cx);
+
    let workspace = workspace.read(cx);
+
+    if let Some(active_path) = active_singleton_buffer_path(workspace, cx) {
+        current_files.insert(active_path);
+    }
+
    let project = workspace.project().read(cx);

    recent.extend(
@@ -495,7 +568,6 @@ pub(crate) fn insert_crease_for_mention(
            return;
        };

-        let start = start.bias_right(&snapshot);
        let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);

        let placeholder = FoldPlaceholder {
@@ -605,93 +677,3 @@ fn fold_toggle(
            .into_any_element()
    }
 }
-
-pub enum MentionLink {
-    File(ProjectPath, Entry),
-    Symbol(ProjectPath, String),
-    Fetch(String),
-    Thread(ThreadId),
-}
-
-impl MentionLink {
-    const FILE: &str = "@file";
-    const SYMBOL: &str = "@symbol";
-    const THREAD: &str = "@thread";
-    const FETCH: &str = "@fetch";
-
-    const SEPARATOR: &str = ":";
-
-    pub fn is_valid(url: &str) -> bool {
-        url.starts_with(Self::FILE)
-            || url.starts_with(Self::SYMBOL)
-            || url.starts_with(Self::FETCH)
-            || url.starts_with(Self::THREAD)
-    }
-
-    pub fn for_file(file_name: &str, full_path: &str) -> String {
-        format!("[@{}]({}:{})", file_name, Self::FILE, full_path)
-    }
-
-    pub fn for_symbol(symbol_name: &str, full_path: &str) -> String {
-        format!(
-            "[@{}]({}:{}:{})",
-            symbol_name,
-            Self::SYMBOL,
-            full_path,
-            symbol_name
-        )
-    }
-
-    pub fn for_fetch(url: &str) -> String {
-        format!("[@{}]({}:{})", url, Self::FETCH, url)
-    }
-
-    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> {
-        fn extract_project_path_from_link(
-            path: &str,
-            workspace: &Entity<Workspace>,
-            cx: &App,
-        ) -> Option<ProjectPath> {
-            let path = PathBuf::from(path);
-            let worktree_name = path.iter().next()?;
-            let path: PathBuf = path.iter().skip(1).collect();
-            let worktree_id = workspace
-                .read(cx)
-                .visible_worktrees(cx)
-                .find(|worktree| worktree.read(cx).root_name() == worktree_name)
-                .map(|worktree| worktree.read(cx).id())?;
-            Some(ProjectPath {
-                worktree_id,
-                path: path.into(),
-            })
-        }
-
-        let (prefix, argument) = link.split_once(Self::SEPARATOR)?;
-        match prefix {
-            Self::FILE => {
-                let project_path = extract_project_path_from_link(argument, workspace, cx)?;
-                let entry = workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .entry_for_path(&project_path, cx)?;
-                Some(MentionLink::File(project_path, entry))
-            }
-            Self::SYMBOL => {
-                let (path, symbol) = argument.split_once(Self::SEPARATOR)?;
-                let project_path = extract_project_path_from_link(path, workspace, cx)?;
-                Some(MentionLink::Symbol(project_path, symbol.to_string()))
-            }
-            Self::THREAD => {
-                let thread_id = ThreadId::from(argument);
-                Some(MentionLink::Thread(thread_id))
-            }
-            Self::FETCH => Some(MentionLink::Fetch(argument.to_string())),
-            _ => None,
-        }
-    }
-}
--- a/crates/assistant2/src/context_picker/completion_provider.rs
+++ b/crates/assistant2/src/context_picker/completion_provider.rs
@@ -2,8 +2,8 @@ use std::cell::RefCell;
 use std::ops::Range;
 use std::path::Path;
 use std::rc::Rc;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;

 use anyhow::Result;
 use editor::{CompletionProvider, Editor, ExcerptId};
@@ -24,9 +24,7 @@ use crate::thread_store::ThreadStore;

 use super::fetch_context_picker::fetch_url_content;
 use super::thread_context_picker::ThreadContextEntry;
-use super::{
-    ContextPickerMode, MentionLink, recent_context_picker_entries, supported_context_picker_modes,
-};
+use super::{recent_context_picker_entries, supported_context_picker_modes, ContextPickerMode};

 pub struct ContextPickerCompletionProvider {
    workspace: WeakEntity<Workspace>,
@@ -156,7 +154,7 @@ impl ContextPickerCompletionProvider {
        } else {
            IconName::MessageBubbles
        };
-        let new_text = MentionLink::for_thread(&thread_entry);
+        let new_text = format!("@thread {}", thread_entry.summary);
        let new_text_len = new_text.len();
        Completion {
            old_range: source_range.clone(),
@@ -200,7 +198,7 @@ impl ContextPickerCompletionProvider {
        context_store: Entity<ContextStore>,
        http_client: Arc<HttpClientWithUrl>,
    ) -> Completion {
-        let new_text = MentionLink::for_fetch(&url_to_fetch);
+        let new_text = format!("@fetch {}", url_to_fetch);
        let new_text_len = new_text.len();
        Completion {
            old_range: source_range.clone(),
@@ -281,7 +279,7 @@ impl ContextPickerCompletionProvider {
            crease_icon_path.clone()
        };

-        let new_text = MentionLink::for_file(&file_name, &full_path);
+        let new_text = format!("@file {}", full_path);
        let new_text_len = new_text.len();
        Completion {
            old_range: source_range.clone(),
@@ -328,22 +326,17 @@ impl ContextPickerCompletionProvider {
            .read(cx)
            .root_name();

-        let (file_name, directory) = super::file_context_picker::extract_file_name_and_directory(
+        let (file_name, _) = super::file_context_picker::extract_file_name_and_directory(
            &symbol.path.path,
            path_prefix,
        );
-        let full_path = if let Some(directory) = directory {
-            format!("{}{}", directory, file_name)
-        } else {
-            file_name.to_string()
-        };

        let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
        let mut label = CodeLabel::plain(symbol.name.clone(), None);
        label.push_str(" ", None);
        label.push_str(&file_name, comment_id);

-        let new_text = MentionLink::for_symbol(&symbol.name, &full_path);
+        let new_text = format!("@symbol {}:{}", file_name, symbol.name);
        let new_text_len = new_text.len();
        Some(Completion {
            old_range: source_range.clone(),
@@ -407,7 +400,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        };

        let snapshot = buffer.read(cx).snapshot();
-        let source_range = snapshot.anchor_before(state.source_range.start)
+        let source_range = snapshot.anchor_after(state.source_range.start)
            ..snapshot.anchor_before(state.source_range.end);

        let thread_store = self.thread_store.clone();
@@ -588,15 +581,14 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        let line_start = Point::new(position.row, 0);
        let offset_to_line = buffer.point_to_offset(line_start);
        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            MentionCompletion::try_parse(line, offset_to_line)
+        match lines.next() {
+            Some(line) => MentionCompletion::try_parse(line, offset_to_line)
                .map(|completion| {
                    completion.source_range.start <= offset_to_line + position.column as usize
                        && completion.source_range.end >= offset_to_line + position.column as usize
                })
-                .unwrap_or(false)
-        } else {
-            false
+                .unwrap_or(false),
+            _ => false,
        }
    }

@@ -653,15 +645,6 @@ impl MentionCompletion {
        if last_mention_start >= line.len() {
            return Some(Self::default());
        }
-        if last_mention_start > 0
-            && line
-                .chars()
-                .nth(last_mention_start - 1)
-                .map_or(false, |c| !c.is_whitespace())
-        {
-            return None;
-        }
-
        let rest_of_line = &line[last_mention_start + 1..];

        let mut mode = None;
@@ -762,8 +745,6 @@ mod tests {
                argument: Some("main.rs".to_string()),
            })
        );
-
-        assert_eq!(MentionCompletion::try_parse("test@", 0), None);
    }

    #[gpui::test]
@@ -862,7 +843,7 @@ mod tests {
                .expect("Opened test file wasn't an editor")
        });

-        let context_store = cx.new(|_| ContextStore::new(workspace.downgrade(), None));
+        let context_store = cx.new(|_| ContextStore::new(workspace.downgrade()));

        let editor_entity = editor.downgrade();
        editor.update_in(&mut cx, |editor, window, cx| {
@@ -890,10 +871,10 @@ mod tests {
            assert_eq!(
                current_completion_labels(editor),
                &[
-                    "editor dir/",
                    "seven.txt dir/b/",
                    "six.txt dir/b/",
                    "five.txt dir/b/",
+                    "four.txt dir/a/",
                    "Files & Directories",
                    "Symbols",
                    "Fetch"
@@ -932,50 +913,44 @@ mod tests {
        });

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt)",);
+            assert_eq!(editor.text(cx), "Lorem @file dir/a/one.txt",);
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 37)]
+                vec![Point::new(0, 6)..Point::new(0, 25)]
            );
        });

        cx.simulate_input(" ");

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt) ",);
+            assert_eq!(editor.text(cx), "Lorem @file dir/a/one.txt ",);
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 37)]
+                vec![Point::new(0, 6)..Point::new(0, 25)]
            );
        });

        cx.simulate_input("Ipsum ");

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum ",
-            );
+            assert_eq!(editor.text(cx), "Lorem @file dir/a/one.txt Ipsum ",);
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 37)]
+                vec![Point::new(0, 6)..Point::new(0, 25)]
            );
        });

        cx.simulate_input("@file ");

        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum @file ",
-            );
+            assert_eq!(editor.text(cx), "Lorem @file dir/a/one.txt Ipsum @file ",);
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
-                vec![Point::new(0, 6)..Point::new(0, 37)]
+                vec![Point::new(0, 6)..Point::new(0, 25)]
            );
        });

@@ -988,14 +963,14 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@editor](@file:dir/editor)"
+                "Lorem @file dir/a/one.txt Ipsum @file dir/b/seven.txt"
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
                vec![
-                    Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 44)..Point::new(0, 71)
+                    Point::new(0, 6)..Point::new(0, 25),
+                    Point::new(0, 32)..Point::new(0, 53)
                ]
            );
        });
@@ -1005,14 +980,14 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@editor](@file:dir/editor)\n@"
+                "Lorem @file dir/a/one.txt Ipsum @file dir/b/seven.txt\n@"
            );
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
                vec![
-                    Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 44)..Point::new(0, 71)
+                    Point::new(0, 6)..Point::new(0, 25),
+                    Point::new(0, 32)..Point::new(0, 53)
                ]
            );
        });
@@ -1026,15 +1001,15 @@ mod tests {
        editor.update(&mut cx, |editor, cx| {
            assert_eq!(
                editor.text(cx),
-                "Lorem [@one.txt](@file:dir/a/one.txt) Ipsum [@editor](@file:dir/editor)\n[@seven.txt](@file:dir/b/seven.txt)"
+                "Lorem @file dir/a/one.txt Ipsum @file dir/b/seven.txt\n@file dir/b/six.txt"
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
                crease_ranges(editor, cx),
                vec![
-                    Point::new(0, 6)..Point::new(0, 37),
-                    Point::new(0, 44)..Point::new(0, 71),
-                    Point::new(1, 0)..Point::new(1, 35)
+                    Point::new(0, 6)..Point::new(0, 25),
+                    Point::new(0, 32)..Point::new(0, 53),
+                    Point::new(1, 0)..Point::new(1, 19)
                ]
            );
        });
--- a/crates/assistant2/src/context_picker/fetch_context_picker.rs
+++ b/crates/assistant2/src/context_picker/fetch_context_picker.rs
@@ -2,13 +2,13 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;

-use anyhow::{Context as _, Result, bail};
+use anyhow::{bail, Context as _, Result};
 use futures::AsyncReadExt as _;
 use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
-use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
+use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler};
 use http_client::{AsyncBody, HttpClientWithUrl};
 use picker::{Picker, PickerDelegate};
-use ui::{Context, ListItem, Window, prelude::*};
+use ui::{prelude::*, Context, ListItem, Window};
 use workspace::Workspace;

 use crate::context_picker::{ConfirmBehavior, ContextPicker};
@@ -163,7 +163,11 @@ impl PickerDelegate for FetchContextPickerDelegate {
    type ListItem = ListItem;

    fn match_count(&self) -> usize {
-        if self.url.is_empty() { 0 } else { 1 }
+        if self.url.is_empty() {
+            0
+        } else {
+            1
+        }
    }

    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;

 use file_icons::FileIcons;
 use fuzzy::PathMatch;
@@ -9,9 +9,9 @@ use gpui::{
 };
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
-use ui::{ListItem, Tooltip, prelude::*};
+use ui::{prelude::*, ListItem, Tooltip};
 use util::ResultExt as _;
-use workspace::{Workspace, notifications::NotifyResultExt};
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::{ContextStore, FileInclusion};
@@ -321,7 +321,10 @@ pub fn render_file_context_entry(

    let added = context_store.upgrade().and_then(|context_store| {
        if is_directory {
-            context_store.read(cx).includes_directory(path)
+            context_store
+                .read(cx)
+                .includes_directory(path)
+                .map(FileInclusion::Direct)
        } else {
            context_store.read(cx).will_include_file_path(path, cx)
        }
--- a/crates/assistant2/src/context_picker/symbol_context_picker.rs
+++ b/crates/assistant2/src/context_picker/symbol_context_picker.rs
@@ -1,6 +1,6 @@
 use std::cmp::Reverse;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;

 use anyhow::{Context as _, Result};
 use fuzzy::{StringMatch, StringMatchCandidate};
@@ -11,7 +11,7 @@ use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use project::{DocumentSymbol, Symbol};
 use text::OffsetRangeExt;
-use ui::{ListItem, prelude::*};
+use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
 use workspace::Workspace;

--- a/crates/assistant2/src/context_picker/thread_context_picker.rs
+++ b/crates/assistant2/src/context_picker/thread_context_picker.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use fuzzy::StringMatchCandidate;
 use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
 use picker::{Picker, PickerDelegate};
-use ui::{ListItem, prelude::*};
+use ui::{prelude::*, ListItem};

 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::{self, ContextStore};
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -2,22 +2,20 @@ use std::ops::Range;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;

-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, bail, Result};
 use collections::{BTreeMap, HashMap, HashSet};
-use futures::future::join_all;
-use futures::{self, Future, FutureExt, future};
-use gpui::{App, AppContext as _, Context, Entity, SharedString, Task, WeakEntity};
-use language::{Buffer, File};
+use futures::{self, future, Future, FutureExt};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use language::Buffer;
 use project::{ProjectItem, ProjectPath, Worktree};
 use rope::Rope;
 use text::{Anchor, BufferId, OffsetRangeExt};
-use util::{ResultExt as _, maybe};
+use util::maybe;
 use workspace::Workspace;

-use crate::ThreadStore;
 use crate::context::{
-    AssistantContext, ContextBuffer, ContextId, ContextSymbol, ContextSymbolId, DirectoryContext,
-    FetchedUrlContext, FileContext, SymbolContext, ThreadContext,
+    AssistantContext, ContextBuffer, ContextId, ContextSnapshot, ContextSymbol, ContextSymbolId,
+    DirectoryContext, FetchedUrlContext, FileContext, SymbolContext, ThreadContext,
 };
 use crate::context_strip::SuggestedContext;
 use crate::thread::{Thread, ThreadId};
@@ -25,7 +23,6 @@ use crate::thread::{Thread, ThreadId};
 pub struct ContextStore {
    workspace: WeakEntity<Workspace>,
    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>,
@@ -34,18 +31,13 @@ pub struct ContextStore {
    symbol_buffers: HashMap<ContextSymbolId, Entity<Buffer>>,
    symbols_by_path: HashMap<ProjectPath, Vec<ContextSymbolId>>,
    threads: HashMap<ThreadId, ContextId>,
-    thread_summary_tasks: Vec<Task<()>>,
    fetched_urls: HashMap<String, ContextId>,
 }

 impl ContextStore {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        thread_store: Option<WeakEntity<ThreadStore>>,
-    ) -> Self {
+    pub fn new(workspace: WeakEntity<Workspace>) -> Self {
        Self {
            workspace,
-            thread_store,
            context: Vec::new(),
            next_context_id: ContextId(0),
            files: BTreeMap::default(),
@@ -54,11 +46,16 @@ impl ContextStore {
            symbol_buffers: HashMap::default(),
            symbols_by_path: HashMap::default(),
            threads: HashMap::default(),
-            thread_summary_tasks: Vec::new(),
            fetched_urls: HashMap::default(),
        }
    }

+    pub fn snapshot<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = ContextSnapshot> + 'a {
+        self.context()
+            .iter()
+            .flat_map(|context| context.snapshot(cx))
+    }
+
    pub fn context(&self) -> &Vec<AssistantContext> {
        &self.context
    }
@@ -95,8 +92,8 @@ impl ContextStore {
                project.open_buffer(project_path.clone(), cx)
            })?;

-            let buffer = open_buffer_task.await?;
-            let buffer_id = this.update(cx, |_, cx| buffer.read(cx).remote_id())?;
+            let buffer_entity = open_buffer_task.await?;
+            let buffer_id = this.update(cx, |_, cx| buffer_entity.read(cx).remote_id())?;

            let already_included = this.update(cx, |this, _cx| {
                match this.will_include_buffer(buffer_id, &project_path.path) {
@@ -115,8 +112,16 @@ impl ContextStore {
                return anyhow::Ok(());
            }

-            let (buffer_info, text_task) =
-                this.update(cx, |_, cx| collect_buffer_info_and_text(buffer, None, cx))??;
+            let (buffer_info, text_task) = this.update(cx, |_, cx| {
+                let buffer = buffer_entity.read(cx);
+                collect_buffer_info_and_text(
+                    project_path.path.clone(),
+                    buffer_entity,
+                    buffer,
+                    None,
+                    cx.to_async(),
+                )
+            })?;

            let text = text_task.await;

@@ -130,12 +135,23 @@ impl ContextStore {

    pub fn add_file_from_buffer(
        &mut self,
-        buffer: Entity<Buffer>,
+        buffer_entity: Entity<Buffer>,
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        cx.spawn(async move |this, cx| {
-            let (buffer_info, text_task) =
-                this.update(cx, |_, cx| collect_buffer_info_and_text(buffer, None, cx))??;
+            let (buffer_info, text_task) = this.update(cx, |_, cx| {
+                let buffer = buffer_entity.read(cx);
+                let Some(file) = buffer.file() else {
+                    return Err(anyhow!("Buffer has no path."));
+                };
+                Ok(collect_buffer_info_and_text(
+                    file.path().clone(),
+                    buffer_entity,
+                    buffer,
+                    None,
+                    cx.to_async(),
+                ))
+            })??;

            let text = text_task.await;

@@ -168,15 +184,14 @@ impl ContextStore {
            return Task::ready(Err(anyhow!("failed to read project")));
        };

-        let already_included = match self.includes_directory(&project_path.path) {
-            Some(FileInclusion::Direct(context_id)) => {
-                if remove_if_exists {
-                    self.remove_context(context_id);
-                }
-                true
+        let already_included = if let Some(context_id) = self.includes_directory(&project_path.path)
+        {
+            if remove_if_exists {
+                self.remove_context(context_id);
            }
-            Some(FileInclusion::InDirectory(_)) => true,
-            None => false,
+            true
+        } else {
+            false
        };
        if already_included {
            return Task::ready(Ok(()));
@@ -212,11 +227,17 @@ impl ContextStore {
            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, None, cx).log_err()
-                    {
+                for (path, buffer_entity) in files.into_iter().zip(buffers) {
+                    // Skip all binary files and other non-UTF8 files
+                    if let Ok(buffer_entity) = buffer_entity {
+                        let buffer = buffer_entity.read(cx);
+                        let (buffer_info, text_task) = collect_buffer_info_and_text(
+                            path,
+                            buffer_entity,
+                            buffer,
+                            None,
+                            cx.to_async(),
+                        );
                        buffer_infos.push(buffer_info);
                        text_tasks.push(text_task);
                    }
@@ -232,10 +253,7 @@ impl ContextStore {
                .collect::<Vec<_>>();

            if context_buffers.is_empty() {
-                return Err(anyhow!(
-                    "No text files found in {}",
-                    &project_path.path.display()
-                ));
+                bail!("No text files found in {}", &project_path.path.display());
            }

            this.update(cx, |this, _| {
@@ -251,11 +269,11 @@ impl ContextStore {
        self.directories.insert(project_path.path.to_path_buf(), id);

        self.context
-            .push(AssistantContext::Directory(DirectoryContext {
+            .push(AssistantContext::Directory(DirectoryContext::new(
                id,
                project_path,
                context_buffers,
-            }));
+            )));
    }

    pub fn add_symbol(
@@ -268,8 +286,12 @@ impl ContextStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<bool>> {
        let buffer_ref = buffer.read(cx);
+        let Some(file) = buffer_ref.file() else {
+            return Task::ready(Err(anyhow!("Buffer has no path.")));
+        };
+
        let Some(project_path) = buffer_ref.project_path(cx) else {
-            return Task::ready(Err(anyhow!("buffer has no path")));
+            return Task::ready(Err(anyhow!("Buffer has no project path.")));
        };

        if let Some(symbols_for_path) = self.symbols_by_path.get(&project_path) {
@@ -292,11 +314,13 @@ impl ContextStore {
            }
        }

-        let (buffer_info, collect_content_task) =
-            match collect_buffer_info_and_text(buffer, Some(symbol_enclosing_range.clone()), cx) {
-                Ok((buffer_info, collect_context_task)) => (buffer_info, collect_context_task),
-                Err(err) => return Task::ready(Err(err)),
-            };
+        let (buffer_info, collect_content_task) = collect_buffer_info_and_text(
+            file.path().clone(),
+            buffer,
+            buffer_ref,
+            Some(symbol_enclosing_range.clone()),
+            cx.to_async(),
+        );

        cx.spawn(async move |this, cx| {
            let content = collect_content_task.await;
@@ -336,48 +360,21 @@ impl ContextStore {
        remove_if_exists: bool,
        cx: &mut Context<Self>,
    ) {
-        if let Some(context_id) = self.includes_thread(&thread.read(cx).id()) {
-            if remove_if_exists {
-                self.remove_context(context_id);
-            }
-        } else {
-            self.insert_thread(thread, cx);
-        }
-    }
-
-    pub fn wait_for_summaries(&mut self, cx: &App) -> Task<()> {
-        let tasks = std::mem::take(&mut self.thread_summary_tasks);
-
-        cx.spawn(async move |_cx| {
-            join_all(tasks).await;
-        })
-    }
-
-    fn insert_thread(&mut self, thread: Entity<Thread>, cx: &mut App) {
-        if let Some(summary_task) =
-            thread.update(cx, |thread, cx| thread.generate_detailed_summary(cx))
-        {
-            let thread = thread.clone();
-            let thread_store = self.thread_store.clone();
-
-            self.thread_summary_tasks.push(cx.spawn(async move |cx| {
-                summary_task.await;
-
-                if let Some(thread_store) = thread_store {
-                    // Save thread so its summary can be reused later
-                    let save_task = thread_store
-                        .update(cx, |thread_store, cx| thread_store.save_thread(&thread, cx));
-
-                    if let Some(save_task) = save_task.ok() {
-                        save_task.await.log_err();
-                    }
+        match self.includes_thread(&thread.read(cx).id()) {
+            Some(context_id) => {
+                if remove_if_exists {
+                    self.remove_context(context_id);
                }
-            }));
+            }
+            _ => {
+                self.insert_thread(thread, cx);
+            }
        }
+    }

+    fn insert_thread(&mut self, thread: Entity<Thread>, cx: &App) {
        let id = self.next_context_id.post_inc();
-
-        let text = thread.read(cx).latest_detailed_summary_or_text();
+        let text = thread.read(cx).text().into();

        self.threads.insert(thread.read(cx).id().clone(), id);
        self.context
@@ -478,7 +475,7 @@ impl ContextStore {
            let found_file_context = self.context.iter().find(|context| match &context {
                AssistantContext::File(file_context) => {
                    let buffer = file_context.context_buffer.buffer.read(cx);
-                    if let Some(file_path) = buffer_path_log_err(buffer, cx) {
+                    if let Some(file_path) = buffer_path_log_err(buffer) {
                        *file_path == *path
                    } else {
                        false
@@ -510,12 +507,8 @@ impl ContextStore {
        None
    }

-    pub fn includes_directory(&self, path: &Path) -> Option<FileInclusion> {
-        if let Some(context_id) = self.directories.get(path) {
-            return Some(FileInclusion::Direct(*context_id));
-        }
-
-        self.will_include_file_path_via_directory(path)
+    pub fn includes_directory(&self, path: &Path) -> Option<ContextId> {
+        self.directories.get(path).copied()
    }

    pub fn included_symbol(&self, symbol_id: &ContextSymbolId) -> Option<ContextId> {
@@ -555,7 +548,7 @@ impl ContextStore {
            .filter_map(|context| match context {
                AssistantContext::File(file) => {
                    let buffer = file.context_buffer.buffer.read(cx);
-                    buffer_path_log_err(buffer, cx).map(|p| p.to_path_buf())
+                    buffer_path_log_err(buffer).map(|p| p.to_path_buf())
                }
                AssistantContext::Directory(_)
                | AssistantContext::Symbol(_)
@@ -577,17 +570,15 @@ pub enum FileInclusion {

 // ContextBuffer without text.
 struct BufferInfo {
+    buffer_entity: Entity<Buffer>,
    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,
+        buffer: info.buffer_entity,
        version: info.version,
        text,
    }
@@ -605,47 +596,36 @@ fn make_context_symbol(
        id: ContextSymbolId { name, range, path },
        buffer_version: info.version,
        enclosing_range,
-        buffer: info.buffer,
+        buffer: info.buffer_entity,
        text,
    }
 }

 fn collect_buffer_info_and_text(
-    buffer: Entity<Buffer>,
+    path: Arc<Path>,
+    buffer_entity: Entity<Buffer>,
+    buffer: &Buffer,
    range: Option<Range<Anchor>>,
-    cx: &App,
-) -> Result<(BufferInfo, Task<SharedString>)> {
-    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 = if let Some(range) = range {
-        buffer_ref.text_for_range(range).collect::<Rope>()
-    } else {
-        buffer_ref.as_rope().clone()
-    };
-
+    cx: AsyncApp,
+) -> (BufferInfo, Task<SharedString>) {
    let buffer_info = BufferInfo {
-        buffer,
-        id: buffer_ref.remote_id(),
-        file: file.clone(),
-        version,
+        id: buffer.remote_id(),
+        buffer_entity,
+        version: buffer.version(),
    };
-
-    let full_path = file.full_path(cx);
-    let text_task = cx.background_spawn(async move { to_fenced_codeblock(&full_path, content) });
-
-    Ok((buffer_info, text_task))
+    // Important to collect version at the same time as content so that staleness logic is correct.
+    let content = if let Some(range) = range {
+        buffer.text_for_range(range).collect::<Rope>()
+    } else {
+        buffer.as_rope().clone()
+    };
+    let text_task = cx.background_spawn(async move { to_fenced_codeblock(&path, content) });
+    (buffer_info, text_task)
 }

-pub fn buffer_path_log_err(buffer: &Buffer, cx: &App) -> Option<Arc<Path>> {
+pub fn buffer_path_log_err(buffer: &Buffer) -> Option<Arc<Path>> {
    if let Some(file) = buffer.file() {
-        let mut path = file.path().clone();
-        if path.as_os_str().is_empty() {
-            path = file.full_path(cx).into();
-        }
-        Some(path)
+        Some(file.path().clone())
    } else {
        log::error!("Buffer that had a path unexpectedly no longer has a path.");
        None
@@ -731,8 +711,8 @@ pub fn refresh_context_store_text(
                        || changed_buffers.iter().any(|buffer| {
                            let buffer = buffer.read(cx);

-                            buffer_path_log_err(&buffer, cx).map_or(false, |path| {
-                                path.starts_with(&directory_context.project_path.path)
+                            buffer_path_log_err(&buffer).map_or(false, |path| {
+                                path.starts_with(&directory_context.path.path)
                            })
                        });

@@ -779,8 +759,8 @@ fn refresh_file_text(
 ) -> Option<Task<()>> {
    let id = file_context.id;
    let task = refresh_context_buffer(&file_context.context_buffer, cx);
-    if let Some(task) = task {
-        Some(cx.spawn(async move |cx| {
+    match task {
+        Some(task) => Some(cx.spawn(async move |cx| {
            let context_buffer = task.await;
            context_store
                .update(cx, |context_store, _| {
@@ -788,9 +768,8 @@ fn refresh_file_text(
                    context_store.replace_context(AssistantContext::File(new_file_context));
                })
                .ok();
-        }))
-    } else {
-        None
+        })),
+        _ => None,
    }
 }

@@ -803,14 +782,15 @@ fn refresh_directory_text(
    let futures = directory_context
        .context_buffers
        .iter()
-        .map(|context_buffer| {
-            if let Some(refresh_task) = refresh_context_buffer(context_buffer, cx) {
-                stale = true;
-                future::Either::Left(refresh_task)
-            } else {
-                future::Either::Right(future::ready((*context_buffer).clone()))
-            }
-        })
+        .map(
+            |context_buffer| match refresh_context_buffer(context_buffer, cx) {
+                Some(refresh_task) => {
+                    stale = true;
+                    future::Either::Left(refresh_task)
+                }
+                _ => future::Either::Right(future::ready((*context_buffer).clone())),
+            },
+        )
        .collect::<Vec<_>>();

    if !stale {
@@ -819,17 +799,13 @@ fn refresh_directory_text(

    let context_buffers = future::join_all(futures);

-    let id = directory_context.id;
-    let project_path = directory_context.project_path.clone();
+    let id = directory_context.snapshot.id;
+    let path = directory_context.path.clone();
    Some(cx.spawn(async move |cx| {
        let context_buffers = context_buffers.await;
        context_store
            .update(cx, |context_store, _| {
-                let new_directory_context = DirectoryContext {
-                    id,
-                    project_path,
-                    context_buffers,
-                };
+                let new_directory_context = DirectoryContext::new(id, path, context_buffers);
                context_store.replace_context(AssistantContext::Directory(new_directory_context));
            })
            .ok();
@@ -843,8 +819,8 @@ fn refresh_symbol_text(
 ) -> Option<Task<()>> {
    let id = symbol_context.id;
    let task = refresh_context_symbol(&symbol_context.context_symbol, cx);
-    if let Some(task) = task {
-        Some(cx.spawn(async move |cx| {
+    match task {
+        Some(task) => Some(cx.spawn(async move |cx| {
            let context_symbol = task.await;
            context_store
                .update(cx, |context_store, _| {
@@ -852,9 +828,8 @@ fn refresh_symbol_text(
                    context_store.replace_context(AssistantContext::Symbol(new_symbol_context));
                })
                .ok();
-        }))
-    } else {
-        None
+        })),
+        _ => None,
    }
 }

@@ -868,7 +843,7 @@ fn refresh_thread_text(
    cx.spawn(async move |cx| {
        context_store
            .update(cx, |context_store, cx| {
-                let text = thread.read(cx).latest_detailed_summary_or_text();
+                let text = thread.read(cx).text().into();
                context_store.replace_context(AssistantContext::Thread(ThreadContext {
                    id,
                    thread,
@@ -884,9 +859,15 @@ fn refresh_context_buffer(
    cx: &App,
 ) -> Option<impl Future<Output = ContextBuffer> + use<>> {
    let buffer = context_buffer.buffer.read(cx);
+    let path = buffer_path_log_err(buffer)?;
    if buffer.version.changed_since(&context_buffer.version) {
-        let (buffer_info, text_task) =
-            collect_buffer_info_and_text(context_buffer.buffer.clone(), None, cx).log_err()?;
+        let (buffer_info, text_task) = collect_buffer_info_and_text(
+            path,
+            context_buffer.buffer.clone(),
+            buffer,
+            None,
+            cx.to_async(),
+        );
        Some(text_task.map(move |text| make_context_buffer(buffer_info, text)))
    } else {
        None
@@ -898,14 +879,16 @@ fn refresh_context_symbol(
    cx: &App,
 ) -> Option<impl Future<Output = ContextSymbol> + use<>> {
    let buffer = context_symbol.buffer.read(cx);
+    let path = buffer_path_log_err(buffer)?;
    let project_path = buffer.project_path(cx)?;
    if buffer.version.changed_since(&context_symbol.buffer_version) {
        let (buffer_info, text_task) = collect_buffer_info_and_text(
+            path,
            context_symbol.buffer.clone(),
+            buffer,
            Some(context_symbol.enclosing_range.clone()),
-            cx,
-        )
-        .log_err()?;
+            cx.to_async(),
+        );
        let name = context_symbol.id.name.clone();
        let range = context_symbol.id.range.clone();
        let enclosing_range = context_symbol.enclosing_range.clone();
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -9,15 +9,15 @@ use gpui::{
 };
 use itertools::Itertools;
 use language::Buffer;
-use ui::{KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
-use workspace::{Workspace, notifications::NotifyResultExt};
+use ui::{prelude::*, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip};
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context::{ContextId, ContextKind};
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
 use crate::thread::Thread;
 use crate::thread_store::ThreadStore;
-use crate::ui::{AddedContext, ContextPill};
+use crate::ui::ContextPill;
 use crate::{
    AcceptSuggestedContext, AssistantPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
    RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
@@ -92,12 +92,12 @@ impl ContextStrip {
        let active_buffer_entity = editor.buffer().read(cx).as_singleton()?;
        let active_buffer = active_buffer_entity.read(cx);

-        let path = active_buffer.file()?.full_path(cx);
+        let path = active_buffer.file()?.path();

        if self
            .context_store
            .read(cx)
-            .will_include_buffer(active_buffer.remote_id(), &path)
+            .will_include_buffer(active_buffer.remote_id(), path)
            .is_some()
        {
            return None;
@@ -108,7 +108,7 @@ impl ContextStrip {
            None => path.to_string_lossy().into_owned().into(),
        };

-        let icon_path = FileIcons::get_icon(&path, cx);
+        let icon_path = FileIcons::get_icon(path, cx);

        Some(SuggestedContext::File {
            name,
@@ -239,7 +239,11 @@ impl ContextStrip {
        let eraser = if bounds.len() < 3 { 0 } else { 1 };
        let pills = &bounds[1..bounds.len() - eraser];

-        if pills.is_empty() { None } else { Some(pills) }
+        if pills.is_empty() {
+            None
+        } else {
+            Some(pills)
+        }
    }

    fn last_pill_index(&self) -> Option<usize> {
@@ -363,19 +367,19 @@ impl Focusable for ContextStrip {
 impl Render for ContextStrip {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let context_store = self.context_store.read(cx);
-        let context = context_store.context();
+        let context = context_store
+            .context()
+            .iter()
+            .flat_map(|context| context.snapshot(cx))
+            .collect::<Vec<_>>();
        let context_picker = self.context_picker.clone();
        let focus_handle = self.focus_handle.clone();

        let suggested_context = self.suggested_context(cx);

-        let added_contexts = context
+        let dupe_names = context
            .iter()
-            .map(|c| AddedContext::new(c, cx))
-            .collect::<Vec<_>>();
-        let dupe_names = added_contexts
-            .iter()
-            .map(|c| c.name.clone())
+            .map(|context| context.name.clone())
            .sorted()
            .tuple_windows()
            .filter(|(a, b)| a == b)
@@ -461,39 +465,34 @@ impl Render for ContextStrip {
                    )
                }
            })
-            .children(
-                added_contexts
-                    .into_iter()
-                    .enumerate()
-                    .map(|(i, added_context)| {
-                        let name = added_context.name.clone();
-                        let id = added_context.id;
-                        ContextPill::added(
-                            added_context,
-                            dupe_names.contains(&name),
-                            self.focused_index == Some(i),
-                            Some({
-                                let context_store = self.context_store.clone();
-                                Rc::new(cx.listener(move |_this, _event, _window, cx| {
-                                    context_store.update(cx, |this, _cx| {
-                                        this.remove_context(id);
-                                    });
-                                    cx.notify();
-                                }))
-                            }),
-                        )
-                        .on_click({
-                            Rc::new(cx.listener(move |this, event: &ClickEvent, window, cx| {
-                                if event.down.click_count > 1 {
-                                    this.open_context(id, window, cx);
-                                } else {
-                                    this.focused_index = Some(i);
-                                }
-                                cx.notify();
-                            }))
-                        })
+            .children(context.iter().enumerate().map(|(i, context)| {
+                let id = context.id;
+                ContextPill::added(
+                    context.clone(),
+                    dupe_names.contains(&context.name),
+                    self.focused_index == Some(i),
+                    Some({
+                        let id = context.id;
+                        let context_store = self.context_store.clone();
+                        Rc::new(cx.listener(move |_this, _event, _window, cx| {
+                            context_store.update(cx, |this, _cx| {
+                                this.remove_context(id);
+                            });
+                            cx.notify();
+                        }))
                    }),
-            )
+                )
+                .on_click(Rc::new(cx.listener(
+                    move |this, event: &ClickEvent, window, cx| {
+                        if event.down.click_count > 1 {
+                            this.open_context(id, window, cx);
+                        } else {
+                            this.focused_index = Some(i);
+                        }
+                        cx.notify();
+                    },
+                )))
+            }))
            .when_some(suggested_context, |el, suggested| {
                el.child(
                    ContextPill::suggested(
--- a/crates/assistant2/src/history_store.rs
+++ b/crates/assistant2/src/history_store.rs
@@ -1,10 +1,9 @@
 use assistant_context_editor::SavedContextMetadata;
 use chrono::{DateTime, Utc};
-use gpui::{Entity, prelude::*};
+use gpui::{prelude::*, Entity};

 use crate::thread_store::{SerializedThreadMetadata, ThreadStore};

-#[derive(Debug)]
 pub enum HistoryEntry {
    Thread(SerializedThreadMetadata),
    Context(SavedContextMetadata),
@@ -22,35 +21,28 @@ impl HistoryEntry {
 pub struct HistoryStore {
    thread_store: Entity<ThreadStore>,
    context_store: Entity<assistant_context_editor::ContextStore>,
-    _subscriptions: Vec<gpui::Subscription>,
 }

 impl HistoryStore {
    pub fn new(
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
-        cx: &mut Context<Self>,
+        _cx: &mut Context<Self>,
    ) -> Self {
-        let subscriptions = vec![
-            cx.observe(&thread_store, |_, _, cx| cx.notify()),
-            cx.observe(&context_store, |_, _, cx| cx.notify()),
-        ];
-
        Self {
            thread_store,
            context_store,
-            _subscriptions: subscriptions,
        }
    }

+    /// Returns the number of history entries.
+    pub fn entry_count(&self, cx: &mut Context<Self>) -> usize {
+        self.entries(cx).len()
+    }
+
    pub fn entries(&self, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
        let mut history_entries = Vec::new();

-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return history_entries;
-        }
-
        for thread in self.thread_store.update(cx, |this, _cx| this.threads()) {
            history_entries.push(HistoryEntry::Thread(thread));
        }
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -7,24 +7,24 @@ use std::sync::Arc;
 use anyhow::{Context as _, Result};
 use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
-use collections::{HashMap, HashSet, VecDeque, hash_map};
+use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
-    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
-    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
    actions::SelectAll,
    display_map::{
        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
        ToDisplayPoint,
    },
+    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
+    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
 };
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagViewExt as _};
 use fs::Fs;
 use gpui::{
-    App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task, UpdateGlobal,
-    WeakEntity, Window, point,
+    point, App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task,
+    UpdateGlobal, WeakEntity, Window,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::{LanguageModelRegistry, report_assistant_event};
+use language_model::{report_assistant_event, LanguageModelRegistry};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::LspAction;
@@ -32,20 +32,20 @@ use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
-use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
+use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
 use util::RangeExt;
 use util::ResultExt;
-use workspace::{ItemHandle, Toast, Workspace, notifications::NotificationId};
-use workspace::{ShowConfiguration, dock::Panel};
+use workspace::{dock::Panel, ShowConfiguration};
+use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};

-use crate::AssistantPanel;
 use crate::buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent};
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent};
 use crate::terminal_inline_assistant::TerminalInlineAssistant;
 use crate::thread_store::ThreadStore;
+use crate::AssistantPanel;

 pub fn init(
    fs: Arc<dyn Fs>,
@@ -239,8 +239,8 @@ impl InlineAssistant {

        let is_authenticated = || {
            LanguageModelRegistry::read_global(cx)
-                .inline_assistant_model()
-                .map_or(false, |model| model.provider.is_authenticated(cx))
+                .active_provider()
+                .map_or(false, |provider| provider.is_authenticated(cx))
        };

        let thread_store = workspace
@@ -279,8 +279,8 @@ impl InlineAssistant {
            cx.spawn_in(window, async move |_workspace, cx| {
                let Some(task) = cx.update(|_, cx| {
                    LanguageModelRegistry::read_global(cx)
-                        .inline_assistant_model()
-                        .map_or(None, |model| Some(model.provider.authenticate(cx)))
+                        .active_provider()
+                        .map_or(None, |provider| Some(provider.authenticate(cx)))
                })?
                else {
                    let answer = cx
@@ -341,33 +341,35 @@ impl InlineAssistant {
                selection.end.column = snapshot
                    .buffer_snapshot
                    .line_len(MultiBufferRow(selection.end.row));
-            } else if let Some(fold) =
-                snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
-            {
-                selection.start = fold.range().start;
-                selection.end = fold.range().end;
-                if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot.max_row() {
-                    let chars = snapshot
-                        .buffer_snapshot
-                        .chars_at(Point::new(selection.end.row + 1, 0));
-
-                    for c in chars {
-                        if c == '\n' {
-                            break;
-                        }
-                        if c.is_whitespace() {
-                            continue;
-                        }
-                        if snapshot
-                            .language_at(selection.end)
-                            .is_some_and(|language| language.config().brackets.is_closing_brace(c))
-                        {
-                            selection.end.row += 1;
-                            selection.end.column = snapshot
+            } else {
+                match snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row)) {
+                    Some(fold) => {
+                        selection.start = fold.range().start;
+                        selection.end = fold.range().end;
+                        if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot.max_row() {
+                            let chars = snapshot
                                .buffer_snapshot
-                                .line_len(MultiBufferRow(selection.end.row));
+                                .chars_at(Point::new(selection.end.row + 1, 0));
+
+                            for c in chars {
+                                if c == '\n' {
+                                    break;
+                                }
+                                if c.is_whitespace() {
+                                    continue;
+                                }
+                                if snapshot.language_at(selection.end).is_some_and(|language| {
+                                    language.config().brackets.is_closing_brace(c)
+                                }) {
+                                    selection.end.row += 1;
+                                    selection.end.column = snapshot
+                                        .buffer_snapshot
+                                        .line_len(MultiBufferRow(selection.end.row));
+                                }
+                            }
                        }
                    }
+                    _ => {}
                }
            }

@@ -401,14 +403,14 @@ impl InlineAssistant {

            codegen_ranges.push(anchor_range);

-            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                self.telemetry.report_assistant_event(AssistantEvent {
                    conversation_id: None,
                    kind: AssistantKind::Inline,
                    phase: AssistantPhase::Invoked,
                    message_id: None,
-                    model: model.model.telemetry_id(),
-                    model_provider: model.provider.id().to_string(),
+                    model: model.telemetry_id(),
+                    model_provider: model.provider_id().to_string(),
                    response_latency: None,
                    error_message: None,
                    language_name: buffer.language().map(|language| language.name().to_proto()),
@@ -424,8 +426,7 @@ impl InlineAssistant {
        let mut assist_to_focus = None;
        for range in codegen_ranges {
            let assist_id = self.next_assist_id.post_inc();
-            let context_store =
-                cx.new(|_cx| ContextStore::new(workspace.clone(), thread_store.clone()));
+            let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
            let codegen = cx.new(|cx| {
                BufferCodegen::new(
                    editor.read(cx).buffer().clone(),
@@ -537,8 +538,7 @@ impl InlineAssistant {
            range.end = range.end.bias_right(&snapshot);
        }

-        let context_store =
-            cx.new(|_cx| ContextStore::new(workspace.clone(), thread_store.clone()));
+        let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));

        let codegen = cx.new(|cx| {
            BufferCodegen::new(
@@ -976,7 +976,7 @@ impl InlineAssistant {
            let active_alternative = assist.codegen.read(cx).active_alternative().clone();
            let message_id = active_alternative.read(cx).message_id.clone();

-            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let language_name = assist.editor.upgrade().and_then(|editor| {
                    let multibuffer = editor.read(cx).buffer().read(cx);
                    let snapshot = multibuffer.snapshot(cx);
@@ -996,15 +996,15 @@ impl InlineAssistant {
                        } else {
                            AssistantPhase::Accepted
                        },
-                        model: model.model.telemetry_id(),
-                        model_provider: model.model.provider_id().to_string(),
+                        model: model.telemetry_id(),
+                        model_provider: model.provider_id().to_string(),
                        response_latency: None,
                        error_message: None,
                        language_name: language_name.map(|name| name.to_proto()),
                    },
                    Some(self.telemetry.clone()),
                    cx.http_client(),
-                    model.model.api_key(cx),
+                    model.api_key(cx),
                    cx.background_executor(),
                );
            }
@@ -1131,24 +1131,27 @@ impl InlineAssistant {

            let mut scroll_target_top;
            let mut scroll_target_bottom;
-            if let Some(decorations) = assist.decorations.as_ref() {
-                scroll_target_top = editor
-                    .row_for_block(decorations.prompt_block_id, cx)
-                    .unwrap()
-                    .0 as f32;
-                scroll_target_bottom = editor
-                    .row_for_block(decorations.end_block_id, cx)
-                    .unwrap()
-                    .0 as f32;
-            } else {
-                let snapshot = editor.snapshot(window, cx);
-                let start_row = assist
-                    .range
-                    .start
-                    .to_display_point(&snapshot.display_snapshot)
-                    .row();
-                scroll_target_top = start_row.0 as f32;
-                scroll_target_bottom = scroll_target_top + 1.;
+            match assist.decorations.as_ref() {
+                Some(decorations) => {
+                    scroll_target_top = editor
+                        .row_for_block(decorations.prompt_block_id, cx)
+                        .unwrap()
+                        .0 as f32;
+                    scroll_target_bottom = editor
+                        .row_for_block(decorations.end_block_id, cx)
+                        .unwrap()
+                        .0 as f32;
+                }
+                _ => {
+                    let snapshot = editor.snapshot(window, cx);
+                    let start_row = assist
+                        .range
+                        .start
+                        .to_display_point(&snapshot.display_snapshot)
+                        .row();
+                    scroll_target_top = start_row.0 as f32;
+                    scroll_target_bottom = scroll_target_top + 1.;
+                }
            }
            scroll_target_top -= editor.vertical_scroll_margin() as f32;
            scroll_target_bottom += editor.vertical_scroll_margin() as f32;
@@ -1193,10 +1196,11 @@ impl InlineAssistant {
    }

    pub fn start_assist(&mut self, assist_id: InlineAssistId, window: &mut Window, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        let assist_group_id = assist.group_id;
@@ -1224,10 +1228,11 @@ impl InlineAssistant {
    }

    pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
@@ -1365,7 +1370,10 @@ impl InlineAssistant {
                    multi_buffer.update(cx, |multi_buffer, cx| {
                        multi_buffer.push_excerpts(
                            old_buffer.clone(),
-                            Some(ExcerptRange::new(buffer_start..buffer_end)),
+                            Some(ExcerptRange {
+                                context: buffer_start..buffer_end,
+                                primary: None,
+                            }),
                            cx,
                        );
                    });
@@ -1448,20 +1456,27 @@ impl InlineAssistant {
                }
            });

-        if let Some(context_editor) = context_editor {
-            Some(InlineAssistTarget::Editor(context_editor))
-        } else if let Some(workspace_editor) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-        {
-            Some(InlineAssistTarget::Editor(workspace_editor))
-        } else if let Some(terminal_view) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<TerminalView>(cx))
-        {
-            Some(InlineAssistTarget::Terminal(terminal_view))
-        } else {
-            None
+        match context_editor {
+            Some(context_editor) => Some(InlineAssistTarget::Editor(context_editor)),
+            _ => {
+                match workspace
+                    .active_item(cx)
+                    .and_then(|item| item.act_as::<Editor>(cx))
+                {
+                    Some(workspace_editor) => Some(InlineAssistTarget::Editor(workspace_editor)),
+                    _ => {
+                        match workspace
+                            .active_item(cx)
+                            .and_then(|item| item.act_as::<TerminalView>(cx))
+                        {
+                            Some(terminal_view) => {
+                                Some(InlineAssistTarget::Terminal(terminal_view))
+                            }
+                            _ => None,
+                        }
+                    }
+                }
+            }
        }
    }
 }
@@ -1653,10 +1668,11 @@ impl InlineAssist {
                    InlineAssistant::update_global(cx, |this, cx| match event {
                        CodegenEvent::Undone => this.finish_assist(assist_id, false, window, cx),
                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
+                            let assist = match this.assists.get(&assist_id) {
+                                Some(assist) => assist,
+                                _ => {
+                                    return;
+                                }
                            };

                            if let CodegenStatus::Error(error) = codegen.read(cx).status(cx) {
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -1,4 +1,4 @@
-use crate::assistant_model_selector::{AssistantModelSelector, ModelType};
+use crate::assistant_model_selector::AssistantModelSelector;
 use crate::buffer_codegen::BufferCodegen;
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
@@ -10,14 +10,14 @@ use crate::{RemoveAllContext, ToggleContextPicker};
 use client::ErrorExt;
 use collections::VecDeque;
 use editor::{
-    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, GutterDimensions, MultiBuffer,
    actions::{MoveDown, MoveUp},
+    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, GutterDimensions, MultiBuffer,
 };
 use feature_flags::{FeatureFlagAppExt as _, ZedPro};
 use fs::Fs;
 use gpui::{
-    AnyElement, App, ClickEvent, Context, CursorStyle, Entity, EventEmitter, FocusHandle,
-    Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window, anchored, deferred, point,
+    anchored, deferred, point, AnyElement, App, ClickEvent, Context, CursorStyle, Entity,
+    EventEmitter, FocusHandle, Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
 use language_model_selector::ToggleModelSelector;
@@ -28,7 +28,7 @@ use std::sync::Arc;
 use theme::ThemeSettings;
 use ui::utils::WithRemSize;
 use ui::{
-    CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip, prelude::*,
+    prelude::*, CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip,
 };
 use util::ResultExt;
 use workspace::Workspace;
@@ -455,55 +455,47 @@ impl<T: 'static> PromptEditor<T> {

        match codegen_status {
            CodegenStatus::Idle => {
-                vec![
-                    Button::new("start", mode.start_label())
-                        .label_size(LabelSize::Small)
-                        .icon(IconName::Return)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .on_click(
-                            cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StartRequested)),
-                        )
-                        .into_any_element(),
-                ]
+                vec![Button::new("start", mode.start_label())
+                    .label_size(LabelSize::Small)
+                    .icon(IconName::Return)
+                    .icon_size(IconSize::XSmall)
+                    .icon_color(Color::Muted)
+                    .on_click(cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StartRequested)))
+                    .into_any_element()]
            }
-            CodegenStatus::Pending => vec![
-                IconButton::new("stop", IconName::Stop)
-                    .icon_color(Color::Error)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(move |window, cx| {
-                        Tooltip::with_meta(
-                            mode.tooltip_interrupt(),
-                            Some(&menu::Cancel),
-                            "Changes won't be discarded",
-                            window,
-                            cx,
-                        )
-                    })
-                    .on_click(cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
-                    .into_any_element(),
-            ],
+            CodegenStatus::Pending => vec![IconButton::new("stop", IconName::Stop)
+                .icon_color(Color::Error)
+                .shape(IconButtonShape::Square)
+                .tooltip(move |window, cx| {
+                    Tooltip::with_meta(
+                        mode.tooltip_interrupt(),
+                        Some(&menu::Cancel),
+                        "Changes won't be discarded",
+                        window,
+                        cx,
+                    )
+                })
+                .on_click(cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
+                .into_any_element()],
            CodegenStatus::Done | CodegenStatus::Error(_) => {
                let has_error = matches!(codegen_status, CodegenStatus::Error(_));
                if has_error || self.edited_since_done {
-                    vec![
-                        IconButton::new("restart", IconName::RotateCw)
-                            .icon_color(Color::Info)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(move |window, cx| {
-                                Tooltip::with_meta(
-                                    mode.tooltip_restart(),
-                                    Some(&menu::Confirm),
-                                    "Changes will be discarded",
-                                    window,
-                                    cx,
-                                )
-                            })
-                            .on_click(cx.listener(|_, _, _, cx| {
-                                cx.emit(PromptEditorEvent::StartRequested);
-                            }))
-                            .into_any_element(),
-                    ]
+                    vec![IconButton::new("restart", IconName::RotateCw)
+                        .icon_color(Color::Info)
+                        .shape(IconButtonShape::Square)
+                        .tooltip(move |window, cx| {
+                            Tooltip::with_meta(
+                                mode.tooltip_restart(),
+                                Some(&menu::Confirm),
+                                "Changes will be discarded",
+                                window,
+                                cx,
+                            )
+                        })
+                        .on_click(cx.listener(|_, _, _, cx| {
+                            cx.emit(PromptEditorEvent::StartRequested);
+                        }))
+                        .into_any_element()]
                } else {
                    let accept = IconButton::new("accept", IconName::Check)
                        .icon_color(Color::Info)
@@ -582,7 +574,7 @@ impl<T: 'static> PromptEditor<T> {
        let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);

        let model_registry = LanguageModelRegistry::read_global(cx);
-        let default_model = model_registry.default_model().map(|default| default.model);
+        let default_model = model_registry.active_model();
        let alternative_models = model_registry.inline_alternative_models();

        let get_model_name = |index: usize| -> String {
@@ -685,7 +677,7 @@ impl<T: 'static> PromptEditor<T> {
            .into_any_element()
    }

-    fn render_rate_limit_notice(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_rate_limit_notice(&self, cx: &mut Context<Self>) -> impl IntoElement + use<T> {
        Popover::new().child(
            v_flex()
                .occlude()
@@ -890,7 +882,6 @@ impl PromptEditor<BufferCodegen> {
                    fs,
                    model_selector_menu_handle,
                    prompt_editor.focus_handle(cx),
-                    ModelType::InlineAssistant,
                    window,
                    cx,
                )
@@ -1043,7 +1034,6 @@ impl PromptEditor<TerminalCodegen> {
                    fs,
                    model_selector_menu_handle.clone(),
                    prompt_editor.focus_handle(cx),
-                    ModelType::InlineAssistant,
                    window,
                    cx,
                )
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -1,40 +1,37 @@
 use std::sync::Arc;

-use crate::assistant_model_selector::ModelType;
 use collections::HashSet;
 use editor::actions::MoveUp;
 use editor::{ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorStyle};
 use file_icons::FileIcons;
 use fs::Fs;
 use gpui::{
-    Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription, TextStyle,
-    WeakEntity, linear_color_stop, linear_gradient, point,
+    linear_color_stop, linear_gradient, point, Animation, AnimationExt, App, DismissEvent, Entity,
+    Focusable, Subscription, TextStyle, WeakEntity,
 };
-use language::Buffer;
-use language_model::{ConfiguredModel, LanguageModelRegistry};
+use language_model::LanguageModelRegistry;
 use language_model_selector::ToggleModelSelector;
-use multi_buffer;
 use project::Project;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
 use ui::{
-    ButtonLike, Disclosure, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle, Tooltip,
-    prelude::*,
+    prelude::*, ButtonLike, Disclosure, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle,
+    Tooltip,
 };
-use util::ResultExt as _;
+use util::ResultExt;
 use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;

 use crate::assistant_model_selector::AssistantModelSelector;
 use crate::context_picker::{ConfirmBehavior, ContextPicker, ContextPickerCompletionProvider};
-use crate::context_store::{ContextStore, refresh_context_store_text};
+use crate::context_store::{refresh_context_store_text, ContextStore};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::profile_selector::ProfileSelector;
-use crate::thread::{RequestKind, Thread, TokenUsageRatio};
+use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
 use crate::{
-    AgentDiff, Chat, ChatMode, NewThread, OpenAgentDiff, RemoveAllContext, ThreadEvent,
+    AssistantDiff, Chat, ChatMode, OpenAssistantDiff, RemoveAllContext, ThreadEvent,
    ToggleContextPicker, ToggleProfileSelector,
 };

@@ -52,7 +49,6 @@ pub struct MessageEditor {
    model_selector: Entity<AssistantModelSelector>,
    profile_selector: Entity<ProfileSelector>,
    edits_expanded: bool,
-    waiting_for_summaries_to_send: bool,
    _subscriptions: Vec<Subscription>,
 }

@@ -140,13 +136,11 @@ impl MessageEditor {
                    fs.clone(),
                    model_selector_menu_handle,
                    editor.focus_handle(cx),
-                    ModelType::Default,
                    window,
                    cx,
                )
            }),
            edits_expanded: false,
-            waiting_for_summaries_to_send: false,
            profile_selector: cx
                .new(|cx| ProfileSelector::new(fs, thread_store, editor.focus_handle(cx), cx)),
            _subscriptions: subscriptions,
@@ -193,7 +187,7 @@ impl MessageEditor {

    fn is_model_selected(&self, cx: &App) -> bool {
        LanguageModelRegistry::read_global(cx)
-            .default_model()
+            .active_model()
            .is_some()
    }

@@ -203,16 +197,20 @@ impl MessageEditor {
        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;
-        };
-
-        if provider.must_accept_terms(cx) {
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();
+        if provider
+            .as_ref()
+            .map_or(false, |provider| provider.must_accept_terms(cx))
+        {
            cx.notify();
            return;
        }

+        let model_registry = LanguageModelRegistry::read_global(cx);
+        let Some(model) = model_registry.active_model() else {
+            return;
+        };
+
        let user_message = self.editor.update(cx, |editor, cx| {
            let text = editor.text(cx);
            editor.clear(window, cx);
@@ -227,12 +225,10 @@ impl MessageEditor {
        let thread = self.thread.clone();
        let context_store = self.context_store.clone();
        let checkpoint = self.project.read(cx).git_store().read(cx).checkpoint(cx);
-
-        cx.spawn(async move |this, cx| {
+        cx.spawn(async move |_, cx| {
            let checkpoint = checkpoint.await.ok();
            refresh_task.await;
            let (system_prompt_context, load_error) = system_prompt_context_task.await;
-
            thread
                .update(cx, |thread, cx| {
                    thread.set_system_prompt_context(system_prompt_context);
@@ -241,36 +237,13 @@ impl MessageEditor {
                    }
                })
                .ok();
-
            thread
                .update(cx, |thread, cx| {
-                    let context = context_store.read(cx).context().clone();
+                    let context = context_store.read(cx).snapshot(cx).collect::<Vec<_>>();
+                    thread.action_log().update(cx, |action_log, cx| {
+                        action_log.clear_reviewed_changes(cx);
+                    });
                    thread.insert_user_message(user_message, context, checkpoint, cx);
-                })
-                .ok();
-
-            if let Some(wait_for_summaries) = context_store
-                .update(cx, |context_store, cx| context_store.wait_for_summaries(cx))
-                .log_err()
-            {
-                this.update(cx, |this, cx| {
-                    this.waiting_for_summaries_to_send = true;
-                    cx.notify();
-                })
-                .ok();
-
-                wait_for_summaries.await;
-
-                this.update(cx, |this, cx| {
-                    this.waiting_for_summaries_to_send = false;
-                    cx.notify();
-                })
-                .ok();
-            }
-
-            // Send to model after summaries are done
-            thread
-                .update(cx, |thread, cx| {
                    thread.send_to_model(model, request_kind, cx);
                })
                .ok();
@@ -318,20 +291,7 @@ impl MessageEditor {
    }

    fn handle_review_click(&self, window: &mut Window, cx: &mut Context<Self>) {
-        AgentDiff::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
-    }
-
-    fn handle_file_click(
-        &self,
-        buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Ok(diff) = AgentDiff::deploy(self.thread.clone(), self.workspace.clone(), window, cx)
-        {
-            let path_key = multi_buffer::PathKey::for_buffer(&buffer, cx);
-            diff.update(cx, |diff, cx| diff.move_to_path(path_key, window, cx));
-        }
+        AssistantDiff::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
    }
 }

@@ -349,14 +309,9 @@ impl Render for MessageEditor {
        let focus_handle = self.editor.focus_handle(cx);
        let inline_context_picker = self.inline_context_picker.clone();

-        let thread = self.thread.read(cx);
-        let is_generating = thread.is_generating();
-        let total_token_usage = thread.total_token_usage(cx);
+        let is_generating = self.thread.read(cx).is_generating();
        let is_model_selected = self.is_model_selected(cx);
        let is_editor_empty = self.is_editor_empty(cx);
-        let needs_confirmation =
-            thread.has_pending_tool_uses() && thread.tools_needing_confirmation().next().is_some();
-
        let submit_label_color = if is_editor_empty {
            Color::Muted
        } else {
@@ -384,41 +339,6 @@ impl Render for MessageEditor {

        v_flex()
            .size_full()
-            .when(self.waiting_for_summaries_to_send, |parent| {
-                parent.child(
-                    h_flex().py_3().w_full().justify_center().child(
-                        h_flex()
-                            .flex_none()
-                            .px_2()
-                            .py_2()
-                            .bg(editor_bg_color)
-                            .border_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .rounded_lg()
-                            .shadow_md()
-                            .gap_1()
-                            .child(
-                                Icon::new(IconName::ArrowCircle)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted)
-                                    .with_animation(
-                                        "arrow-circle",
-                                        Animation::new(Duration::from_secs(2)).repeat(),
-                                        |icon, delta| {
-                                            icon.transform(gpui::Transformation::rotate(
-                                                gpui::percentage(delta),
-                                            ))
-                                        },
-                                    ),
-                            )
-                            .child(
-                                Label::new("Summarizing context…")
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            ),
-                    ),
-                )
-            })
            .when(is_generating, |parent| {
                let focus_handle = self.editor.focus_handle(cx).clone();
                parent.child(
@@ -448,17 +368,11 @@ impl Render for MessageEditor {
                                        },
                                    ),
                            )
-                            .child({
-
-
-                                Label::new(if needs_confirmation {
-                                    "Waiting for confirmation…"
-                                } else {
-                                    "Generating…"
-                                })
-                                .size(LabelSize::XSmall)
-                                .color(Color::Muted)
-                            })
+                            .child(
+                                Label::new("Generating…")
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted),
+                            )
                            .child(ui::Divider::vertical())
                            .child(
                                Button::new("cancel-generation", "Cancel")
@@ -500,16 +414,11 @@ impl Render for MessageEditor {
                        }])
                        .child(
                            h_flex()
-                                .id("edits-container")
                                .p_1p5()
                                .justify_between()
                                .when(self.edits_expanded, |this| {
                                    this.border_b_1().border_color(border_color)
                                })
-                                .cursor_pointer()
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.handle_review_click(window, cx)
-                                }))
                                .child(
                                    h_flex()
                                        .gap_1()
@@ -554,7 +463,7 @@ impl Render for MessageEditor {
                                        .label_size(LabelSize::Small)
                                        .key_binding(
                                            KeyBinding::for_action_in(
-                                                &OpenAgentDiff,
+                                                &OpenAssistantDiff,
                                                &focus_handle,
                                                window,
                                                cx,
@@ -570,7 +479,7 @@ impl Render for MessageEditor {
                            parent.child(
                                v_flex().bg(cx.theme().colors().editor_background).children(
                                    changed_buffers.into_iter().enumerate().flat_map(
-                                        |(index, (buffer, _diff))| {
+                                        |(index, (buffer, changed))| {
                                            let file = buffer.read(cx).file()?;
                                            let path = file.path();

@@ -623,21 +532,11 @@ impl Render for MessageEditor {
                                                        .justify_between()
                                                        .child(
                                                            h_flex()
-                                                                .id(("file-container", index))
+                                                                .id("file-container")
                                                                .pr_8()
                                                                .gap_1p5()
                                                                .max_w_full()
                                                                .overflow_x_scroll()
-                                                                .cursor_pointer()
-                                                                .on_click({
-                                                                    let buffer = buffer.clone();
-                                                                    cx.listener(move |this, _, window, cx| {
-                                                                        this.handle_file_click(buffer.clone(), window, cx);
-                                                                    })
-                                                                })
-                                                                .tooltip(
-                                                                    Tooltip::text(format!("Review {}", path.display()))
-                                                                )
                                                                .child(file_icon)
                                                                .child(
                                                                    h_flex()
@@ -653,13 +552,25 @@ impl Render for MessageEditor {
                                                                        .color(Color::Deleted),
                                                                ),
                                                        )
+                                                        .when(!changed.needs_review, |parent| {
+                                                            parent.child(
+                                                                Icon::new(IconName::Check)
+                                                                    .color(Color::Success),
+                                                            )
+                                                        })
                                                        .child(
                                                            div()
                                                                .h_full()
                                                                .absolute()
                                                                .w_8()
                                                                .bottom_0()
-                                                                .right_0()
+                                                                .map(|this| {
+                                                                    if !changed.needs_review {
+                                                                        this.right_4()
+                                                                    } else {
+                                                                        this.right_0()
+                                                                    }
+                                                                })
                                                                .bg(linear_gradient(
                                                                    90.,
                                                                    linear_color_stop(
@@ -711,29 +622,28 @@ impl Render for MessageEditor {
                        v_flex()
                            .gap_5()
                            .child({
-                                    let settings = ThemeSettings::get_global(cx);
-                                    let text_style = TextStyle {
-                                        color: cx.theme().colors().text,
-                                        font_family: settings.ui_font.family.clone(),
-                                        font_fallbacks: settings.ui_font.fallbacks.clone(),
-                                        font_features: settings.ui_font.features.clone(),
-                                        font_size: font_size.into(),
-                                        font_weight: settings.ui_font.weight,
-                                        line_height: line_height.into(),
+                                let settings = ThemeSettings::get_global(cx);
+                                let text_style = TextStyle {
+                                    color: cx.theme().colors().text,
+                                    font_family: settings.ui_font.family.clone(),
+                                    font_fallbacks: settings.ui_font.fallbacks.clone(),
+                                    font_features: settings.ui_font.features.clone(),
+                                    font_size: font_size.into(),
+                                    font_weight: settings.ui_font.weight,
+                                    line_height: line_height.into(),
+                                    ..Default::default()
+                                };
+
+                                EditorElement::new(
+                                    &self.editor,
+                                    EditorStyle {
+                                        background: editor_bg_color,
+                                        local_player: cx.theme().players().local(),
+                                        text: text_style,
+                                        syntax: cx.theme().syntax().clone(),
                                        ..Default::default()
-                                    };
-
-                                    EditorElement::new(
-                                        &self.editor,
-                                        EditorStyle {
-                                            background: editor_bg_color,
-                                            local_player: cx.theme().players().local(),
-                                            text: text_style,
-                                            syntax: cx.theme().syntax().clone(),
-                                            ..Default::default()
-                                        },
-                                    ).into_any()
-
+                                    },
+                                )
                            })
                            .child(
                                PopoverMenu::new("inline-context-picker")
@@ -765,8 +675,7 @@ impl Render for MessageEditor {
                                                .disabled(
                                                    is_editor_empty
                                                        || !is_model_selected
-                                                        || is_generating
-                                                        || self.waiting_for_summaries_to_send
+                                                        || is_generating,
                                                )
                                                .child(
                                                    h_flex()
@@ -814,61 +723,7 @@ impl Render for MessageEditor {
                                        ),
                                    ),
                            ),
-                    )
+                    ),
            )
-            .when(total_token_usage.ratio != TokenUsageRatio::Normal, |parent| {
-                parent.child(
-                    h_flex()
-                        .p_2()
-                        .gap_2()
-                        .flex_wrap()
-                        .justify_between()
-                        .bg(cx.theme().status().warning_background.opacity(0.1))
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border)
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .items_start()
-                                .child(
-                                    h_flex()
-                                        .h(line_height)
-                                        .justify_center()
-                                        .child(
-                                            Icon::new(IconName::Warning)
-                                                .color(Color::Warning)
-                                                .size(IconSize::XSmall),
-                                        ),
-                                )
-                                .child(
-                                    v_flex()
-                                        .mr_auto()
-                                        .child(Label::new("Thread reaching the token limit soon").size(LabelSize::Small))
-                                        .child(
-                                            Label::new(
-                                                "Start a new thread from a summary to continue the conversation.",
-                                            )
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                        ),
-                                ),
-                        )
-                        .child(
-                            Button::new("new-thread", "Start New Thread")
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    let from_thread_id = Some(this.thread.read(cx).id().clone());
-
-                                    window.dispatch_action(Box::new(NewThread {
-                                        from_thread_id
-                                    }), cx);
-                                }))
-                                .icon(IconName::Plus)
-                                .icon_position(IconPosition::Start)
-                                .icon_size(IconSize::Small)
-                                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                .label_size(LabelSize::Small),
-                        ),
-                )
-            })
    }
 }
--- a/crates/assistant2/src/profile_selector.rs
+++ b/crates/assistant2/src/profile_selector.rs
@@ -1,21 +1,20 @@
 use std::sync::Arc;

-use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
+use assistant_settings::{AgentProfile, AssistantSettings};
 use fs::Fs;
-use gpui::{Action, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
+use gpui::{prelude::*, Action, Entity, FocusHandle, Subscription, WeakEntity};
 use indexmap::IndexMap;
-use language_model::LanguageModelRegistry;
-use settings::{Settings as _, SettingsStore, update_settings_file};
+use settings::{update_settings_file, Settings as _, SettingsStore};
 use ui::{
-    ButtonLike, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip,
-    prelude::*,
+    prelude::*, ButtonLike, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu,
+    PopoverMenuHandle,
 };
 use util::ResultExt as _;

 use crate::{ManageProfiles, ThreadStore, ToggleProfileSelector};

 pub struct ProfileSelector {
-    profiles: IndexMap<AgentProfileId, AgentProfile>,
+    profiles: IndexMap<Arc<str>, AgentProfile>,
    fs: Arc<dyn Fs>,
    thread_store: WeakEntity<ThreadStore>,
    focus_handle: FocusHandle,
@@ -128,12 +127,7 @@ impl Render for ProfileSelector {
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let supports_tools = model_registry
-            .default_model()
-            .map_or(false, |default| default.model.supports_tools());
-
-        let icon = match profile_id.as_str() {
+        let icon = match profile_id.as_ref() {
            "write" => IconName::Pencil,
            "ask" => IconName::MessageBubbles,
            _ => IconName::UserRoundPen,
@@ -145,7 +139,7 @@ impl Render for ProfileSelector {
            .menu(move |window, cx| {
                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
            })
-            .trigger(if supports_tools {
+            .trigger(
                ButtonLike::new("profile-selector-button").child(
                    h_flex()
                        .gap_1()
@@ -170,19 +164,8 @@ impl Render for ProfileSelector {
                            )
                            .map(|kb| kb.size(rems_from_px(10.)))
                        })),
-                )
-            } else {
-                ButtonLike::new("tools-not-supported-button")
-                    .disabled(true)
-                    .child(
-                        h_flex().gap_1().child(
-                            Label::new("No Tools")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        ),
-                    )
-                    .tooltip(Tooltip::text("The current model does not support tools."))
-            })
+                ),
+            )
            .anchor(gpui::Corner::BottomLeft)
            .with_handle(self.menu_handle.clone())
    }
--- a/crates/assistant2/src/terminal_codegen.rs
+++ b/crates/assistant2/src/terminal_codegen.rs
@@ -1,10 +1,8 @@
 use crate::inline_prompt_editor::CodegenStatus;
 use client::telemetry::Telemetry;
-use futures::{SinkExt, StreamExt, channel::mpsc};
+use futures::{channel::mpsc, SinkExt, StreamExt};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, report_assistant_event,
-};
+use language_model::{report_assistant_event, LanguageModelRegistry, LanguageModelRequest};
 use std::{sync::Arc, time::Instant};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;
@@ -33,9 +31,7 @@ impl TerminalCodegen {
    }

    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };

@@ -121,10 +117,13 @@ impl TerminalCodegen {
            let result = generate.await;

            this.update(cx, |this, cx| {
-                if let Err(error) = result {
-                    this.status = CodegenStatus::Error(error);
-                } else {
-                    this.status = CodegenStatus::Done;
+                match result {
+                    Err(error) => {
+                        this.status = CodegenStatus::Error(error);
+                    }
+                    _ => {
+                        this.status = CodegenStatus::Done;
+                    }
                }
                cx.emit(CodegenEvent::Finished);
                cx.notify();
--- a/crates/assistant2/src/terminal_inline_assistant.rs
+++ b/crates/assistant2/src/terminal_inline_assistant.rs
@@ -3,18 +3,18 @@ use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{
    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
 };
-use crate::terminal_codegen::{CLEAR_INPUT, CodegenEvent, TerminalCodegen};
+use crate::terminal_codegen::{CodegenEvent, TerminalCodegen, CLEAR_INPUT};
 use crate::thread_store::ThreadStore;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
-use editor::{MultiBuffer, actions::SelectAll};
+use editor::{actions::SelectAll, MultiBuffer};
 use fs::Fs;
 use gpui::{App, Entity, Focusable, Global, Subscription, UpdateGlobal, WeakEntity};
 use language::Buffer;
 use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    Role, report_assistant_event,
+    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, Role,
 };
 use prompt_store::PromptBuilder;
 use std::sync::Arc;
@@ -22,7 +22,7 @@ use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::TerminalView;
 use ui::prelude::*;
 use util::ResultExt;
-use workspace::{Toast, Workspace, notifications::NotificationId};
+use workspace::{notifications::NotificationId, Toast, Workspace};

 pub fn init(
    fs: Arc<dyn Fs>,
@@ -75,8 +75,7 @@ impl TerminalInlineAssistant {
        let assist_id = self.next_assist_id.post_inc();
        let prompt_buffer =
            cx.new(|cx| MultiBuffer::singleton(cx.new(|cx| Buffer::local(String::new(), cx)), cx));
-        let context_store =
-            cx.new(|_cx| ContextStore::new(workspace.clone(), thread_store.clone()));
+        let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
        let codegen = cx.new(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));

        let prompt_editor = cx.new(|cx| {
@@ -165,10 +164,11 @@ impl TerminalInlineAssistant {
    }

    fn start_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        let Some(user_prompt) = assist
@@ -203,10 +203,11 @@ impl TerminalInlineAssistant {
    }

    fn stop_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
+        let assist = match self.assists.get_mut(&assist_id) {
+            Some(assist) => assist,
+            _ => {
+                return;
+            }
        };

        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
@@ -253,8 +254,7 @@ impl TerminalInlineAssistant {

        attach_context_to_message(
            &mut request_message,
-            assist.context_store.read(cx).context().iter(),
-            cx,
+            assist.context_store.read(cx).snapshot(cx),
        );

        request_message.content.push(prompt.into());
@@ -286,9 +286,7 @@ impl TerminalInlineAssistant {
                })
                .log_err();

-            if let Some(ConfiguredModel { model, .. }) =
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let codegen = assist.codegen.read(cx);
                let executor = cx.background_executor().clone();
                report_assistant_event(
@@ -406,10 +404,11 @@ impl TerminalInlineAssist {
                window.subscribe(&codegen, cx, move |codegen, event, window, cx| {
                    TerminalInlineAssistant::update_global(cx, |this, cx| match event {
                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
+                            let assist = match this.assists.get(&assist_id) {
+                                Some(assist) => assist,
+                                _ => {
+                                    return;
+                                }
                            };

                            if let CodegenStatus::Error(error) = &codegen.read(cx).status {
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -1,176 +1,52 @@
-use std::sync::Arc;
-
 use assistant_context_editor::SavedContextMetadata;
-use editor::{Editor, EditorEvent};
-use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    App, Entity, FocusHandle, Focusable, ScrollStrategy, Task, UniformListScrollHandle, WeakEntity,
-    Window, uniform_list,
+    uniform_list, App, Entity, FocusHandle, Focusable, ScrollStrategy, UniformListScrollHandle,
+    WeakEntity,
 };
 use time::{OffsetDateTime, UtcOffset};
-use ui::{HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Tooltip, prelude::*};
-use util::ResultExt;
+use ui::{prelude::*, IconButtonShape, ListItem, ListItemSpacing, Tooltip};

 use crate::history_store::{HistoryEntry, HistoryStore};
 use crate::thread_store::SerializedThreadMetadata;
 use crate::{AssistantPanel, RemoveSelectedThread};

 pub struct ThreadHistory {
+    focus_handle: FocusHandle,
    assistant_panel: WeakEntity<AssistantPanel>,
+    history_store: Entity<HistoryStore>,
    scroll_handle: UniformListScrollHandle,
    selected_index: usize,
-    search_query: SharedString,
-    search_editor: Entity<Editor>,
-    all_entries: Arc<Vec<HistoryEntry>>,
-    matches: Vec<StringMatch>,
-    _subscriptions: Vec<gpui::Subscription>,
-    _search_task: Option<Task<()>>,
 }

 impl ThreadHistory {
    pub(crate) fn new(
        assistant_panel: WeakEntity<AssistantPanel>,
        history_store: Entity<HistoryStore>,
-        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let search_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", cx);
-            editor
-        });
-
-        let search_editor_subscription = cx.subscribe_in(
-            &search_editor,
-            window,
-            |this, search_editor, event, window, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    let query = search_editor.read(cx).text(cx);
-                    this.search_query = query.into();
-                    this.update_search(window, cx);
-                }
-            },
-        );
-
-        let entries: Arc<Vec<_>> = history_store
-            .update(cx, |store, cx| store.entries(cx))
-            .into();
-
-        let history_store_subscription =
-            cx.observe_in(&history_store, window, |this, history_store, window, cx| {
-                this.all_entries = history_store
-                    .update(cx, |store, cx| store.entries(cx))
-                    .into();
-                this.matches.clear();
-                this.update_search(window, cx);
-            });
-
        Self {
+            focus_handle: cx.focus_handle(),
            assistant_panel,
+            history_store,
            scroll_handle: UniformListScrollHandle::default(),
            selected_index: 0,
-            search_query: SharedString::new_static(""),
-            all_entries: entries,
-            matches: Vec::new(),
-            search_editor,
-            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _search_task: None,
-        }
-    }
-
-    fn update_search(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self._search_task.take();
-
-        if self.has_search_query() {
-            self.perform_search(cx);
-        } else {
-            self.matches.clear();
-            self.set_selected_index(0, cx);
-            cx.notify();
-        }
-    }
-
-    fn perform_search(&mut self, cx: &mut Context<Self>) {
-        let query = self.search_query.clone();
-        let all_entries = self.all_entries.clone();
-
-        let task = cx.spawn(async move |this, cx| {
-            let executor = cx.background_executor().clone();
-
-            let matches = cx
-                .background_spawn(async move {
-                    let mut candidates = Vec::with_capacity(all_entries.len());
-
-                    for (idx, entry) in all_entries.iter().enumerate() {
-                        match entry {
-                            HistoryEntry::Thread(thread) => {
-                                candidates.push(StringMatchCandidate::new(idx, &thread.summary));
-                            }
-                            HistoryEntry::Context(context) => {
-                                candidates.push(StringMatchCandidate::new(idx, &context.title));
-                            }
-                        }
-                    }
-
-                    const MAX_MATCHES: usize = 100;
-
-                    fuzzy::match_strings(
-                        &candidates,
-                        &query,
-                        false,
-                        MAX_MATCHES,
-                        &Default::default(),
-                        executor,
-                    )
-                    .await
-                })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.matches = matches;
-                this.set_selected_index(0, cx);
-                cx.notify();
-            })
-            .log_err();
-        });
-
-        self._search_task = Some(task);
-    }
-
-    fn has_search_query(&self) -> bool {
-        !self.search_query.is_empty()
-    }
-
-    fn matched_count(&self) -> usize {
-        if self.has_search_query() {
-            self.matches.len()
-        } else {
-            self.all_entries.len()
-        }
-    }
-
-    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
-        if self.has_search_query() {
-            self.matches
-                .get(ix)
-                .and_then(|m| self.all_entries.get(m.candidate_id))
-        } else {
-            self.all_entries.get(ix)
        }
    }

    pub fn select_previous(
        &mut self,
        _: &menu::SelectPrevious,
-        _window: &mut Window,
+        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.matched_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            if self.selected_index == 0 {
-                self.set_selected_index(count - 1, cx);
+                self.set_selected_index(count - 1, window, cx);
            } else {
-                self.set_selected_index(self.selected_index - 1, cx);
+                self.set_selected_index(self.selected_index - 1, window, cx);
            }
        }
    }
@@ -178,39 +54,40 @@ impl ThreadHistory {
    pub fn select_next(
        &mut self,
        _: &menu::SelectNext,
-        _window: &mut Window,
+        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.matched_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            if self.selected_index == count - 1 {
-                self.set_selected_index(0, cx);
+                self.set_selected_index(0, window, cx);
            } else {
-                self.set_selected_index(self.selected_index + 1, cx);
+                self.set_selected_index(self.selected_index + 1, window, cx);
            }
        }
    }

-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.matched_count();
+    fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
-            self.set_selected_index(0, cx);
+            self.set_selected_index(0, window, cx);
        }
    }

-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.matched_count();
+    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
-            self.set_selected_index(count - 1, cx);
+            self.set_selected_index(count - 1, window, cx);
        }
    }

-    fn set_selected_index(&mut self, index: usize, cx: &mut Context<Self>) {
+    fn set_selected_index(&mut self, index: usize, _window: &mut Window, cx: &mut Context<Self>) {
        self.selected_index = index;
        self.scroll_handle
            .scroll_to_item(index, ScrollStrategy::Top);
@@ -218,23 +95,23 @@ impl ThreadHistory {
    }

    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry) = self.get_match(self.selected_index) {
-            let task_result = match entry {
-                HistoryEntry::Thread(thread) => self
-                    .assistant_panel
-                    .update(cx, move |this, cx| this.open_thread(&thread.id, window, cx))
-                    .ok(),
-                HistoryEntry::Context(context) => self
-                    .assistant_panel
-                    .update(cx, move |this, cx| {
-                        this.open_saved_prompt_editor(context.path.clone(), window, cx)
-                    })
-                    .ok(),
-            };
+        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));

-            if let Some(task) = task_result {
-                task.detach_and_log_err(cx);
-            };
+        if let Some(entry) = entries.get(self.selected_index) {
+            match entry {
+                HistoryEntry::Thread(thread) => {
+                    self.assistant_panel
+                        .update(cx, move |this, cx| this.open_thread(&thread.id, window, cx))
+                        .ok();
+                }
+                HistoryEntry::Context(context) => {
+                    self.assistant_panel
+                        .update(cx, move |this, cx| {
+                            this.open_saved_prompt_editor(context.path.clone(), window, cx)
+                        })
+                        .ok();
+                }
+            }

            cx.notify();
        }
@@ -243,10 +120,12 @@ impl ThreadHistory {
    fn remove_selected_thread(
        &mut self,
        _: &RemoveSelectedThread,
-        window: &mut Window,
+        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        if let Some(entry) = self.get_match(self.selected_index) {
+        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));
+
+        if let Some(entry) = entries.get(self.selected_index) {
            match entry {
                HistoryEntry::Thread(thread) => {
                    self.assistant_panel
@@ -264,117 +143,72 @@ impl ThreadHistory {
                }
            }

-            self.update_search(window, cx);
-
            cx.notify();
        }
    }
 }

 impl Focusable for ThreadHistory {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.search_editor.focus_handle(cx)
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
    }
 }

 impl Render for ThreadHistory {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let history_entries = self.history_store.update(cx, |this, cx| this.entries(cx));
        let selected_index = self.selected_index;

        v_flex()
+            .id("thread-history-container")
            .key_context("ThreadHistory")
+            .track_focus(&self.focus_handle)
+            .overflow_y_scroll()
            .size_full()
+            .p_1()
            .on_action(cx.listener(Self::select_previous))
            .on_action(cx.listener(Self::select_next))
            .on_action(cx.listener(Self::select_first))
            .on_action(cx.listener(Self::select_last))
            .on_action(cx.listener(Self::confirm))
            .on_action(cx.listener(Self::remove_selected_thread))
-            .when(!self.all_entries.is_empty(), |parent| {
-                parent.child(
-                    h_flex()
-                        .h(px(41.)) // Match the toolbar perfectly
-                        .w_full()
-                        .py_1()
-                        .px_2()
-                        .gap_2()
-                        .justify_between()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border)
-                        .child(
-                            Icon::new(IconName::MagnifyingGlass)
-                                .color(Color::Muted)
-                                .size(IconSize::Small),
-                        )
-                        .child(self.search_editor.clone()),
-                )
-            })
-            .child({
-                let view = v_flex().overflow_hidden().flex_grow();
-
-                if self.all_entries.is_empty() {
-                    view.justify_center()
+            .map(|history| {
+                if history_entries.is_empty() {
+                    history
+                        .justify_center()
                        .child(
                            h_flex().w_full().justify_center().child(
                                Label::new("You don't have any past threads yet.")
                                    .size(LabelSize::Small),
                            ),
                        )
-                } else if self.has_search_query() && self.matches.is_empty() {
-                    view.justify_center().child(
-                        h_flex().w_full().justify_center().child(
-                            Label::new("No threads match your search.").size(LabelSize::Small),
-                        ),
-                    )
                } else {
-                    view.p_1().child(
+                    history.child(
                        uniform_list(
                            cx.entity().clone(),
                            "thread-history",
-                            self.matched_count(),
+                            history_entries.len(),
                            move |history, range, _window, _cx| {
-                                let range_start = range.start;
-                                let assistant_panel = history.assistant_panel.clone();
-
-                                let render_item = |index: usize,
-                                                   entry: &HistoryEntry,
-                                                   highlight_positions: Vec<usize>|
-                                 -> Div {
-                                    h_flex().w_full().pb_1().child(match entry {
-                                        HistoryEntry::Thread(thread) => PastThread::new(
-                                            thread.clone(),
-                                            assistant_panel.clone(),
-                                            selected_index == index + range_start,
-                                            highlight_positions,
-                                        )
-                                        .into_any_element(),
-                                        HistoryEntry::Context(context) => PastContext::new(
-                                            context.clone(),
-                                            assistant_panel.clone(),
-                                            selected_index == index + range_start,
-                                            highlight_positions,
-                                        )
-                                        .into_any_element(),
-                                    })
-                                };
-
-                                if history.has_search_query() {
-                                    history.matches[range]
-                                        .iter()
-                                        .enumerate()
-                                        .filter_map(|(index, m)| {
-                                            history.all_entries.get(m.candidate_id).map(|entry| {
-                                                render_item(index, entry, m.positions.clone())
-                                            })
+                                history_entries[range]
+                                    .iter()
+                                    .enumerate()
+                                    .map(|(index, entry)| {
+                                        h_flex().w_full().pb_1().child(match entry {
+                                            HistoryEntry::Thread(thread) => PastThread::new(
+                                                thread.clone(),
+                                                history.assistant_panel.clone(),
+                                                selected_index == index,
+                                            )
+                                            .into_any_element(),
+                                            HistoryEntry::Context(context) => PastContext::new(
+                                                context.clone(),
+                                                history.assistant_panel.clone(),
+                                                selected_index == index,
+                                            )
+                                            .into_any_element(),
                                        })
-                                        .collect()
-                                } else {
-                                    history.all_entries[range]
-                                        .iter()
-                                        .enumerate()
-                                        .map(|(index, entry)| render_item(index, entry, vec![]))
-                                        .collect()
-                                }
+                                    })
+                                    .collect()
                            },
                        )
                        .track_scroll(self.scroll_handle.clone())
@@ -390,7 +224,6 @@ pub struct PastThread {
    thread: SerializedThreadMetadata,
    assistant_panel: WeakEntity<AssistantPanel>,
    selected: bool,
-    highlight_positions: Vec<usize>,
 }

 impl PastThread {
@@ -398,13 +231,11 @@ impl PastThread {
        thread: SerializedThreadMetadata,
        assistant_panel: WeakEntity<AssistantPanel>,
        selected: bool,
-        highlight_positions: Vec<usize>,
    ) -> Self {
        Self {
            thread,
            assistant_panel,
            selected,
-            highlight_positions,
        }
    }
 }
@@ -427,11 +258,9 @@ impl RenderOnce for PastThread {
            .toggle_state(self.selected)
            .spacing(ListItemSpacing::Sparse)
            .start_slot(
-                div().max_w_4_5().child(
-                    HighlightedLabel::new(summary, self.highlight_positions)
-                        .size(LabelSize::Small)
-                        .truncate(),
-                ),
+                div()
+                    .max_w_4_5()
+                    .child(Label::new(summary).size(LabelSize::Small).truncate()),
            )
            .end_slot(
                h_flex()
@@ -489,7 +318,6 @@ pub struct PastContext {
    context: SavedContextMetadata,
    assistant_panel: WeakEntity<AssistantPanel>,
    selected: bool,
-    highlight_positions: Vec<usize>,
 }

 impl PastContext {
@@ -497,13 +325,11 @@ impl PastContext {
        context: SavedContextMetadata,
        assistant_panel: WeakEntity<AssistantPanel>,
        selected: bool,
-        highlight_positions: Vec<usize>,
    ) -> Self {
        Self {
            context,
            assistant_panel,
            selected,
-            highlight_positions,
        }
    }
 }
@@ -511,6 +337,7 @@ impl PastContext {
 impl RenderOnce for PastContext {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
        let summary = self.context.title;
+
        let context_timestamp = time_format::format_localized_timestamp(
            OffsetDateTime::from_unix_timestamp(self.context.mtime.timestamp()).unwrap(),
            OffsetDateTime::now_utc(),
@@ -527,11 +354,9 @@ impl RenderOnce for PastContext {
        .toggle_state(self.selected)
        .spacing(ListItemSpacing::Sparse)
        .start_slot(
-            div().max_w_4_5().child(
-                HighlightedLabel::new(summary, self.highlight_positions)
-                    .size(LabelSize::Small)
-                    .truncate(),
-            ),
+            div()
+                .max_w_4_5()
+                .child(Label::new(summary).size(LabelSize::Small).truncate()),
        )
        .end_slot(
            h_flex()
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -2,31 +2,28 @@ use std::borrow::Cow;
 use std::path::PathBuf;
 use std::sync::Arc;

-use anyhow::{Result, anyhow};
-use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
+use anyhow::{anyhow, Result};
+use assistant_settings::{AgentProfile, AssistantSettings};
 use assistant_tool::{ToolId, ToolSource, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
 use context_server::manager::ContextServerManager;
 use context_server::{ContextServerFactoryRegistry, ContextServerTool};
-use futures::FutureExt as _;
 use futures::future::{self, BoxFuture, Shared};
+use futures::FutureExt as _;
 use gpui::{
-    App, BackgroundExecutor, Context, Entity, Global, ReadGlobal, SharedString, Subscription, Task,
-    prelude::*,
+    prelude::*, App, BackgroundExecutor, Context, Entity, Global, ReadGlobal, SharedString, Task,
 };
-use heed::Database;
 use heed::types::SerdeBincode;
+use heed::Database;
 use language_model::{LanguageModelToolUseId, Role, TokenUsage};
 use project::Project;
 use prompt_store::PromptBuilder;
 use serde::{Deserialize, Serialize};
-use settings::{Settings as _, SettingsStore};
+use settings::Settings as _;
 use util::ResultExt as _;

-use crate::thread::{
-    DetailedSummaryState, MessageId, ProjectSnapshot, Thread, ThreadEvent, ThreadId,
-};
+use crate::thread::{MessageId, ProjectSnapshot, Thread, ThreadEvent, ThreadId};

 pub fn init(cx: &mut App) {
    ThreadsDatabase::init(cx);
@@ -39,7 +36,6 @@ pub struct ThreadStore {
    context_server_manager: Entity<ContextServerManager>,
    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SerializedThreadMetadata>,
-    _subscriptions: Vec<Subscription>,
 }

 impl ThreadStore {
@@ -54,10 +50,6 @@ impl ThreadStore {
            let context_server_manager = cx.new(|cx| {
                ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
            });
-            let settings_subscription =
-                cx.observe_global::<SettingsStore>(move |this: &mut Self, cx| {
-                    this.load_default_profile(cx);
-                });

            let this = Self {
                project,
@@ -66,7 +58,6 @@ impl ThreadStore {
                context_server_manager,
                context_server_tool_ids: HashMap::default(),
                threads: Vec::new(),
-                _subscriptions: vec![settings_subscription],
            };
            this.load_default_profile(cx);
            this.register_context_server_handlers(cx);
@@ -202,15 +193,15 @@ impl ThreadStore {
        self.load_profile_by_id(&assistant_settings.default_profile, cx);
    }

-    pub fn load_profile_by_id(&self, profile_id: &AgentProfileId, cx: &Context<Self>) {
+    pub fn load_profile_by_id(&self, profile_id: &Arc<str>, cx: &Context<Self>) {
        let assistant_settings = AssistantSettings::get_global(cx);

        if let Some(profile) = assistant_settings.profiles.get(profile_id) {
-            self.load_profile(profile, cx);
+            self.load_profile(profile);
        }
    }

-    pub fn load_profile(&self, profile: &AgentProfile, cx: &Context<Self>) {
+    pub fn load_profile(&self, profile: &AgentProfile) {
        self.tools.disable_all_tools();
        self.tools.enable(
            ToolSource::Native,
@@ -221,28 +212,17 @@ impl ThreadStore {
                .collect::<Vec<_>>(),
        );

-        if profile.enable_all_context_servers {
-            for context_server in self.context_server_manager.read(cx).all_servers() {
-                self.tools.enable_source(
-                    ToolSource::ContextServer {
-                        id: context_server.id().into(),
-                    },
-                    cx,
-                );
-            }
-        } else {
-            for (context_server_id, preset) in &profile.context_servers {
-                self.tools.enable(
-                    ToolSource::ContextServer {
-                        id: context_server_id.clone().into(),
-                    },
-                    &preset
-                        .tools
-                        .iter()
-                        .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
-                        .collect::<Vec<_>>(),
-                )
-            }
+        for (context_server_id, preset) in &profile.context_servers {
+            self.tools.enable(
+                ToolSource::ContextServer {
+                    id: context_server_id.clone().into(),
+                },
+                &preset
+                    .tools
+                    .iter()
+                    .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
+                    .collect::<Vec<_>>(),
+            )
        }
    }

@@ -293,9 +273,8 @@ impl ThreadStore {
                                        })
                                        .collect::<Vec<_>>();

-                                    this.update(cx, |this, cx| {
+                                    this.update(cx, |this, _cx| {
                                        this.context_server_tool_ids.insert(server_id, tool_ids);
-                                        this.load_default_profile(cx);
                                    })
                                    .log_err();
                                }
@@ -308,7 +287,6 @@ impl ThreadStore {
            context_server::manager::Event::ServerStopped { server_id } => {
                if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
                    tool_working_set.remove(&tool_ids);
-                    self.load_default_profile(cx);
                }
            }
        }
@@ -322,7 +300,7 @@ pub struct SerializedThreadMetadata {
    pub updated_at: DateTime<Utc>,
 }

-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct SerializedThread {
    pub version: String,
    pub summary: SharedString,
@@ -332,8 +310,6 @@ pub struct SerializedThread {
    pub initial_project_snapshot: Option<Arc<ProjectSnapshot>>,
    #[serde(default)]
    pub cumulative_token_usage: TokenUsage,
-    #[serde(default)]
-    pub detailed_summary_state: DetailedSummaryState,
 }

 impl SerializedThread {
@@ -374,8 +350,6 @@ pub struct SerializedMessage {
    pub tool_uses: Vec<SerializedToolUse>,
    #[serde(default)]
    pub tool_results: Vec<SerializedToolResult>,
-    #[serde(default)]
-    pub context: String,
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -419,7 +393,6 @@ impl LegacySerializedThread {
            messages: self.messages.into_iter().map(|msg| msg.upgrade()).collect(),
            initial_project_snapshot: self.initial_project_snapshot,
            cumulative_token_usage: TokenUsage::default(),
-            detailed_summary_state: DetailedSummaryState::default(),
        }
    }
 }
@@ -443,7 +416,6 @@ impl LegacySerializedMessage {
            segments: vec![SerializedMessageSegment::Text { text: self.text }],
            tool_uses: self.tool_uses,
            tool_results: self.tool_results,
-            context: String::new(),
        }
    }
 }
--- a/crates/assistant2/src/tool_use.rs
+++ b/crates/assistant2/src/tool_use.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use anyhow::Result;
 use assistant_tool::{Tool, ToolWorkingSet};
 use collections::HashMap;
-use futures::FutureExt as _;
 use futures::future::Shared;
+use futures::FutureExt as _;
 use gpui::{App, SharedString, Task};
 use language_model::{
    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
@@ -43,8 +43,6 @@ pub struct ToolUseState {
    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
 }

-pub const USING_TOOL_MARKER: &str = "<using_tool>";
-
 impl ToolUseState {
    pub fn new(tools: Arc<ToolWorkingSet>) -> Self {
        Self {
@@ -115,7 +113,6 @@ impl ToolUseState {
                                tool_use_id.clone(),
                                LanguageModelToolResult {
                                    tool_use_id,
-                                    tool_name: tool_use.clone(),
                                    is_error: tool_result.is_error,
                                    content: tool_result.content.clone(),
                                },
@@ -137,7 +134,6 @@ impl ToolUseState {
                tool_use_id.clone(),
                LanguageModelToolResult {
                    tool_use_id,
-                    tool_name: tool_use.name.clone(),
                    content: "Tool canceled by user".into(),
                    is_error: true,
                },
@@ -170,8 +166,8 @@ impl ToolUseState {
                    };
                }

-                if let Some(pending_tool_use) = self.pending_tool_uses_by_id.get(&tool_use.id) {
-                    match pending_tool_use.status {
+                match self.pending_tool_uses_by_id.get(&tool_use.id) {
+                    Some(pending_tool_use) => match pending_tool_use.status {
                        PendingToolUseStatus::Idle => ToolUseStatus::Pending,
                        PendingToolUseStatus::NeedsConfirmation { .. } => {
                            ToolUseStatus::NeedsConfirmation
@@ -180,17 +176,14 @@ impl ToolUseState {
                        PendingToolUseStatus::Error(ref err) => {
                            ToolUseStatus::Error(err.clone().into())
                        }
-                    }
-                } else {
-                    ToolUseStatus::Pending
+                    },
+                    _ => ToolUseStatus::Pending,
                }
            })();

-            let (icon, needs_confirmation) = if let Some(tool) = self.tools.tool(&tool_use.name, cx)
-            {
-                (tool.icon(), tool.needs_confirmation())
-            } else {
-                (IconName::Cog, false)
+            let (icon, needs_confirmation) = match self.tools.tool(&tool_use.name, cx) {
+                Some(tool) => (tool.icon(), tool.needs_confirmation()),
+                _ => (IconName::Cog, false),
            };

            tool_uses.push(ToolUse {
@@ -213,10 +206,9 @@ impl ToolUseState {
        input: &serde_json::Value,
        cx: &App,
    ) -> SharedString {
-        if let Some(tool) = self.tools.tool(tool_name, cx) {
-            tool.ui_text(input).into()
-        } else {
-            format!("Unknown tool {tool_name:?}").into()
+        match self.tools.tool(tool_name, cx) {
+            Some(tool) => tool.ui_text(input).into(),
+            _ => format!("Unknown tool {tool_name:?}").into(),
        }
    }

@@ -317,7 +309,6 @@ impl ToolUseState {
    pub fn insert_tool_output(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
-        tool_name: Arc<str>,
        output: Result<String>,
    ) -> Option<PendingToolUse> {
        match output {
@@ -326,7 +317,6 @@ impl ToolUseState {
                    tool_use_id.clone(),
                    LanguageModelToolResult {
                        tool_use_id: tool_use_id.clone(),
-                        tool_name,
                        content: tool_result.into(),
                        is_error: false,
                    },
@@ -338,7 +328,6 @@ impl ToolUseState {
                    tool_use_id.clone(),
                    LanguageModelToolResult {
                        tool_use_id: tool_use_id.clone(),
-                        tool_name,
                        content: err.to_string().into(),
                        is_error: true,
                    },
@@ -359,28 +348,8 @@ 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
@@ -406,7 +375,6 @@ impl ToolUseState {
                    request_message.content.push(MessageContent::ToolResult(
                        LanguageModelToolResult {
                            tool_use_id: tool_use_id.clone(),
-                            tool_name: tool_result.tool_name.clone(),
                            is_error: tool_result.is_error,
                            content: if tool_result.content.is_empty() {
                                // Surprisingly, the API fails if we return an empty string here.
--- a/crates/assistant2/src/ui.rs
+++ b/crates/assistant2/src/ui.rs
--- a/crates/assistant2/src/ui/agent_notification.rs
+++ b/crates/assistant2/src/ui/agent_notification.rs
@@ -1,12 +1,12 @@
 use gpui::{
-    App, Context, EventEmitter, IntoElement, PlatformDisplay, Size, Window,
-    WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind, WindowOptions,
-    linear_color_stop, linear_gradient, point,
+    linear_color_stop, linear_gradient, point, App, Context, EventEmitter, IntoElement,
+    PlatformDisplay, Size, Window, WindowBackgroundAppearance, WindowBounds, WindowDecorations,
+    WindowKind, WindowOptions,
 };
 use release_channel::ReleaseChannel;
 use std::rc::Rc;
 use theme;
-use ui::{Render, prelude::*};
+use ui::{prelude::*, Render};

 pub struct AgentNotification {
    title: SharedString,
@@ -118,13 +118,12 @@ impl Render for AgentNotification {
                    )
                    .child(
                        v_flex()
-                            .flex_1()
-                            .max_w(px(300.))
                            .child(
                                div()
                                    .relative()
                                    .text_size(px(14.))
                                    .text_color(cx.theme().colors().text)
+                                    .max_w(px(300.))
                                    .truncate()
                                    .child(self.title.clone())
                                    .child(gradient_overflow()),
@@ -134,6 +133,7 @@ impl Render for AgentNotification {
                                    .relative()
                                    .text_size(px(12.))
                                    .text_color(cx.theme().colors().text_muted)
+                                    .max_w(px(340.))
                                    .truncate()
                                    .child(self.caption.clone())
                                    .child(gradient_overflow()),
--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -1,16 +1,14 @@
-use std::{rc::Rc, time::Duration};
+use std::rc::Rc;

-use file_icons::FileIcons;
 use gpui::ClickEvent;
-use gpui::{Animation, AnimationExt as _, pulsating_between};
-use ui::{IconButtonShape, Tooltip, prelude::*};
+use ui::{prelude::*, IconButtonShape, Tooltip};

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

 #[derive(IntoElement)]
 pub enum ContextPill {
    Added {
-        context: AddedContext,
+        context: ContextSnapshot,
        dupe_name: bool,
        focused: bool,
        on_click: Option<Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>>,
@@ -27,7 +25,7 @@ pub enum ContextPill {

 impl ContextPill {
    pub fn added(
-        context: AddedContext,
+        context: ContextSnapshot,
        dupe_name: bool,
        focused: bool,
        on_remove: Option<Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>>,
@@ -79,21 +77,17 @@ impl ContextPill {

    pub fn icon(&self) -> Icon {
        match self {
+            Self::Added { context, .. } => match &context.icon_path {
+                Some(icon_path) => Icon::from_path(icon_path),
+                None => Icon::new(context.kind.icon()),
+            },
            Self::Suggested {
                icon_path: Some(icon_path),
                ..
-            }
-            | Self::Added {
-                context:
-                    AddedContext {
-                        icon_path: Some(icon_path),
-                        ..
-                    },
-                ..
            } => Icon::from_path(icon_path),
-            Self::Suggested { kind, .. }
-            | Self::Added {
-                context: AddedContext { kind, .. },
+            Self::Suggested {
+                kind,
+                icon_path: None,
                ..
            } => Icon::new(kind.icon()),
        }
@@ -150,7 +144,7 @@ impl RenderOnce for ContextPill {
                                element
                            }
                        })
-                        .when_some(context.tooltip.as_ref(), |element, tooltip| {
+                        .when_some(context.tooltip.clone(), |element, tooltip| {
                            element.tooltip(Tooltip::text(tooltip.clone()))
                        }),
                )
@@ -171,22 +165,6 @@ impl RenderOnce for ContextPill {
                    element
                        .cursor_pointer()
                        .on_click(move |event, window, cx| on_click(event, window, cx))
-                })
-                .map(|element| {
-                    if context.summarizing {
-                        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,
@@ -237,105 +215,7 @@ impl RenderOnce for ContextPill {
                .when_some(on_click.as_ref(), |element, on_click| {
                    let on_click = on_click.clone();
                    element.on_click(move |event, window, cx| on_click(event, window, cx))
-                })
-                .into_any(),
-        }
-    }
-}
-
-pub struct AddedContext {
-    pub id: ContextId,
-    pub kind: ContextKind,
-    pub name: SharedString,
-    pub parent: Option<SharedString>,
-    pub tooltip: Option<SharedString>,
-    pub icon_path: Option<SharedString>,
-    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.file.full_path(cx);
-                let full_path_string: SharedString =
-                    full_path.to_string_lossy().into_owned().into();
-                let name = full_path
-                    .file_name()
-                    .map(|n| n.to_string_lossy().into_owned().into())
-                    .unwrap_or_else(|| full_path_string.clone());
-                let parent = full_path
-                    .parent()
-                    .and_then(|p| p.file_name())
-                    .map(|n| n.to_string_lossy().into_owned().into());
-                AddedContext {
-                    id: file_context.id,
-                    kind: ContextKind::File,
-                    name,
-                    parent,
-                    tooltip: Some(full_path_string),
-                    icon_path: FileIcons::get_icon(&full_path, cx),
-                    summarizing: false,
-                }
-            }
-
-            AssistantContext::Directory(directory_context) => {
-                // TODO: handle worktree disambiguation. Maybe by storing an `Arc<dyn File>` to also
-                // handle renames?
-                let full_path = &directory_context.project_path.path;
-                let full_path_string: SharedString =
-                    full_path.to_string_lossy().into_owned().into();
-                let name = full_path
-                    .file_name()
-                    .map(|n| n.to_string_lossy().into_owned().into())
-                    .unwrap_or_else(|| full_path_string.clone());
-                let parent = full_path
-                    .parent()
-                    .and_then(|p| p.file_name())
-                    .map(|n| n.to_string_lossy().into_owned().into());
-                AddedContext {
-                    id: directory_context.id,
-                    kind: ContextKind::Directory,
-                    name,
-                    parent,
-                    tooltip: Some(full_path_string),
-                    icon_path: None,
-                    summarizing: false,
-                }
-            }
-
-            AssistantContext::Symbol(symbol_context) => AddedContext {
-                id: symbol_context.id,
-                kind: ContextKind::Symbol,
-                name: symbol_context.context_symbol.id.name.clone(),
-                parent: None,
-                tooltip: None,
-                icon_path: None,
-                summarizing: false,
-            },
-
-            AssistantContext::FetchedUrl(fetched_url_context) => AddedContext {
-                id: fetched_url_context.id,
-                kind: ContextKind::FetchedUrl,
-                name: fetched_url_context.url.clone(),
-                parent: None,
-                tooltip: None,
-                icon_path: None,
-                summarizing: false,
-            },
-
-            AssistantContext::Thread(thread_context) => AddedContext {
-                id: thread_context.id,
-                kind: ContextKind::Thread,
-                name: thread_context.summary(cx),
-                parent: None,
-                tooltip: None,
-                icon_path: None,
-                summarizing: thread_context
-                    .thread
-                    .read(cx)
-                    .is_generating_detailed_summary(),
-            },
+                }),
        }
    }
 }
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -54,7 +54,6 @@ ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 language_model = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -2,7 +2,7 @@
 mod context_tests;

 use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use assistant_slash_command::{
    SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
    SlashCommandResult, SlashCommandWorkingSet,
@@ -12,17 +12,17 @@ use client::{self, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::{HashMap, HashSet};
 use fs::{Fs, RemoveOptions};
-use futures::{FutureExt, StreamExt, future::Shared};
+use futures::{future::Shared, FutureExt, StreamExt};
 use gpui::{
    App, AppContext as _, Context, Entity, EventEmitter, RenderImage, SharedString, Subscription,
    Task,
 };
 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use language_model::{
-    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
-    LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
-    Role, StopReason, report_assistant_event,
+    report_assistant_event, LanguageModel, LanguageModelCacheConfiguration,
+    LanguageModelCompletionEvent, LanguageModelImage, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, LanguageModelToolUseId, MaxMonthlySpendReachedError,
+    MessageContent, PaymentRequiredError, Role, StopReason,
 };
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
@@ -31,7 +31,7 @@ use prompt_store::PromptBuilder;
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{
-    cmp::{Ordering, max},
+    cmp::{max, Ordering},
    fmt::Debug,
    iter, mem,
    ops::Range,
@@ -43,7 +43,7 @@ use std::{
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use text::{BufferSnapshot, ToPoint};
 use ui::IconName;
-use util::{ResultExt, TryFutureExt, post_inc};
+use util::{post_inc, ResultExt, TryFutureExt};
 use uuid::Uuid;

 #[derive(Clone, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
@@ -1272,7 +1272,7 @@ impl AssistantContext {
        // Assume it will be a Chat request, even though that takes fewer tokens (and risks going over the limit),
        // because otherwise you see in the UI that your empty message has a bunch of tokens already used.
        let request = self.to_completion_request(RequestType::Chat, cx);
-        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };
        let debounce = self.token_count.is_some();
@@ -1284,12 +1284,10 @@ impl AssistantContext {
                        .await;
                }

-                let token_count = cx
-                    .update(|cx| model.model.count_tokens(request, cx))?
-                    .await?;
+                let token_count = cx.update(|cx| model.count_tokens(request, cx))?.await?;
                this.update(cx, |this, cx| {
                    this.token_count = Some(token_count);
-                    this.start_cache_warming(&model.model, cx);
+                    this.start_cache_warming(&model, cx);
                    cx.notify()
                })
            }
@@ -1879,15 +1877,18 @@ impl AssistantContext {

        if let Some(mut pending_patch) = pending_patch {
            let patch_start = pending_patch.range.start.to_offset(buffer);
-            if let Some(message) = self.message_for_offset(patch_start, cx) {
-                if message.anchor_range.end == text::Anchor::MAX {
-                    pending_patch.range.end = text::Anchor::MAX;
-                } else {
-                    let message_end = buffer.anchor_after(message.offset_range.end - 1);
-                    pending_patch.range.end = message_end;
+            match self.message_for_offset(patch_start, cx) {
+                Some(message) => {
+                    if message.anchor_range.end == text::Anchor::MAX {
+                        pending_patch.range.end = text::Anchor::MAX;
+                    } else {
+                        let message_end = buffer.anchor_after(message.offset_range.end - 1);
+                        pending_patch.range.end = message_end;
+                    }
+                }
+                _ => {
+                    pending_patch.range.end = text::Anchor::MAX;
                }
-            } else {
-                pending_patch.range.end = text::Anchor::MAX;
            }

            new_patches.push(pending_patch);
@@ -2306,16 +2307,14 @@ impl AssistantContext {
        cx: &mut Context<Self>,
    ) -> Option<MessageAnchor> {
        let model_registry = LanguageModelRegistry::read_global(cx);
-        let model = model_registry.default_model()?;
+        let provider = model_registry.active_provider()?;
+        let model = model_registry.active_model()?;
        let last_message_id = self.get_last_valid_message_id(cx)?;

-        if !model.provider.is_authenticated(cx) {
+        if !provider.is_authenticated(cx) {
            log::info!("completion provider has no credentials");
            return None;
        }
-
-        let model = model.model;
-
        // Compute which messages to cache, including the last one.
        self.mark_cache_anchors(&model.cache_configuration(), false, cx);

@@ -2457,7 +2456,7 @@ impl AssistantContext {
                let result = stream_completion.await;

                this.update(cx, |this, cx| {
-                    let error_message = if let Some(error) = result.as_ref().err() {
+                    let error_message = match result.as_ref().err() { Some(error) => {
                        if error.is::<PaymentRequiredError>() {
                            cx.emit(ContextEvent::ShowPaymentRequiredError);
                            this.update_metadata(assistant_message_id, cx, |metadata| {
@@ -2485,12 +2484,12 @@ impl AssistantContext {
                            });
                            Some(error_message)
                        }
-                    } else {
+                    } _ => {
                        this.update_metadata(assistant_message_id, cx, |metadata| {
                            metadata.status = MessageStatus::Done;
                        });
                        None
-                    };
+                    }};

                    let language_name = this
                        .buffer
@@ -2635,15 +2634,16 @@ impl AssistantContext {
    }

    pub fn cancel_last_assist(&mut self, cx: &mut Context<Self>) -> bool {
-        if let Some(pending_completion) = self.pending_completions.pop() {
-            self.update_metadata(pending_completion.assistant_message_id, cx, |metadata| {
-                if metadata.status == MessageStatus::Pending {
-                    metadata.status = MessageStatus::Canceled;
-                }
-            });
-            true
-        } else {
-            false
+        match self.pending_completions.pop() {
+            Some(pending_completion) => {
+                self.update_metadata(pending_completion.assistant_message_id, cx, |metadata| {
+                    if metadata.status == MessageStatus::Pending {
+                        metadata.status = MessageStatus::Canceled;
+                    }
+                });
+                true
+            }
+            _ => false,
        }
    }

@@ -2803,121 +2803,123 @@ impl AssistantContext {
    ) -> (Option<MessageAnchor>, Option<MessageAnchor>) {
        let start_message = self.message_for_offset(range.start, cx);
        let end_message = self.message_for_offset(range.end, cx);
-        if let Some((start_message, end_message)) = start_message.zip(end_message) {
-            // Prevent splitting when range spans multiple messages.
-            if start_message.id != end_message.id {
-                return (None, None);
-            }
-
-            let message = start_message;
-            let role = message.role;
-            let mut edited_buffer = false;
-
-            let mut suffix_start = None;
-
-            // TODO: why did this start panicking?
-            if range.start > message.offset_range.start
-                && range.end < message.offset_range.end.saturating_sub(1)
-            {
-                if self.buffer.read(cx).chars_at(range.end).next() == Some('\n') {
-                    suffix_start = Some(range.end + 1);
-                } else if self.buffer.read(cx).reversed_chars_at(range.end).next() == Some('\n') {
-                    suffix_start = Some(range.end);
+        match start_message.zip(end_message) {
+            Some((start_message, end_message)) => {
+                // Prevent splitting when range spans multiple messages.
+                if start_message.id != end_message.id {
+                    return (None, None);
                }
-            }

-            let version = self.version.clone();
-            let suffix = if let Some(suffix_start) = suffix_start {
-                MessageAnchor {
-                    id: MessageId(self.next_timestamp()),
-                    start: self.buffer.read(cx).anchor_before(suffix_start),
-                }
-            } else {
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.edit([(range.end..range.end, "\n")], None, cx);
-                });
-                edited_buffer = true;
-                MessageAnchor {
-                    id: MessageId(self.next_timestamp()),
-                    start: self.buffer.read(cx).anchor_before(range.end + 1),
-                }
-            };
+                let message = start_message;
+                let role = message.role;
+                let mut edited_buffer = false;

-            let suffix_metadata = MessageMetadata {
-                role,
-                status: MessageStatus::Done,
-                timestamp: suffix.id.0,
-                cache: None,
-            };
-            self.insert_message(suffix.clone(), suffix_metadata.clone(), cx);
-            self.push_op(
-                ContextOperation::InsertMessage {
-                    anchor: suffix.clone(),
-                    metadata: suffix_metadata,
-                    version,
-                },
-                cx,
-            );
+                let mut suffix_start = None;

-            let new_messages =
-                if range.start == range.end || range.start == message.offset_range.start {
-                    (None, Some(suffix))
-                } else {
-                    let mut prefix_end = None;
-                    if range.start > message.offset_range.start
-                        && range.end < message.offset_range.end - 1
+                // TODO: why did this start panicking?
+                if range.start > message.offset_range.start
+                    && range.end < message.offset_range.end.saturating_sub(1)
+                {
+                    if self.buffer.read(cx).chars_at(range.end).next() == Some('\n') {
+                        suffix_start = Some(range.end + 1);
+                    } else if self.buffer.read(cx).reversed_chars_at(range.end).next() == Some('\n')
                    {
-                        if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
-                            prefix_end = Some(range.start + 1);
-                        } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
-                            == Some('\n')
-                        {
-                            prefix_end = Some(range.start);
-                        }
+                        suffix_start = Some(range.end);
                    }
+                }

-                    let version = self.version.clone();
-                    let selection = if let Some(prefix_end) = prefix_end {
-                        MessageAnchor {
-                            id: MessageId(self.next_timestamp()),
-                            start: self.buffer.read(cx).anchor_before(prefix_end),
-                        }
-                    } else {
-                        self.buffer.update(cx, |buffer, cx| {
-                            buffer.edit([(range.start..range.start, "\n")], None, cx)
-                        });
-                        edited_buffer = true;
-                        MessageAnchor {
-                            id: MessageId(self.next_timestamp()),
-                            start: self.buffer.read(cx).anchor_before(range.end + 1),
-                        }
-                    };
-
-                    let selection_metadata = MessageMetadata {
-                        role,
-                        status: MessageStatus::Done,
-                        timestamp: selection.id.0,
-                        cache: None,
-                    };
-                    self.insert_message(selection.clone(), selection_metadata.clone(), cx);
-                    self.push_op(
-                        ContextOperation::InsertMessage {
-                            anchor: selection.clone(),
-                            metadata: selection_metadata,
-                            version,
-                        },
-                        cx,
-                    );
-
-                    (Some(selection), Some(suffix))
+                let version = self.version.clone();
+                let suffix = if let Some(suffix_start) = suffix_start {
+                    MessageAnchor {
+                        id: MessageId(self.next_timestamp()),
+                        start: self.buffer.read(cx).anchor_before(suffix_start),
+                    }
+                } else {
+                    self.buffer.update(cx, |buffer, cx| {
+                        buffer.edit([(range.end..range.end, "\n")], None, cx);
+                    });
+                    edited_buffer = true;
+                    MessageAnchor {
+                        id: MessageId(self.next_timestamp()),
+                        start: self.buffer.read(cx).anchor_before(range.end + 1),
+                    }
                };

-            if !edited_buffer {
-                cx.emit(ContextEvent::MessagesEdited);
+                let suffix_metadata = MessageMetadata {
+                    role,
+                    status: MessageStatus::Done,
+                    timestamp: suffix.id.0,
+                    cache: None,
+                };
+                self.insert_message(suffix.clone(), suffix_metadata.clone(), cx);
+                self.push_op(
+                    ContextOperation::InsertMessage {
+                        anchor: suffix.clone(),
+                        metadata: suffix_metadata,
+                        version,
+                    },
+                    cx,
+                );
+
+                let new_messages =
+                    if range.start == range.end || range.start == message.offset_range.start {
+                        (None, Some(suffix))
+                    } else {
+                        let mut prefix_end = None;
+                        if range.start > message.offset_range.start
+                            && range.end < message.offset_range.end - 1
+                        {
+                            if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
+                                prefix_end = Some(range.start + 1);
+                            } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
+                                == Some('\n')
+                            {
+                                prefix_end = Some(range.start);
+                            }
+                        }
+
+                        let version = self.version.clone();
+                        let selection = if let Some(prefix_end) = prefix_end {
+                            MessageAnchor {
+                                id: MessageId(self.next_timestamp()),
+                                start: self.buffer.read(cx).anchor_before(prefix_end),
+                            }
+                        } else {
+                            self.buffer.update(cx, |buffer, cx| {
+                                buffer.edit([(range.start..range.start, "\n")], None, cx)
+                            });
+                            edited_buffer = true;
+                            MessageAnchor {
+                                id: MessageId(self.next_timestamp()),
+                                start: self.buffer.read(cx).anchor_before(range.end + 1),
+                            }
+                        };
+
+                        let selection_metadata = MessageMetadata {
+                            role,
+                            status: MessageStatus::Done,
+                            timestamp: selection.id.0,
+                            cache: None,
+                        };
+                        self.insert_message(selection.clone(), selection_metadata.clone(), cx);
+                        self.push_op(
+                            ContextOperation::InsertMessage {
+                                anchor: selection.clone(),
+                                metadata: selection_metadata,
+                                version,
+                            },
+                            cx,
+                        );
+
+                        (Some(selection), Some(suffix))
+                    };
+
+                if !edited_buffer {
+                    cx.emit(ContextEvent::MessagesEdited);
+                }
+                new_messages
            }
-            new_messages
-        } else {
-            (None, None)
+            _ => (None, None),
        }
    }

@@ -2944,12 +2946,15 @@ impl AssistantContext {
    }

    pub fn summarize(&mut self, replace_old: bool, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
+        let Some(provider) = LanguageModelRegistry::read_global(cx).active_provider() else {
+            return;
+        };
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };

        if replace_old || (self.message_anchors.len() >= 2 && self.summary.is_none()) {
-            if !model.provider.is_authenticated(cx) {
+            if !provider.is_authenticated(cx) {
                return;
            }

@@ -2965,7 +2970,7 @@ impl AssistantContext {

            self.pending_summary = cx.spawn(async move |this, cx| {
                async move {
-                    let stream = model.model.stream_completion_text(request, &cx);
+                    let stream = model.stream_completion_text(request, &cx);
                    let mut messages = stream.await?;

                    let mut replaced = !replace_old;
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -14,7 +14,7 @@ use futures::{
    channel::mpsc,
    stream::{self, StreamExt},
 };
-use gpui::{App, Entity, SharedString, Task, TestAppContext, WeakEntity, prelude::*};
+use gpui::{prelude::*, App, Entity, SharedString, Task, TestAppContext, WeakEntity};
 use language::{Buffer, BufferSnapshot, LanguageRegistry, LspAdapterDelegate};
 use language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Role};
 use parking_lot::Mutex;
@@ -30,14 +30,14 @@ use std::{
    ops::Range,
    path::Path,
    rc::Rc,
-    sync::{Arc, atomic::AtomicBool},
+    sync::{atomic::AtomicBool, Arc},
 };
-use text::{OffsetRangeExt as _, ReplicaId, ToOffset, network::Network};
+use text::{network::Network, OffsetRangeExt as _, ReplicaId, ToOffset};
 use ui::{IconName, Window};
 use unindent::Unindent;
 use util::{
-    RandomCharIter,
    test::{generate_marked_text, marked_text_ranges},
+    RandomCharIter,
 };
 use workspace::Workspace;

--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -2,36 +2,36 @@ use anyhow::Result;
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
 use assistant_slash_commands::{
-    DefaultSlashCommand, DocsSlashCommand, DocsSlashCommandArgs, FileSlashCommand,
-    selections_creases,
+    selections_creases, DefaultSlashCommand, DocsSlashCommand, DocsSlashCommandArgs,
+    FileSlashCommand,
 };
 use client::{proto, zed_urls};
-use collections::{BTreeSet, HashMap, HashSet, hash_map};
+use collections::{hash_map, BTreeSet, HashMap, HashSet};
 use editor::{
-    Anchor, Editor, EditorEvent, MenuInlineCompletionsPolicy, ProposedChangeLocation,
-    ProposedChangesEditor, RowExt, ToOffset as _, ToPoint,
    actions::{FoldAt, MoveToEndOfLine, Newline, ShowCompletions, UnfoldAt},
    display_map::{
        BlockContext, BlockId, BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata,
        CustomBlockId, FoldId, RenderBlock, ToDisplayPoint,
    },
    scroll::Autoscroll,
+    Anchor, Editor, EditorEvent, MenuInlineCompletionsPolicy, ProposedChangeLocation,
+    ProposedChangesEditor, RowExt, ToOffset as _, ToPoint,
 };
-use editor::{FoldPlaceholder, display_map::CreaseId};
+use editor::{display_map::CreaseId, FoldPlaceholder};
 use fs::Fs;
 use futures::FutureExt;
 use gpui::{
-    Animation, AnimationExt, AnyElement, AnyView, App, AsyncWindowContext, ClipboardEntry,
+    actions, div, img, impl_internal_actions, percentage, point, prelude::*, pulsating_between,
+    size, Animation, AnimationExt, AnyElement, AnyView, App, AsyncWindowContext, ClipboardEntry,
    ClipboardItem, CursorStyle, Empty, Entity, EventEmitter, FocusHandle, Focusable, FontWeight,
    Global, InteractiveElement, IntoElement, ParentElement, Pixels, Render, RenderImage,
    SharedString, Size, StatefulInteractiveElement, Styled, Subscription, Task, Transformation,
-    WeakEntity, actions, div, img, impl_internal_actions, percentage, point, prelude::*,
-    pulsating_between, size,
+    WeakEntity,
 };
 use indexed_docs::IndexedDocsStore;
 use language::{
+    language_settings::{all_language_settings, SoftWrap},
    BufferSnapshot, LspAdapterDelegate, ToOffset,
-    language_settings::{SoftWrap, all_language_settings},
 };
 use language_model::{
    LanguageModelImage, LanguageModelProvider, LanguageModelProviderTosView, LanguageModelRegistry,
@@ -46,33 +46,33 @@ use project::lsp_store::LocalLspAdapterDelegate;
 use project::{Project, Worktree};
 use rope::Point;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore, update_settings_file};
+use settings::{update_settings_file, Settings, SettingsStore};
 use std::{any::TypeId, borrow::Cow, cmp, ops::Range, path::PathBuf, sync::Arc, time::Duration};
 use text::SelectionGoal;
 use ui::{
-    ButtonLike, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle, TintColor, Tooltip,
-    prelude::*,
+    prelude::*, ButtonLike, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle, TintColor,
+    Tooltip,
 };
-use util::{ResultExt, maybe};
+use util::{maybe, ResultExt};
 use workspace::searchable::{Direction, SearchableItemHandle};
 use workspace::{
-    Save, ShowConfiguration, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
    item::{self, FollowableItem, Item, ItemHandle},
    notifications::NotificationId,
    pane::{self, SaveIntent},
    searchable::{SearchEvent, SearchableItem},
+    Save, ShowConfiguration, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
+    Workspace,
 };

+use crate::{
+    slash_command::SlashCommandCompletionProvider, slash_command_picker,
+    ThoughtProcessOutputSection,
+};
 use crate::{
    AssistantContext, AssistantPatch, AssistantPatchStatus, CacheStatus, Content, ContextEvent,
    ContextId, InvokedSlashCommandId, InvokedSlashCommandStatus, Message, MessageId,
    MessageMetadata, MessageStatus, ParsedSlashCommand, PendingSlashCommandStatus, RequestType,
 };
-use crate::{
-    ThoughtProcessOutputSection, slash_command::SlashCommandCompletionProvider,
-    slash_command_picker,
-};

 actions!(
    assistant,
@@ -384,9 +384,7 @@ impl ContextEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();
        if provider
            .as_ref()
            .map_or(false, |provider| provider.must_accept_terms(cx))
@@ -405,23 +403,31 @@ impl ContextEditor {
        if request_type == RequestType::SuggestEdits && !self.context.read(cx).contains_files(cx) {
            self.last_error = Some(AssistError::FileRequired);
            cx.notify();
-        } else if let Some(user_message) = self
-            .context
-            .update(cx, |context, cx| context.assist(request_type, cx))
-        {
-            let new_selection = {
-                let cursor = user_message
-                    .start
-                    .to_offset(self.context.read(cx).buffer().read(cx));
-                cursor..cursor
-            };
-            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
-                    selections.select_ranges([new_selection])
-                });
-            });
-            // Avoid scrolling to the new cursor position so the assistant's output is stable.
-            cx.defer_in(window, |this, _, _| this.scroll_position = None);
+        } else {
+            match self
+                .context
+                .update(cx, |context, cx| context.assist(request_type, cx))
+            {
+                Some(user_message) => {
+                    let new_selection = {
+                        let cursor = user_message
+                            .start
+                            .to_offset(self.context.read(cx).buffer().read(cx));
+                        cursor..cursor
+                    };
+                    self.editor.update(cx, |editor, cx| {
+                        editor.change_selections(
+                            Some(Autoscroll::fit()),
+                            window,
+                            cx,
+                            |selections| selections.select_ranges([new_selection]),
+                        );
+                    });
+                    // Avoid scrolling to the new cursor position so the assistant's output is stable.
+                    cx.defer_in(window, |this, _, _| this.scroll_position = None);
+                }
+                _ => {}
+            }
        }

        cx.notify();
@@ -819,62 +825,68 @@ impl ContextEditor {
        }

        self.editor.update(cx, |editor, cx| {
-            if let Some(invoked_slash_command) =
-                self.context.read(cx).invoked_slash_command(&command_id)
-            {
-                if let InvokedSlashCommandStatus::Finished = invoked_slash_command.status {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-                    let (&excerpt_id, _buffer_id, _buffer_snapshot) =
-                        buffer.as_singleton().unwrap();
+            match self.context.read(cx).invoked_slash_command(&command_id) {
+                Some(invoked_slash_command) => match invoked_slash_command.status {
+                    InvokedSlashCommandStatus::Finished => {
+                        let buffer = editor.buffer().read(cx).snapshot(cx);
+                        let (&excerpt_id, _buffer_id, _buffer_snapshot) =
+                            buffer.as_singleton().unwrap();

-                    let start = buffer
-                        .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.start)
-                        .unwrap();
-                    let end = buffer
-                        .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.end)
-                        .unwrap();
-                    editor.remove_folds_with_type(
-                        &[start..end],
-                        TypeId::of::<PendingSlashCommand>(),
-                        false,
-                        cx,
-                    );
+                        let start = buffer
+                            .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.start)
+                            .unwrap();
+                        let end = buffer
+                            .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.end)
+                            .unwrap();
+                        editor.remove_folds_with_type(
+                            &[start..end],
+                            TypeId::of::<PendingSlashCommand>(),
+                            false,
+                            cx,
+                        );

+                        editor.remove_creases(
+                            HashSet::from_iter(
+                                self.invoked_slash_command_creases.remove(&command_id),
+                            ),
+                            cx,
+                        );
+                    }
+                    _ => {
+                        if let hash_map::Entry::Vacant(entry) =
+                            self.invoked_slash_command_creases.entry(command_id)
+                        {
+                            let buffer = editor.buffer().read(cx).snapshot(cx);
+                            let (&excerpt_id, _buffer_id, _buffer_snapshot) =
+                                buffer.as_singleton().unwrap();
+                            let context = self.context.downgrade();
+                            let crease_start = buffer
+                                .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.start)
+                                .unwrap();
+                            let crease_end = buffer
+                                .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.end)
+                                .unwrap();
+                            let crease = Crease::inline(
+                                crease_start..crease_end,
+                                invoked_slash_command_fold_placeholder(command_id, context),
+                                fold_toggle("invoked-slash-command"),
+                                |_row, _folded, _window, _cx| Empty.into_any(),
+                            );
+                            let crease_ids = editor.insert_creases([crease.clone()], cx);
+                            editor.fold_creases(vec![crease], false, window, cx);
+                            entry.insert(crease_ids[0]);
+                        } else {
+                            cx.notify()
+                        }
+                    }
+                },
+                _ => {
                    editor.remove_creases(
                        HashSet::from_iter(self.invoked_slash_command_creases.remove(&command_id)),
                        cx,
                    );
-                } else if let hash_map::Entry::Vacant(entry) =
-                    self.invoked_slash_command_creases.entry(command_id)
-                {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-                    let (&excerpt_id, _buffer_id, _buffer_snapshot) =
-                        buffer.as_singleton().unwrap();
-                    let context = self.context.downgrade();
-                    let crease_start = buffer
-                        .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.start)
-                        .unwrap();
-                    let crease_end = buffer
-                        .anchor_in_excerpt(excerpt_id, invoked_slash_command.range.end)
-                        .unwrap();
-                    let crease = Crease::inline(
-                        crease_start..crease_end,
-                        invoked_slash_command_fold_placeholder(command_id, context),
-                        fold_toggle("invoked-slash-command"),
-                        |_row, _folded, _window, _cx| Empty.into_any(),
-                    );
-                    let crease_ids = editor.insert_creases([crease.clone()], cx);
-                    editor.fold_creases(vec![crease], false, window, cx);
-                    entry.insert(crease_ids[0]);
-                } else {
-                    cx.notify()
+                    cx.notify();
                }
-            } else {
-                editor.remove_creases(
-                    HashSet::from_iter(self.invoked_slash_command_creases.remove(&command_id)),
-                    cx,
-                );
-                cx.notify();
            };
        });
    }
@@ -960,34 +972,37 @@ impl ContextEditor {
                );

                let should_refold;
-                if let Some(state) = self.patches.get_mut(&range) {
-                    if let Some(editor_state) = &state.editor {
-                        if editor_state.opened_patch != patch {
-                            state.update_task = Some({
-                                let this = this.clone();
-                                cx.spawn_in(window, async move |_, cx| {
-                                    Self::update_patch_editor(this.clone(), patch, cx)
-                                        .await
-                                        .log_err();
-                                })
-                            });
+                match self.patches.get_mut(&range) {
+                    Some(state) => {
+                        if let Some(editor_state) = &state.editor {
+                            if editor_state.opened_patch != patch {
+                                state.update_task = Some({
+                                    let this = this.clone();
+                                    cx.spawn_in(window, async move |_, cx| {
+                                        Self::update_patch_editor(this.clone(), patch, cx)
+                                            .await
+                                            .log_err();
+                                    })
+                                });
+                            }
                        }
+
+                        should_refold = snapshot
+                            .intersects_fold(patch_start.to_offset(&snapshot.buffer_snapshot));
                    }
+                    _ => {
+                        let crease_id = editor.insert_creases([crease.clone()], cx)[0];
+                        self.patches.insert(
+                            range.clone(),
+                            PatchViewState {
+                                crease_id,
+                                editor: None,
+                                update_task: None,
+                            },
+                        );

-                    should_refold =
-                        snapshot.intersects_fold(patch_start.to_offset(&snapshot.buffer_snapshot));
-                } else {
-                    let crease_id = editor.insert_creases([crease.clone()], cx)[0];
-                    self.patches.insert(
-                        range.clone(),
-                        PatchViewState {
-                            crease_id,
-                            editor: None,
-                            update_task: None,
-                        },
-                    );
-
-                    should_refold = true;
+                        should_refold = true;
+                    }
                }

                if should_refold {
@@ -1177,16 +1192,20 @@ impl ContextEditor {
                    }
                }

-                if let Some(editor) = editor {
-                    self.workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.activate_item(&editor, true, false, window, cx);
-                        })
-                        .ok();
-                } else {
-                    patch_state.update_task = Some(cx.spawn_in(window, async move |this, cx| {
-                        Self::open_patch_editor(this, new_patch, cx).await.log_err();
-                    }));
+                match editor {
+                    Some(editor) => {
+                        self.workspace
+                            .update(cx, |workspace, cx| {
+                                workspace.activate_item(&editor, true, false, window, cx);
+                            })
+                            .ok();
+                    }
+                    _ => {
+                        patch_state.update_task =
+                            Some(cx.spawn_in(window, async move |this, cx| {
+                                Self::open_patch_editor(this, new_patch, cx).await.log_err();
+                            }));
+                    }
                }
            }
        }
@@ -1284,16 +1303,19 @@ impl ContextEditor {
                .collect();

            if let Some(state) = &mut patch_state.editor {
-                if let Some(editor) = state.editor.upgrade() {
-                    editor.update(cx, |editor, cx| {
-                        editor.set_title(patch.title.clone(), cx);
-                        editor.reset_locations(locations, window, cx);
-                        resolved_patch.apply(editor, cx);
-                    });
+                match state.editor.upgrade() {
+                    Some(editor) => {
+                        editor.update(cx, |editor, cx| {
+                            editor.set_title(patch.title.clone(), cx);
+                            editor.reset_locations(locations, window, cx);
+                            resolved_patch.apply(editor, cx);
+                        });

-                    state.opened_patch = patch;
-                } else {
-                    patch_state.editor.take();
+                        state.opened_patch = patch;
+                    }
+                    _ => {
+                        patch_state.editor.take();
+                    }
                }
            }
            patch_state.update_task.take();
@@ -1575,25 +1597,28 @@ impl ContextEditor {
            let mut new_blocks = vec![];
            let mut block_index_to_message = vec![];
            for message in self.context.read(cx).messages(cx) {
-                if let Some(_) = blocks_to_remove.remove(&message.id) {
-                    // This is an old message that we might modify.
-                    let Some((meta, block_id)) = old_blocks.get_mut(&message.id) else {
-                        debug_assert!(
-                            false,
-                            "old_blocks should contain a message_id we've just removed."
-                        );
-                        continue;
-                    };
-                    // Should we modify it?
-                    let message_meta = MessageMetadata::from(&message);
-                    if meta != &message_meta {
-                        blocks_to_replace.insert(*block_id, render_block(message_meta.clone()));
-                        *meta = message_meta;
+                match blocks_to_remove.remove(&message.id) {
+                    Some(_) => {
+                        // This is an old message that we might modify.
+                        let Some((meta, block_id)) = old_blocks.get_mut(&message.id) else {
+                            debug_assert!(
+                                false,
+                                "old_blocks should contain a message_id we've just removed."
+                            );
+                            continue;
+                        };
+                        // Should we modify it?
+                        let message_meta = MessageMetadata::from(&message);
+                        if meta != &message_meta {
+                            blocks_to_replace.insert(*block_id, render_block(message_meta.clone()));
+                            *meta = message_meta;
+                        }
+                    }
+                    _ => {
+                        // This is a new message.
+                        new_blocks.push(create_block_properties(&message));
+                        block_index_to_message.push((message.id, MessageMetadata::from(&message)));
                    }
-                } else {
-                    // This is a new message.
-                    new_blocks.push(create_block_properties(&message));
-                    block_index_to_message.push((message.id, MessageMetadata::from(&message)));
                }
            }
            editor.replace_blocks(blocks_to_replace, None, cx);
@@ -2323,54 +2348,67 @@ impl ContextEditor {
                    )
                    .into_any_element(),
            )
-        } else if let Some(configuration_error) = configuration_error(cx) {
-            let label = match configuration_error {
-                ConfigurationError::NoProvider => "No LLM provider selected.",
-                ConfigurationError::ProviderNotAuthenticated => "LLM provider is not configured.",
-                ConfigurationError::ProviderPendingTermsAcceptance(_) => {
-                    "LLM provider requires accepting the Terms of Service."
-                }
-            };
-            Some(
-                h_flex()
-                    .px_3()
-                    .py_2()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .bg(cx.theme().colors().editor_background)
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_3()
-                            .child(
-                                Icon::new(IconName::Warning)
-                                    .size(IconSize::Small)
-                                    .color(Color::Warning),
-                            )
-                            .child(Label::new(label)),
-                    )
-                    .child(
-                        Button::new("open-configuration", "Configure Providers")
-                            .size(ButtonSize::Compact)
-                            .icon(Some(IconName::SlidersVertical))
-                            .icon_size(IconSize::Small)
-                            .icon_position(IconPosition::Start)
-                            .style(ButtonStyle::Filled)
-                            .on_click({
-                                let focus_handle = self.focus_handle(cx).clone();
-                                move |_event, window, cx| {
-                                    focus_handle.dispatch_action(&ShowConfiguration, window, cx);
-                                }
-                            }),
-                    )
-                    .into_any_element(),
-            )
        } else {
-            None
+            match configuration_error(cx) {
+                Some(configuration_error) => {
+                    let label = match configuration_error {
+                        ConfigurationError::NoProvider => "No LLM provider selected.",
+                        ConfigurationError::ProviderNotAuthenticated => {
+                            "LLM provider is not configured."
+                        }
+                        ConfigurationError::ProviderPendingTermsAcceptance(_) => {
+                            "LLM provider requires accepting the Terms of Service."
+                        }
+                    };
+                    Some(
+                        h_flex()
+                            .px_3()
+                            .py_2()
+                            .border_b_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .bg(cx.theme().colors().editor_background)
+                            .justify_between()
+                            .child(
+                                h_flex()
+                                    .gap_3()
+                                    .child(
+                                        Icon::new(IconName::Warning)
+                                            .size(IconSize::Small)
+                                            .color(Color::Warning),
+                                    )
+                                    .child(Label::new(label)),
+                            )
+                            .child(
+                                Button::new("open-configuration", "Configure Providers")
+                                    .size(ButtonSize::Compact)
+                                    .icon(Some(IconName::SlidersVertical))
+                                    .icon_size(IconSize::Small)
+                                    .icon_position(IconPosition::Start)
+                                    .style(ButtonStyle::Filled)
+                                    .on_click({
+                                        let focus_handle = self.focus_handle(cx).clone();
+                                        move |_event, window, cx| {
+                                            focus_handle.dispatch_action(
+                                                &ShowConfiguration,
+                                                window,
+                                                cx,
+                                            );
+                                        }
+                                    }),
+                            )
+                            .into_any_element(),
+                    )
+                }
+                _ => None,
+            }
        }
    }

-    fn render_send_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_send_button(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
        let focus_handle = self.focus_handle(cx).clone();

        let (style, tooltip) = match token_state(&self.context, cx) {
@@ -2397,13 +2435,13 @@ impl ContextEditor {
            None => (ButtonStyle::Filled, None),
        };

-        let model = LanguageModelRegistry::read_global(cx).default_model();
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();

        let has_configuration_error = configuration_error(cx).is_some();
        let needs_to_accept_terms = self.show_accept_terms
-            && model
+            && provider
                .as_ref()
-                .map_or(false, |model| model.provider.must_accept_terms(cx));
+                .map_or(false, |provider| provider.must_accept_terms(cx));
        let disabled = has_configuration_error || needs_to_accept_terms;

        ButtonLike::new("send_button")
@@ -2429,7 +2467,11 @@ impl ContextEditor {
            })
    }

-    fn render_edit_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_edit_button(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement + use<> {
        let focus_handle = self.focus_handle(cx).clone();

        let (style, tooltip) = match token_state(&self.context, cx) {
@@ -2456,9 +2498,7 @@ impl ContextEditor {
            None => (ButtonStyle::Filled, None),
        };

-        let provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();

        let has_configuration_error = configuration_error(cx).is_some();
        let needs_to_accept_terms = self.show_accept_terms
@@ -2484,7 +2524,7 @@ impl ContextEditor {
            })
    }

-    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
        slash_command_picker::SlashCommandSelector::new(
            self.slash_commands.clone(),
            cx.entity().downgrade(),
@@ -2503,10 +2543,8 @@ impl ContextEditor {
        )
    }

-    fn render_language_model_selector(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let active_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.model);
+    fn render_language_model_selector(&self, cx: &mut Context<Self>) -> impl IntoElement + use<> {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
        let focus_handle = self.editor().focus_handle(cx).clone();
        let model_name = match active_model {
            Some(model) => model.name().0,
@@ -3026,9 +3064,7 @@ impl EventEmitter<SearchEvent> for ContextEditor {}

 impl Render for ContextEditor {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();
        let accept_terms = if self.show_accept_terms {
            provider.as_ref().and_then(|provider| {
                provider.render_accept_terms(LanguageModelProviderTosView::PromptEditorPopup, cx)
@@ -3291,12 +3327,9 @@ impl FollowableItem for ContextEditor {
        Some(proto::view::Variant::ContextEditor(
            proto::view::ContextEditor {
                context_id: context.id().to_proto(),
-                editor: if let Some(proto::view::Variant::Editor(proto)) =
-                    self.editor.read(cx).to_state_proto(window, cx)
-                {
-                    Some(proto)
-                } else {
-                    None
+                editor: match self.editor.read(cx).to_state_proto(window, cx) {
+                    Some(proto::view::Variant::Editor(proto)) => Some(proto),
+                    _ => None,
                },
            },
        ))
@@ -3624,9 +3657,7 @@ enum TokenState {
 fn token_state(context: &Entity<AssistantContext>, cx: &App) -> Option<TokenState> {
    const WARNING_TOKEN_THRESHOLD: f32 = 0.8;

-    let model = LanguageModelRegistry::read_global(cx)
-        .default_model()?
-        .model;
+    let model = LanguageModelRegistry::read_global(cx).active_model()?;
    let token_count = context.read(cx).token_count()?;
    let max_token_count = model.max_token_count();

@@ -3679,16 +3710,16 @@ pub enum ConfigurationError {
 }

 fn configuration_error(cx: &App) -> Option<ConfigurationError> {
-    let model = LanguageModelRegistry::read_global(cx).default_model();
-    let is_authenticated = model
+    let provider = LanguageModelRegistry::read_global(cx).active_provider();
+    let is_authenticated = provider
        .as_ref()
-        .map_or(false, |model| model.provider.is_authenticated(cx));
+        .map_or(false, |provider| provider.is_authenticated(cx));

-    if model.is_some() && is_authenticated {
+    if provider.is_some() && is_authenticated {
        return None;
    }

-    if model.is_none() {
+    if provider.is_none() {
        return Some(ConfigurationError::NoProvider);
    }

@@ -3713,18 +3744,6 @@ pub fn humanize_token_count(count: usize) -> String {
                format!("{}.{}k", thousands, hundreds)
            }
        }
-        1_000_000..=9_999_999 => {
-            let millions = count / 1_000_000;
-            let hundred_thousands = (count % 1_000_000 + 50_000) / 100_000;
-            if hundred_thousands == 0 {
-                format!("{}M", millions)
-            } else if hundred_thousands == 10 {
-                format!("{}M", millions + 1)
-            } else {
-                format!("{}.{}M", millions, hundred_thousands)
-            }
-        }
-        10_000_000.. => format!("{}M", (count + 500_000) / 1_000_000),
        _ => format!("{}k", (count + 500) / 1000),
    }
 }
--- a/crates/assistant_context_editor/src/context_history.rs
+++ b/crates/assistant_context_editor/src/context_history.rs
@@ -3,13 +3,13 @@ use std::sync::Arc;
 use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, WeakEntity};
 use picker::{Picker, PickerDelegate};
 use project::Project;
-use ui::utils::{DateTimeType, format_distance_from_now};
-use ui::{Avatar, ListItem, ListItemSpacing, prelude::*};
+use ui::utils::{format_distance_from_now, DateTimeType};
+use ui::{prelude::*, Avatar, ListItem, ListItemSpacing};
 use workspace::{Item, Workspace};

 use crate::{
-    AssistantPanelDelegate, ContextStore, DEFAULT_TAB_TITLE, RemoteContextMetadata,
-    SavedContextMetadata,
+    AssistantPanelDelegate, ContextStore, RemoteContextMetadata, SavedContextMetadata,
+    DEFAULT_TAB_TITLE,
 };

 #[derive(Clone)]
@@ -229,12 +229,10 @@ impl PickerDelegate for SavedContextPickerDelegate {
                                        .into_any_element(),
                                ]
                            } else {
-                                vec![
-                                    Label::new("Shared by host")
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small)
-                                        .into_any_element(),
-                                ]
+                                vec![Label::new("Shared by host")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small)
+                                    .into_any_element()]
                            }),
                    )
            }
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -2,13 +2,13 @@ use crate::{
    AssistantContext, ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext,
    SavedContextMetadata,
 };
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
-use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
+use client::{proto, telemetry::Telemetry, Client, TypedEnvelope};
 use clock::ReplicaId;
 use collections::HashMap;
-use context_server::ContextServerFactoryRegistry;
 use context_server::manager::ContextServerManager;
+use context_server::ContextServerFactoryRegistry;
 use fs::{Fs, RemoveOptions};
 use futures::StreamExt;
 use fuzzy::StringMatchCandidate;
@@ -104,47 +104,52 @@ impl ContextStore {
            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
            let (mut events, _) = fs.watch(contexts_dir(), CONTEXT_WATCH_DURATION).await;

-            let this = cx.new(|cx: &mut Context<Self>| {
-                let context_server_factory_registry =
-                    ContextServerFactoryRegistry::default_global(cx);
-                let context_server_manager = cx.new(|cx| {
-                    ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
-                });
-                let mut this = Self {
-                    contexts: Vec::new(),
-                    contexts_metadata: Vec::new(),
-                    context_server_manager,
-                    context_server_slash_command_ids: HashMap::default(),
-                    host_contexts: Vec::new(),
-                    fs,
-                    languages,
-                    slash_commands,
-                    telemetry,
-                    _watch_updates: cx.spawn(async move |this, cx| {
-                        async move {
-                            while events.next().await.is_some() {
-                                this.update(cx, |this, cx| this.reload(cx))?.await.log_err();
+            let this =
+                cx.new(|cx: &mut Context<Self>| {
+                    let context_server_factory_registry =
+                        ContextServerFactoryRegistry::default_global(cx);
+                    let context_server_manager = cx.new(|cx| {
+                        ContextServerManager::new(
+                            context_server_factory_registry,
+                            project.clone(),
+                            cx,
+                        )
+                    });
+                    let mut this = Self {
+                        contexts: Vec::new(),
+                        contexts_metadata: Vec::new(),
+                        context_server_manager,
+                        context_server_slash_command_ids: HashMap::default(),
+                        host_contexts: Vec::new(),
+                        fs,
+                        languages,
+                        slash_commands,
+                        telemetry,
+                        _watch_updates: cx.spawn(async move |this, cx| {
+                            async move {
+                                while events.next().await.is_some() {
+                                    this.update(cx, |this, cx| this.reload(cx))?.await.log_err();
+                                }
+                                anyhow::Ok(())
                            }
-                            anyhow::Ok(())
-                        }
-                        .log_err()
-                        .await
-                    }),
-                    client_subscription: None,
-                    _project_subscriptions: vec![
-                        cx.subscribe(&project, Self::handle_project_event),
-                    ],
-                    project_is_shared: false,
-                    client: project.read(cx).client(),
-                    project: project.clone(),
-                    prompt_builder,
-                };
-                this.handle_project_shared(project.clone(), cx);
-                this.synchronize_contexts(cx);
-                this.register_context_server_handlers(cx);
-                this.reload(cx).detach_and_log_err(cx);
-                this
-            })?;
+                            .log_err()
+                            .await
+                        }),
+                        client_subscription: None,
+                        _project_subscriptions: vec![
+                            cx.subscribe(&project, Self::handle_project_event)
+                        ],
+                        project_is_shared: false,
+                        client: project.read(cx).client(),
+                        project: project.clone(),
+                        prompt_builder,
+                    };
+                    this.handle_project_shared(project.clone(), cx);
+                    this.synchronize_contexts(cx);
+                    this.register_context_server_handlers(cx);
+                    this.reload(cx).detach_and_log_err(cx);
+                    this
+                })?;

            Ok(this)
        })
@@ -294,13 +299,12 @@ impl ContextStore {
        }

        if is_shared {
-            self.contexts.retain_mut(|context| {
-                if let Some(strong_context) = context.upgrade() {
+            self.contexts.retain_mut(|context| match context.upgrade() {
+                Some(strong_context) => {
                    *context = ContextHandle::Strong(strong_context);
                    true
-                } else {
-                    false
                }
+                _ => false,
            });
            let remote_id = self.project.read(cx).remote_id().unwrap();
            self.client_subscription = self
@@ -331,8 +335,8 @@ impl ContextStore {
                self.synchronize_contexts(cx);
            }
            project::Event::DisconnectedFromHost => {
-                self.contexts.retain_mut(|context| {
-                    if let Some(strong_context) = context.upgrade() {
+                self.contexts.retain_mut(|context| match context.upgrade() {
+                    Some(strong_context) => {
                        *context = ContextHandle::Weak(context.downgrade());
                        strong_context.update(cx, |context, cx| {
                            if context.replica_id() != ReplicaId::default() {
@@ -340,9 +344,8 @@ impl ContextStore {
                            }
                        });
                        true
-                    } else {
-                        false
                    }
+                    _ => false,
                });
                self.host_contexts.clear();
                cx.notify();
@@ -417,12 +420,13 @@ impl ContextStore {
                .await?;
            context.update(cx, |context, cx| context.apply_ops(operations, cx))?;
            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_context_for_id(&context_id, cx) {
-                    existing_context
-                } else {
-                    this.register_context(&context, cx);
-                    this.synchronize_contexts(cx);
-                    context
+                match this.loaded_context_for_id(&context_id, cx) {
+                    Some(existing_context) => existing_context,
+                    _ => {
+                        this.register_context(&context, cx);
+                        this.synchronize_contexts(cx);
+                        context
+                    }
                }
            })
        })
@@ -466,11 +470,12 @@ impl ContextStore {
                )
            })?;
            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_context_for_path(&path, cx) {
-                    existing_context
-                } else {
-                    this.register_context(&context, cx);
-                    context
+                match this.loaded_context_for_path(&path, cx) {
+                    Some(existing_context) => existing_context,
+                    _ => {
+                        this.register_context(&context, cx);
+                        context
+                    }
                }
            })
        })
@@ -586,12 +591,13 @@ impl ContextStore {
                .await?;
            context.update(cx, |context, cx| context.apply_ops(operations, cx))?;
            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_context_for_id(&context_id, cx) {
-                    existing_context
-                } else {
-                    this.register_context(&context, cx);
-                    this.synchronize_contexts(cx);
-                    context
+                match this.loaded_context_for_id(&context_id, cx) {
+                    Some(existing_context) => existing_context,
+                    _ => {
+                        this.register_context(&context, cx);
+                        this.synchronize_contexts(cx);
+                        context
+                    }
                }
            })
        })
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -1,7 +1,7 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use collections::HashMap;
 use editor::ProposedChangesEditor;
-use futures::{TryFutureExt as _, future};
+use futures::{future, TryFutureExt as _};
 use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString};
 use language::{AutoindentMode, Buffer, BufferSnapshot};
 use project::{Project, ProjectPath};
@@ -548,7 +548,7 @@ mod tests {
    use super::*;
    use gpui::App;
    use language::{
-        Language, LanguageConfig, LanguageMatcher, language_settings::AllLanguageSettings,
+        language_settings::AllLanguageSettings, Language, LanguageConfig, LanguageMatcher,
    };
    use settings::SettingsStore;
    use ui::BorrowAppContext;
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -3,19 +3,19 @@ use anyhow::Result;
 pub use assistant_slash_command::SlashCommand;
 use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
 use editor::{CompletionProvider, Editor, ExcerptId};
-use fuzzy::{StringMatchCandidate, match_strings};
+use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
 use language::{Anchor, Buffer, ToPoint};
 use parking_lot::Mutex;
-use project::{CompletionIntent, CompletionSource, lsp_store::CompletionDocumentation};
+use project::{lsp_store::CompletionDocumentation, CompletionIntent, CompletionSource};
 use rope::Point;
 use std::{
    cell::RefCell,
    ops::Range,
    rc::Rc,
    sync::{
-        Arc,
        atomic::{AtomicBool, Ordering::SeqCst},
+        Arc,
    },
 };
 use workspace::Workspace;
@@ -151,29 +151,27 @@ impl SlashCommandCompletionProvider {
        let mut flag = self.cancel_flag.lock();
        flag.store(true, SeqCst);
        *flag = new_cancel_flag.clone();
-        if let Some(command) = self.slash_commands.command(command_name, cx) {
-            let completions = command.complete_argument(
-                arguments,
-                new_cancel_flag.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            );
-            let command_name: Arc<str> = command_name.into();
-            let editor = self.editor.clone();
-            let workspace = self.workspace.clone();
-            let arguments = arguments.to_vec();
-            cx.background_spawn(async move {
-                Ok(Some(
-                    completions
-                        .await?
-                        .into_iter()
-                        .map(|new_argument| {
-                            let confirm =
-                                editor
-                                    .clone()
-                                    .zip(workspace.clone())
-                                    .map(|(editor, workspace)| {
+        match self.slash_commands.command(command_name, cx) {
+            Some(command) => {
+                let completions = command.complete_argument(
+                    arguments,
+                    new_cancel_flag.clone(),
+                    self.workspace.clone(),
+                    window,
+                    cx,
+                );
+                let command_name: Arc<str> = command_name.into();
+                let editor = self.editor.clone();
+                let workspace = self.workspace.clone();
+                let arguments = arguments.to_vec();
+                cx.background_spawn(async move {
+                    Ok(Some(
+                        completions
+                            .await?
+                            .into_iter()
+                            .map(|new_argument| {
+                                let confirm = editor.clone().zip(workspace.clone()).map(
+                                    |(editor, workspace)| {
                                        Arc::new({
                                            let mut completed_arguments = arguments.clone();
                                            if new_argument.replace_previous_arguments {
@@ -210,32 +208,33 @@ impl SlashCommandCompletionProvider {
                                            }
                                        }
                                        }) as Arc<_>
-                                    });
+                                    },
+                                );

-                            let mut new_text = new_argument.new_text.clone();
-                            if new_argument.after_completion == AfterCompletion::Continue {
-                                new_text.push(' ');
-                            }
+                                let mut new_text = new_argument.new_text.clone();
+                                if new_argument.after_completion == AfterCompletion::Continue {
+                                    new_text.push(' ');
+                                }

-                            project::Completion {
-                                old_range: if new_argument.replace_previous_arguments {
-                                    argument_range.clone()
-                                } else {
-                                    last_argument_range.clone()
-                                },
-                                label: new_argument.label,
-                                icon_path: None,
-                                new_text,
-                                documentation: None,
-                                confirm,
-                                source: CompletionSource::Custom,
-                            }
-                        })
-                        .collect(),
-                ))
-            })
-        } else {
-            Task::ready(Ok(Some(Vec::new())))
+                                project::Completion {
+                                    old_range: if new_argument.replace_previous_arguments {
+                                        argument_range.clone()
+                                    } else {
+                                        last_argument_range.clone()
+                                    },
+                                    label: new_argument.label,
+                                    icon_path: None,
+                                    new_text,
+                                    documentation: None,
+                                    confirm,
+                                    source: CompletionSource::Custom,
+                                }
+                            })
+                            .collect(),
+                    ))
+                })
+            }
+            _ => Task::ready(Ok(Some(Vec::new()))),
        }
    }
 }
@@ -333,10 +332,9 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        let position = position.to_point(buffer);
        let line_start = Point::new(position.row, 0);
        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            SlashCommandLine::parse(line).is_some()
-        } else {
-            false
+        match lines.next() {
+            Some(line) => SlashCommandLine::parse(line).is_some(),
+            _ => false,
        }
    }

--- a/crates/assistant_context_editor/src/slash_command_picker.rs
+++ b/crates/assistant_context_editor/src/slash_command_picker.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use assistant_slash_command::SlashCommandWorkingSet;
 use gpui::{AnyElement, AnyView, DismissEvent, SharedString, Task, WeakEntity};
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use ui::{ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip, prelude::*};
+use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip};

 use crate::context_editor::ContextEditor;

--- a/crates/assistant_eval/Cargo.toml
+++ b/crates/assistant_eval/Cargo.toml
@@ -13,8 +13,8 @@ name = "assistant_eval"
 path = "src/main.rs"

 [dependencies]
-agent.workspace = true
 anyhow.workspace = true
+assistant2.workspace = true
 assistant_tool.workspace = true
 assistant_tools.workspace = true
 clap.workspace = true
@@ -27,12 +27,14 @@ fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 gpui_tokio.workspace = true
+itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_models.workspace = true
 node_runtime.workspace = true
 project.workspace = true
 prompt_store.workspace = true
+regex.workspace = true
 release_channel.workspace = true
 reqwest_client.workspace = true
 serde.workspace = true
@@ -40,7 +42,4 @@ serde_json.workspace = true
 serde_json_lenient.workspace = true
 settings.workspace = true
 smol.workspace = true
-tempfile.workspace = true
 util.workspace = true
-walkdir.workspace = true
-workspace-hack.workspace = true
--- a/crates/assistant_eval/README.md
+++ b/crates/assistant_eval/README.md
@@ -1,25 +1,34 @@
 # Tool Evals

-A framework for evaluating and benchmarking the agent panel generations.
+A framework for evaluating and benchmarking AI assistant performance in the Zed editor.

 ## Overview

 Tool Evals provides a headless environment for running assistants evaluations on code repositories. It automates the process of:

-1. Setting up test code and repositories
+1. Cloning and setting up test repositories
 2. Sending prompts to language models
 3. Allowing the assistant to use tools to modify code
-4. Collecting metrics on performance and tool usage
+4. Collecting metrics on performance
 5. Evaluating results against known good solutions

 ## How It Works

 The system consists of several key components:

- **Eval**: Loads exercises from the zed-ace-framework repository, creates temporary repos, and executes evaluations
+- **Eval**: Loads test cases from the evaluation_data directory, clones repos, and executes evaluations
 - **HeadlessAssistant**: Provides a headless environment for running the AI assistant
- **Judge**: Evaluates AI-generated solutions against reference implementations and assigns scores
- **Templates**: Defines evaluation frameworks for different tasks (Project Creation, Code Modification, Conversational Guidance)
+- **Judge**: Compares AI-generated diffs with reference solutions and scores their functional similarity
+
+The evaluation flow:
+1. An evaluation is loaded from the evaluation_data directory
+2. The target repository is cloned and checked out at a specific commit
+3. A HeadlessAssistant instance is created with the specified language model
+4. The user prompt is sent to the assistant
+5. The assistant responds and uses tools to modify code
+6. Upon completion, a diff is generated from the changes
+7. Results are saved including the diff, assistant's response, and performance metrics
+8. If a reference solution exists, a Judge evaluates the similarity of the solution

 ## Setup Requirements

@@ -27,7 +36,6 @@ The system consists of several key components:

 - Rust and Cargo
 - Git
- Python (for report generation)
 - Network access to clone repositories
 - Appropriate API keys for language models and git services (Anthropic, GitHub, etc.)

@@ -35,34 +43,35 @@ The system consists of several key components:

 Ensure you have the required API keys set, either from a dev run of Zed or via these environment variables:
 - `ZED_ANTHROPIC_API_KEY` for Claude models
+- `ZED_OPENAI_API_KEY` for OpenAI models
 - `ZED_GITHUB_API_KEY` for GitHub API (or similar)

 ## Usage

-### Running Evaluations
+### Running a Single Evaluation
+
+To run a specific evaluation:

 ```bash
-# Run all tests
-cargo run -p assistant_eval -- --all
-
-# Run only specific languages
-cargo run -p assistant_eval -- --all --languages python,rust
-
-# Limit concurrent evaluations
-cargo run -p assistant_eval -- --all --concurrency 5
-
-# Limit number of exercises per language
-cargo run -p assistant_eval -- --all --max-exercises-per-language 3
+cargo run -p assistant_eval -- bubbletea-add-set-window-title
 ```

-### Evaluation Template Types
+The arguments are regex patterns for the evaluation names to run, so to run all evaluations that contain `bubbletea`, run:

-The system supports three types of evaluation templates:
+```bash
+cargo run -p assistant_eval -- bubbletea
+```

-1. **ProjectCreation**: Tests the model's ability to create new implementations from scratch
-2. **CodeModification**: Tests the model's ability to modify existing code to meet new requirements
-3. **ConversationalGuidance**: Tests the model's ability to provide guidance without writing code
+To run all evaluations:

-### Support Repo
+```bash
+cargo run -p assistant_eval -- --all
+```

-The [zed-industries/zed-ace-framework](https://github.com/zed-industries/zed-ace-framework) contains the analytics and reporting scripts.
+## Evaluation Data Structure
+
+Each evaluation should be placed in the `evaluation_data` directory with the following structure:
+
+* `prompt.txt`: The user's prompt.
+* `original.diff`: The `git diff` of the change anticipated for this prompt.
+* `setup.json`: Information about the repo used for the evaluation.
--- a/crates/assistant_eval/src/eval.rs
+++ b/crates/assistant_eval/src/eval.rs
@@ -1,8 +1,6 @@
-use crate::git_commands::{run_git, setup_temp_repo};
 use crate::headless_assistant::{HeadlessAppState, HeadlessAssistant};
-use crate::{get_exercise_language, get_exercise_name, templates_eval::Template};
-use agent::RequestKind;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
+use assistant2::RequestKind;
 use collections::HashMap;
 use gpui::{App, Task};
 use language_model::{LanguageModel, TokenUsage};
@@ -12,26 +10,19 @@ use std::{
    io::Write,
    path::{Path, PathBuf},
    sync::Arc,
-    time::{Duration, SystemTime},
+    time::Duration,
 };
+use util::command::new_smol_command;

-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct EvalResult {
-    pub exercise_name: String,
-    pub template_name: String,
-    pub score: String,
-    pub diff: String,
-    pub assistant_response: String,
-    pub elapsed_time_ms: u128,
-    pub timestamp: u128,
-    // Token usage fields
-    pub input_tokens: usize,
-    pub output_tokens: usize,
-    pub total_tokens: usize,
-    pub tool_use_counts: usize,
-    pub judge_model_name: String, // Added field for judge model name
+pub struct Eval {
+    pub name: String,
+    pub path: PathBuf,
+    pub repo_path: PathBuf,
+    pub eval_setup: EvalSetup,
+    pub user_prompt: String,
 }

+#[derive(Debug, Serialize)]
 pub struct EvalOutput {
    pub diff: String,
    pub last_message: String,
@@ -47,31 +38,19 @@ pub struct EvalSetup {
    pub base_sha: String,
 }

-pub struct Eval {
-    pub repo_path: PathBuf,
-    pub eval_setup: EvalSetup,
-    pub user_prompt: String,
-}
-
 impl Eval {
-    // Keep this method for potential future use, but mark it as intentionally unused
-    #[allow(dead_code)]
-    pub async fn load(_name: String, path: PathBuf, repos_dir: &Path) -> Result<Self> {
+    /// Loads the eval from a path (typically in `evaluation_data`). Clones and checks out the repo
+    /// if necessary.
+    pub async fn load(name: String, path: PathBuf, repos_dir: &Path) -> anyhow::Result<Self> {
        let prompt_path = path.join("prompt.txt");
        let user_prompt = smol::unblock(|| std::fs::read_to_string(prompt_path)).await?;
        let setup_path = path.join("setup.json");
        let setup_contents = smol::unblock(|| std::fs::read_to_string(setup_path)).await?;
        let eval_setup = serde_json_lenient::from_str_lenient::<EvalSetup>(&setup_contents)?;
-
-        // Move this internal function inside the load method since it's only used here
-        fn repo_dir_name(url: &str) -> String {
-            url.trim_start_matches("https://")
-                .replace(|c: char| !c.is_alphanumeric(), "_")
-        }
-
        let repo_path = repos_dir.join(repo_dir_name(&eval_setup.url));
-
        Ok(Eval {
+            name,
+            path,
            repo_path,
            eval_setup,
            user_prompt,
@@ -83,9 +62,9 @@ impl Eval {
        app_state: Arc<HeadlessAppState>,
        model: Arc<dyn LanguageModel>,
        cx: &mut App,
-    ) -> Task<Result<EvalOutput>> {
+    ) -> Task<anyhow::Result<EvalOutput>> {
        cx.spawn(async move |cx| {
-            run_git(&self.repo_path, &["checkout", &self.eval_setup.base_sha]).await?;
+            checkout_repo(&self.eval_setup, &self.repo_path).await?;

            let (assistant, done_rx) =
                cx.update(|cx| HeadlessAssistant::new(app_state.clone(), cx))??;
@@ -125,43 +104,9 @@ impl Eval {

            done_rx.recv().await??;

-            // Add this section to check untracked files
-            println!("Checking for untracked files:");
-            let untracked = run_git(
-                &self.repo_path,
-                &["ls-files", "--others", "--exclude-standard"],
-            )
-            .await?;
-            if untracked.is_empty() {
-                println!("No untracked files found");
-            } else {
-                // Add all files to git so they appear in the diff
-                println!("Adding untracked files to git");
-                run_git(&self.repo_path, &["add", "."]).await?;
-            }
-
-            // get git status
-            let _status = run_git(&self.repo_path, &["status", "--short"]).await?;
-
            let elapsed_time = start_time.elapsed()?;

-            // Get diff of staged changes (the files we just added)
-            let staged_diff = run_git(&self.repo_path, &["diff", "--staged"]).await?;
-
-            // Get diff of unstaged changes
-            let unstaged_diff = run_git(&self.repo_path, &["diff"]).await?;
-
-            // Combine both diffs
-            let diff = if unstaged_diff.is_empty() {
-                staged_diff
-            } else if staged_diff.is_empty() {
-                unstaged_diff
-            } else {
-                format!(
-                    "# Staged changes\n{}\n\n# Unstaged changes\n{}",
-                    staged_diff, unstaged_diff
-                )
-            };
+            let diff = query_git(&self.repo_path, vec!["diff"]).await?;

            assistant.update(cx, |assistant, cx| {
                let thread = assistant.thread.read(cx);
@@ -187,9 +132,12 @@ impl Eval {
 }

 impl EvalOutput {
-    // Keep this method for potential future use, but mark it as intentionally unused
-    #[allow(dead_code)]
-    pub fn save_to_directory(&self, output_dir: &Path, eval_output_value: String) -> Result<()> {
+    // Method to save the output to a directory
+    pub fn save_to_directory(
+        &self,
+        output_dir: &Path,
+        eval_output_value: String,
+    ) -> anyhow::Result<()> {
        // Create the output directory if it doesn't exist
        fs::create_dir_all(&output_dir)?;

@@ -244,305 +192,76 @@ impl EvalOutput {
    }
 }

-pub async fn read_instructions(exercise_path: &Path) -> Result<String> {
-    let instructions_path = exercise_path.join(".docs").join("instructions.md");
-    println!("Reading instructions from: {}", instructions_path.display());
-    let instructions = smol::unblock(move || std::fs::read_to_string(&instructions_path)).await?;
-    Ok(instructions)
+fn repo_dir_name(url: &str) -> String {
+    url.trim_start_matches("https://")
+        .replace(|c: char| !c.is_alphanumeric(), "_")
 }

-pub async fn read_example_solution(exercise_path: &Path, language: &str) -> Result<String> {
-    // Map the language to the file extension
-    let language_extension = match language {
-        "python" => "py",
-        "go" => "go",
-        "rust" => "rs",
-        "typescript" => "ts",
-        "javascript" => "js",
-        "ruby" => "rb",
-        "php" => "php",
-        "bash" => "sh",
-        "multi" => "diff",
-        "internal" => "diff",
-        _ => return Err(anyhow!("Unsupported language: {}", language)),
-    };
-    let example_path = exercise_path
-        .join(".meta")
-        .join(format!("example.{}", language_extension));
-    println!("Reading example solution from: {}", example_path.display());
-    let example = smol::unblock(move || std::fs::read_to_string(&example_path)).await?;
-    Ok(example)
-}
-
-pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -> Result<()> {
-    let eval_dir = exercise_path.join("evaluation");
-    fs::create_dir_all(&eval_dir)?;
-
-    let eval_file = eval_dir.join("evals.json");
-
-    println!("Saving evaluation results to: {}", eval_file.display());
-    println!(
-        "Results to save: {} evaluations for exercise path: {}",
-        results.len(),
-        exercise_path.display()
-    );
-
-    // Check file existence before reading/writing
-    if eval_file.exists() {
-        println!("Existing evals.json file found, will update it");
+async fn checkout_repo(eval_setup: &EvalSetup, repo_path: &Path) -> anyhow::Result<()> {
+    if !repo_path.exists() {
+        smol::unblock({
+            let repo_path = repo_path.to_path_buf();
+            || std::fs::create_dir_all(repo_path)
+        })
+        .await?;
+        run_git(repo_path, vec!["init"]).await?;
+        run_git(repo_path, vec!["remote", "add", "origin", &eval_setup.url]).await?;
    } else {
-        println!("No existing evals.json file found, will create new one");
-    }
-
-    // Structure to organize evaluations by test name and timestamp
-    let mut eval_data: serde_json::Value = if eval_file.exists() {
-        let content = fs::read_to_string(&eval_file)?;
-        serde_json::from_str(&content).unwrap_or_else(|_| serde_json::json!({}))
-    } else {
-        serde_json::json!({})
-    };
-
-    // Get current timestamp for this batch of results
-    let timestamp = SystemTime::now()
-        .duration_since(SystemTime::UNIX_EPOCH)?
-        .as_millis()
-        .to_string();
-
-    // Group the new results by test name (exercise name)
-    for result in results {
-        let exercise_name = &result.exercise_name;
-        let template_name = &result.template_name;
-
-        println!(
-            "Adding result: exercise={}, template={}",
-            exercise_name, template_name
-        );
-
-        // Ensure the exercise entry exists
-        if eval_data.get(exercise_name).is_none() {
-            eval_data[exercise_name] = serde_json::json!({});
+        let actual_origin = query_git(repo_path, vec!["remote", "get-url", "origin"]).await?;
+        if actual_origin != eval_setup.url {
+            return Err(anyhow!(
+                "remote origin {} does not match expected origin {}",
+                actual_origin,
+                eval_setup.url
+            ));
        }

-        // Ensure the timestamp entry exists as an object
-        if eval_data[exercise_name].get(&timestamp).is_none() {
-            eval_data[exercise_name][&timestamp] = serde_json::json!({});
-        }
-
-        // Add this result under the timestamp with template name as key
-        eval_data[exercise_name][&timestamp][template_name] = serde_json::to_value(&result)?;
+        // TODO: consider including "-x" to remove ignored files. The downside of this is that it will
+        // also remove build artifacts, and so prevent incremental reuse there.
+        run_git(repo_path, vec!["clean", "--force", "-d"]).await?;
+        run_git(repo_path, vec!["reset", "--hard", "HEAD"]).await?;
    }

-    // Write back to file with pretty formatting
-    let json_content = serde_json::to_string_pretty(&eval_data)?;
-    match fs::write(&eval_file, json_content) {
-        Ok(_) => println!("✓ Successfully saved results to {}", eval_file.display()),
-        Err(e) => println!("✗ Failed to write results file: {}", e),
-    }
+    run_git(
+        repo_path,
+        vec!["fetch", "--depth", "1", "origin", &eval_setup.base_sha],
+    )
+    .await?;
+    run_git(repo_path, vec!["checkout", &eval_setup.base_sha]).await?;

    Ok(())
 }

-pub async fn run_exercise_eval(
-    exercise_path: PathBuf,
-    template: Template,
-    model: Arc<dyn LanguageModel>,
-    judge_model: Arc<dyn LanguageModel>,
-    app_state: Arc<HeadlessAppState>,
-    base_sha: String,
-    _framework_path: PathBuf,
-    cx: gpui::AsyncApp,
-) -> Result<EvalResult> {
-    let exercise_name = get_exercise_name(&exercise_path);
-    let language = get_exercise_language(&exercise_path)?;
-    let mut instructions = read_instructions(&exercise_path).await?;
-    instructions.push_str(&format!(
-        "\n\nWhen writing the code for this prompt, use {} to achieve the goal.",
-        language
-    ));
-    let example_solution = read_example_solution(&exercise_path, &language).await?;
-
-    println!(
-        "Running evaluation for exercise: {} with template: {}",
-        exercise_name, template.name
-    );
-
-    // Create temporary directory with exercise files
-    let temp_dir = setup_temp_repo(&exercise_path, &base_sha).await?;
-    let temp_path = temp_dir.path().to_path_buf();
-
-    if template.name == "ProjectCreation" {
-        for entry in fs::read_dir(&temp_path)? {
-            let entry = entry?;
-            let path = entry.path();
-
-            // Skip directories that start with dot (like .docs, .meta, .git)
-            if path.is_dir()
-                && path
-                    .file_name()
-                    .and_then(|name| name.to_str())
-                    .map(|name| name.starts_with("."))
-                    .unwrap_or(false)
-            {
-                continue;
-            }
-
-            // Delete regular files
-            if path.is_file() {
-                println!("  Deleting file: {}", path.display());
-                fs::remove_file(path)?;
-            }
-        }
-
-        // Commit the deletion so it shows up in the diff
-        run_git(&temp_path, &["add", "."]).await?;
-        run_git(
-            &temp_path,
-            &["commit", "-m", "Remove root files for clean slate"],
-        )
+async fn run_git(repo_path: &Path, args: Vec<&str>) -> anyhow::Result<()> {
+    let exit_status = new_smol_command("git")
+        .current_dir(repo_path)
+        .args(args.clone())
+        .status()
        .await?;
-    }
-
-    let local_commit_sha = run_git(&temp_path, &["rev-parse", "HEAD"]).await?;
-
-    // Prepare prompt based on template
-    let prompt = match template.name {
-        "ProjectCreation" => format!(
-            "I need to create a new implementation for this exercise. Please create all the necessary files in the best location.\n\n{}",
-            instructions
-        ),
-        "CodeModification" => format!(
-            "I need help updating my code to meet these requirements. Please modify the appropriate files:\n\n{}",
-            instructions
-        ),
-        "ConversationalGuidance" => format!(
-            "I'm trying to solve this coding exercise but I'm not sure where to start. Can you help me understand the requirements and guide me through the solution process without writing code for me?\n\n{}",
-            instructions
-        ),
-        _ => instructions.clone(),
-    };
-
-    let start_time = SystemTime::now();
-
-    // Create a basic eval struct to work with the existing system
-    let eval = Eval {
-        repo_path: temp_path.clone(),
-        eval_setup: EvalSetup {
-            url: format!("file://{}", temp_path.display()),
-            base_sha: local_commit_sha, // Use the local commit SHA instead of the framework base SHA
-        },
-        user_prompt: prompt,
-    };
-
-    // Run the evaluation
-    let eval_output = cx
-        .update(|cx| eval.run(app_state.clone(), model.clone(), cx))?
-        .await?;
-
-    // Get diff from git
-    let diff = eval_output.diff.clone();
-
-    // For project creation template, we need to compare with reference implementation
-    let judge_output = if template.name == "ProjectCreation" {
-        let project_judge_prompt = template
-            .content
-            .replace(
-                "<!-- ```requirements go here``` -->",
-                &format!("```\n{}\n```", instructions),
-            )
-            .replace(
-                "<!-- ```reference code goes here``` -->",
-                &format!("```{}\n{}\n```", language, example_solution),
-            )
-            .replace(
-                "<!-- ```git diff goes here``` -->",
-                &format!("```\n{}\n```", diff),
-            );
-
-        // Use the run_with_prompt method which we'll add to judge.rs
-        let judge = crate::judge::Judge {
-            original_diff: None,
-            original_message: Some(project_judge_prompt),
-            model: judge_model.clone(),
-        };
-
-        cx.update(|cx| judge.run_with_prompt(cx))?.await?
-    } else if template.name == "CodeModification" {
-        // For CodeModification, we'll compare the example solution with the LLM-generated solution
-        let code_judge_prompt = template
-            .content
-            .replace(
-                "<!-- ```reference code goes here``` -->",
-                &format!("```{}\n{}\n```", language, example_solution),
-            )
-            .replace(
-                "<!-- ```git diff goes here``` -->",
-                &format!("```\n{}\n```", diff),
-            );
-
-        // Use the run_with_prompt method
-        let judge = crate::judge::Judge {
-            original_diff: None,
-            original_message: Some(code_judge_prompt),
-            model: judge_model.clone(),
-        };
-
-        cx.update(|cx| judge.run_with_prompt(cx))?.await?
+    if exit_status.success() {
+        Ok(())
    } else {
-        // Conversational template
-        let conv_judge_prompt = template
-            .content
-            .replace(
-                "<!-- ```query goes here``` -->",
-                &format!("```\n{}\n```", instructions),
-            )
-            .replace(
-                "<!-- ```transcript goes here``` -->",
-                &format!("```\n{}\n```", eval_output.last_message),
-            )
-            .replace(
-                "<!-- ```git diff goes here``` -->",
-                &format!("```\n{}\n```", diff),
-            );
-
-        // Use the run_with_prompt method for consistency
-        let judge = crate::judge::Judge {
-            original_diff: None,
-            original_message: Some(conv_judge_prompt),
-            model: judge_model.clone(),
-        };
-
-        cx.update(|cx| judge.run_with_prompt(cx))?.await?
-    };
-
-    let elapsed_time = start_time.elapsed()?;
-
-    // Calculate total tokens as the sum of input and output tokens
-    let input_tokens = eval_output.token_usage.input_tokens;
-    let output_tokens = eval_output.token_usage.output_tokens;
-    let tool_use_counts = eval_output.tool_use_counts.values().sum::<u32>();
-    let total_tokens = input_tokens + output_tokens;
-
-    // Get judge model name
-    let judge_model_name = judge_model.id().0.to_string();
-
-    // Save results to evaluation directory
-    let result = EvalResult {
-        exercise_name: exercise_name.clone(),
-        template_name: template.name.to_string(),
-        score: judge_output.trim().to_string(),
-        diff,
-        assistant_response: eval_output.last_message.clone(),
-        elapsed_time_ms: elapsed_time.as_millis(),
-        timestamp: SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)?
-            .as_millis(),
-        // Convert u32 token counts to usize
-        input_tokens: input_tokens.try_into().unwrap(),
-        output_tokens: output_tokens.try_into().unwrap(),
-        total_tokens: total_tokens.try_into().unwrap(),
-        tool_use_counts: tool_use_counts.try_into().unwrap(),
-        judge_model_name, // Add judge model name to result
-    };
-
-    Ok(result)
+        Err(anyhow!(
+            "`git {}` failed with {}",
+            args.join(" "),
+            exit_status,
+        ))
+    }
+}
+
+async fn query_git(repo_path: &Path, args: Vec<&str>) -> anyhow::Result<String> {
+    let output = new_smol_command("git")
+        .current_dir(repo_path)
+        .args(args.clone())
+        .output()
+        .await?;
+    if output.status.success() {
+        Ok(String::from_utf8(output.stdout)?.trim().to_string())
+    } else {
+        Err(anyhow!(
+            "`git {}` failed with {}",
+            args.join(" "),
+            output.status
+        ))
+    }
 }
--- a/crates/assistant_eval/src/get_exercise.rs
+++ b/crates/assistant_eval/src/get_exercise.rs
@@ -1,149 +0,0 @@
-use anyhow::{Result, anyhow};
-use std::{
-    fs,
-    path::{Path, PathBuf},
-};
-
-pub fn get_exercise_name(exercise_path: &Path) -> String {
-    exercise_path
-        .file_name()
-        .unwrap_or_default()
-        .to_string_lossy()
-        .to_string()
-}
-
-pub fn get_exercise_language(exercise_path: &Path) -> Result<String> {
-    // Extract the language from path (data/python/exercises/... => python)
-    let parts: Vec<_> = exercise_path.components().collect();
-
-    for (i, part) in parts.iter().enumerate() {
-        if i > 0 && part.as_os_str() == "eval_code" {
-            if i + 1 < parts.len() {
-                let language = parts[i + 1].as_os_str().to_string_lossy().to_string();
-                return Ok(language);
-            }
-        }
-    }
-
-    Err(anyhow!(
-        "Could not determine language from path: {:?}",
-        exercise_path
-    ))
-}
-
-pub fn find_exercises(
-    framework_path: &Path,
-    languages: &[&str],
-    max_per_language: Option<usize>,
-) -> Result<Vec<PathBuf>> {
-    let mut all_exercises = Vec::new();
-
-    println!("Searching for exercises in languages: {:?}", languages);
-
-    for language in languages {
-        let language_dir = framework_path
-            .join("eval_code")
-            .join(language)
-            .join("exercises")
-            .join("practice");
-
-        println!("Checking language directory: {:?}", language_dir);
-        if !language_dir.exists() {
-            println!("Warning: Language directory not found: {:?}", language_dir);
-            continue;
-        }
-
-        let mut exercises = Vec::new();
-        match fs::read_dir(&language_dir) {
-            Ok(entries) => {
-                for entry_result in entries {
-                    match entry_result {
-                        Ok(entry) => {
-                            let path = entry.path();
-
-                            if path.is_dir() {
-                                // Special handling for "internal" directory
-                                if *language == "internal" {
-                                    // Check for repo_info.json to validate it's an internal exercise
-                                    let repo_info_path = path.join(".meta").join("repo_info.json");
-                                    let instructions_path =
-                                        path.join(".docs").join("instructions.md");
-
-                                    if repo_info_path.exists() && instructions_path.exists() {
-                                        exercises.push(path);
-                                    }
-                                } else {
-                                    // Map the language to the file extension - original code
-                                    let language_extension = match *language {
-                                        "python" => "py",
-                                        "go" => "go",
-                                        "rust" => "rs",
-                                        "typescript" => "ts",
-                                        "javascript" => "js",
-                                        "ruby" => "rb",
-                                        "php" => "php",
-                                        "bash" => "sh",
-                                        "multi" => "diff",
-                                        _ => continue, // Skip unsupported languages
-                                    };
-
-                                    // Check if this is a valid exercise with instructions and example
-                                    let instructions_path =
-                                        path.join(".docs").join("instructions.md");
-                                    let has_instructions = instructions_path.exists();
-                                    let example_path = path
-                                        .join(".meta")
-                                        .join(format!("example.{}", language_extension));
-                                    let has_example = example_path.exists();
-
-                                    if has_instructions && has_example {
-                                        exercises.push(path);
-                                    }
-                                }
-                            }
-                        }
-                        Err(err) => println!("Error reading directory entry: {}", err),
-                    }
-                }
-            }
-            Err(err) => println!(
-                "Error reading directory {}: {}",
-                language_dir.display(),
-                err
-            ),
-        }
-
-        // Sort exercises by name for consistent selection
-        exercises.sort_by(|a, b| {
-            let a_name = a.file_name().unwrap_or_default().to_string_lossy();
-            let b_name = b.file_name().unwrap_or_default().to_string_lossy();
-            a_name.cmp(&b_name)
-        });
-
-        // Apply the limit if specified
-        if let Some(limit) = max_per_language {
-            if exercises.len() > limit {
-                println!(
-                    "Limiting {} exercises to {} for language {}",
-                    exercises.len(),
-                    limit,
-                    language
-                );
-                exercises.truncate(limit);
-            }
-        }
-
-        println!(
-            "Found {} exercises for language {}: {:?}",
-            exercises.len(),
-            language,
-            exercises
-                .iter()
-                .map(|p| p.file_name().unwrap_or_default().to_string_lossy())
-                .collect::<Vec<_>>()
-        );
-        all_exercises.extend(exercises);
-    }
-
-    Ok(all_exercises)
-}
--- a/crates/assistant_eval/src/git_commands.rs
+++ b/crates/assistant_eval/src/git_commands.rs
@@ -1,125 +0,0 @@
-use anyhow::{Result, anyhow};
-use serde::Deserialize;
-use std::{fs, path::Path};
-use tempfile::TempDir;
-use util::command::new_smol_command;
-use walkdir::WalkDir;
-
-#[derive(Debug, Deserialize)]
-pub struct SetupConfig {
-    #[serde(rename = "base.sha")]
-    pub base_sha: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct RepoInfo {
-    pub remote_url: String,
-    pub head_sha: String,
-}
-
-pub async fn run_git(repo_path: &Path, args: &[&str]) -> Result<String> {
-    let output = new_smol_command("git")
-        .current_dir(repo_path)
-        .args(args)
-        .output()
-        .await?;
-
-    if output.status.success() {
-        Ok(String::from_utf8(output.stdout)?.trim().to_string())
-    } else {
-        Err(anyhow!(
-            "Git command failed: {} with status: {}",
-            args.join(" "),
-            output.status
-        ))
-    }
-}
-
-pub async fn read_base_sha(framework_path: &Path) -> Result<String> {
-    let setup_path = framework_path.join("setup.json");
-    let setup_content = smol::unblock(move || std::fs::read_to_string(&setup_path)).await?;
-    let setup_config: SetupConfig = serde_json_lenient::from_str_lenient(&setup_content)?;
-    Ok(setup_config.base_sha)
-}
-
-pub async fn read_repo_info(exercise_path: &Path) -> Result<RepoInfo> {
-    let repo_info_path = exercise_path.join(".meta").join("repo_info.json");
-    println!("Reading repo info from: {}", repo_info_path.display());
-    let repo_info_content = smol::unblock(move || std::fs::read_to_string(&repo_info_path)).await?;
-    let repo_info: RepoInfo = serde_json_lenient::from_str_lenient(&repo_info_content)?;
-
-    // Remove any quotes from the strings
-    let remote_url = repo_info.remote_url.trim_matches('"').to_string();
-    let head_sha = repo_info.head_sha.trim_matches('"').to_string();
-
-    Ok(RepoInfo {
-        remote_url,
-        head_sha,
-    })
-}
-
-pub async fn setup_temp_repo(exercise_path: &Path, _base_sha: &str) -> Result<TempDir> {
-    let temp_dir = TempDir::new()?;
-
-    // Check if this is an internal exercise by looking for repo_info.json
-    let repo_info_path = exercise_path.join(".meta").join("repo_info.json");
-    if repo_info_path.exists() {
-        // This is an internal exercise, handle it differently
-        let repo_info = read_repo_info(exercise_path).await?;
-
-        // Clone the repository to the temp directory
-        let url = repo_info.remote_url;
-        let clone_path = temp_dir.path();
-        println!(
-            "Cloning repository from {} to {}",
-            url,
-            clone_path.display()
-        );
-        run_git(
-            &std::env::current_dir()?,
-            &["clone", &url, &clone_path.to_string_lossy()],
-        )
-        .await?;
-
-        // Checkout the specified commit
-        println!("Checking out commit: {}", repo_info.head_sha);
-        run_git(temp_dir.path(), &["checkout", &repo_info.head_sha]).await?;
-
-        println!("Successfully set up internal repository");
-    } else {
-        // Original code for regular exercises
-        // Copy the exercise files to the temp directory, excluding .docs and .meta
-        for entry in WalkDir::new(exercise_path).min_depth(0).max_depth(10) {
-            let entry = entry?;
-            let source_path = entry.path();
-
-            // Skip .docs and .meta directories completely
-            if source_path.starts_with(exercise_path.join(".docs"))
-                || source_path.starts_with(exercise_path.join(".meta"))
-            {
-                continue;
-            }
-
-            if source_path.is_file() {
-                let relative_path = source_path.strip_prefix(exercise_path)?;
-                let dest_path = temp_dir.path().join(relative_path);
-
-                // Make sure parent directories exist
-                if let Some(parent) = dest_path.parent() {
-                    fs::create_dir_all(parent)?;
-                }
-
-                fs::copy(source_path, dest_path)?;
-            }
-        }
-
-        // Initialize git repo in the temp directory
-        run_git(temp_dir.path(), &["init"]).await?;
-        run_git(temp_dir.path(), &["add", "."]).await?;
-        run_git(temp_dir.path(), &["commit", "-m", "Initial commit"]).await?;
-
-        println!("Created temp repo without .docs and .meta directories");
-    }
-
-    Ok(temp_dir)
-}
--- a/crates/assistant_eval/src/headless_assistant.rs
+++ b/crates/assistant_eval/src/headless_assistant.rs
@@ -1,11 +1,11 @@
-use agent::{RequestKind, Thread, ThreadEvent, ThreadStore};
 use anyhow::anyhow;
+use assistant2::{RequestKind, Thread, ThreadEvent, ThreadStore};
 use assistant_tool::ToolWorkingSet;
 use client::{Client, UserStore};
 use collections::HashMap;
 use dap::DapRegistry;
 use futures::StreamExt;
-use gpui::{App, AsyncApp, Entity, SemanticVersion, Subscription, Task, prelude::*};
+use gpui::{prelude::*, App, AsyncApp, Entity, SemanticVersion, Subscription, Task};
 use language::LanguageRegistry;
 use language_model::{
    AuthenticateError, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
@@ -102,40 +102,6 @@ impl HeadlessAssistant {
                    thread.use_pending_tools(cx);
                });
            }
-            ThreadEvent::ToolConfirmationNeeded => {
-                // Automatically approve all tools that need confirmation in headless mode
-                println!("Tool confirmation needed - automatically approving in headless mode");
-
-                // Get the tools needing confirmation
-                let tools_needing_confirmation: Vec<_> = thread
-                    .read(cx)
-                    .tools_needing_confirmation()
-                    .cloned()
-                    .collect();
-
-                // Run each tool that needs confirmation
-                for tool_use in tools_needing_confirmation {
-                    if let Some(tool) = thread.read(cx).tools().tool(&tool_use.name, cx) {
-                        thread.update(cx, |thread, cx| {
-                            println!("Auto-approving tool: {}", tool_use.name);
-
-                            // Create a request to send to the tool
-                            let request = thread.to_completion_request(RequestKind::Chat, cx);
-                            let messages = Arc::new(request.messages);
-
-                            // Run the tool
-                            thread.run_tool(
-                                tool_use.id.clone(),
-                                tool_use.ui_text.clone(),
-                                tool_use.input.clone(),
-                                &messages,
-                                tool,
-                                cx,
-                            );
-                        });
-                    }
-                }
-            }
            ThreadEvent::ToolFinished {
                tool_use_id,
                pending_tool_use,
@@ -156,15 +122,11 @@ impl HeadlessAssistant {
                }
                if thread.read(cx).all_tools_finished() {
                    let model_registry = LanguageModelRegistry::read_global(cx);
-                    if let Some(model) = model_registry.default_model() {
+                    if let Some(model) = model_registry.active_model() {
                        thread.update(cx, |thread, cx| {
-                            thread.attach_tool_results(cx);
-                            thread.send_to_model(model.model, RequestKind::Chat, cx);
+                            thread.attach_tool_results(vec![], cx);
+                            thread.send_to_model(model, RequestKind::Chat, cx);
                        });
-                    } else {
-                        println!(
-                            "Warning: No active language model available to continue conversation"
-                        );
                    }
                }
            }
@@ -205,7 +167,7 @@ pub fn init(cx: &mut App) -> Arc<HeadlessAppState> {
    context_server::init(cx);
    let stdout_is_a_pty = false;
    let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
-    agent::init(fs.clone(), client.clone(), prompt_builder.clone(), cx);
+    assistant2::init(fs.clone(), client.clone(), prompt_builder.clone(), cx);

    Arc::new(HeadlessAppState {
        languages,
--- a/crates/assistant_eval/src/judge.rs
+++ b/crates/assistant_eval/src/judge.rs
@@ -1,28 +1,58 @@
+use crate::eval::EvalOutput;
 use crate::headless_assistant::send_language_model_request;
 use anyhow::anyhow;
 use gpui::{App, Task};
 use language_model::{
    LanguageModel, LanguageModelRequest, LanguageModelRequestMessage, MessageContent, Role,
 };
-use std::sync::Arc;
+use std::{path::Path, sync::Arc};

 pub struct Judge {
-    #[allow(dead_code)]
    pub original_diff: Option<String>,
+    #[allow(dead_code)]
    pub original_message: Option<String>,
    pub model: Arc<dyn LanguageModel>,
 }

 impl Judge {
-    pub fn run_with_prompt(&self, cx: &mut App) -> Task<anyhow::Result<String>> {
-        let Some(prompt) = self.original_message.as_ref() else {
-            return Task::ready(Err(anyhow!("No prompt provided in original_message")));
+    pub async fn load(eval_path: &Path, model: Arc<dyn LanguageModel>) -> anyhow::Result<Judge> {
+        let original_diff_path = eval_path.join("original.diff");
+        let original_diff = smol::unblock(move || {
+            if std::fs::exists(&original_diff_path)? {
+                anyhow::Ok(Some(std::fs::read_to_string(&original_diff_path)?))
+            } else {
+                anyhow::Ok(None)
+            }
+        });
+
+        let original_message_path = eval_path.join("original_message.txt");
+        let original_message = smol::unblock(move || {
+            if std::fs::exists(&original_message_path)? {
+                anyhow::Ok(Some(std::fs::read_to_string(&original_message_path)?))
+            } else {
+                anyhow::Ok(None)
+            }
+        });
+
+        Ok(Self {
+            original_diff: original_diff.await?,
+            original_message: original_message.await?,
+            model,
+        })
+    }
+
+    pub fn run(&self, eval_output: &EvalOutput, cx: &mut App) -> Task<anyhow::Result<String>> {
+        let Some(original_diff) = self.original_diff.as_ref() else {
+            return Task::ready(Err(anyhow!("No original.diff found")));
        };

+        // TODO: check for empty diff?
+        let prompt = diff_comparison_prompt(&original_diff, &eval_output.diff);
+
        let request = LanguageModelRequest {
            messages: vec![LanguageModelRequestMessage {
                role: Role::User,
-                content: vec![MessageContent::Text(prompt.clone())],
+                content: vec![MessageContent::Text(prompt)],
                cache: false,
            }],
            temperature: Some(0.0),
@@ -31,7 +61,61 @@ impl Judge {
        };

        let model = self.model.clone();
-        let request = request.clone();
        cx.spawn(async move |cx| send_language_model_request(model, request, cx).await)
    }
 }
+
+pub fn diff_comparison_prompt(original_diff: &str, new_diff: &str) -> String {
+    format!(
+        r#"# Git Diff Similarity Evaluation Template
+
+## Instructions
+
+Compare the two diffs and score them between 0.0 and 1.0 based on their functional similarity.
+- 1.0 = Perfect functional match (achieves identical results)
+- 0.0 = No functional similarity whatsoever
+
+## Evaluation Criteria
+
+Please consider the following aspects in order of importance:
+
+1. **Functional Equivalence (60%)**
+   - Do both diffs achieve the same end result?
+   - Are the changes functionally equivalent despite possibly using different approaches?
+   - Do the modifications address the same issues or implement the same features?
+
+2. **Logical Structure (20%)**
+   - Are the logical flows similar?
+   - Do the modifications affect the same code paths?
+   - Are control structures (if/else, loops, etc.) modified in similar ways?
+
+3. **Code Content (15%)**
+   - Are similar lines added/removed?
+   - Are the same variables, functions, or methods being modified?
+   - Are the same APIs or libraries being used?
+
+4. **File Layout (5%)**
+   - Are the same files being modified?
+   - Are changes occurring in similar locations within files?
+
+## Input
+
+Original Diff:
+```git
+{}
+```
+
+New Diff:
+```git
+{}
+```
+
+## Output Format
+
+THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
+
+Example output:
+0.85"#,
+        original_diff, new_diff
+    )
+}
--- a/crates/assistant_eval/src/main.rs
+++ b/crates/assistant_eval/src/main.rs
@@ -1,21 +1,18 @@
 mod eval;
-mod get_exercise;
-mod git_commands;
 mod headless_assistant;
 mod judge;
-mod templates_eval;

 use clap::Parser;
-use eval::{run_exercise_eval, save_eval_results};
-use futures::stream::{self, StreamExt};
-use get_exercise::{find_exercises, get_exercise_language, get_exercise_name};
-use git_commands::read_base_sha;
-use gpui::Application;
-use headless_assistant::{authenticate_model_provider, find_model};
-use language_model::LanguageModelRegistry;
+use eval::{Eval, EvalOutput};
+use futures::future;
+use gpui::{Application, AsyncApp};
+use headless_assistant::{authenticate_model_provider, find_model, HeadlessAppState};
+use itertools::Itertools;
+use judge::Judge;
+use language_model::{LanguageModel, LanguageModelRegistry};
+use regex::Regex;
 use reqwest_client::ReqwestClient;
-use std::{path::PathBuf, sync::Arc};
-use templates_eval::all_templates;
+use std::{cmp, path::PathBuf, sync::Arc};

 #[derive(Parser, Debug)]
 #[command(
@@ -24,231 +21,204 @@ use templates_eval::all_templates;
    before_help = "Tool eval runner"
 )]
 struct Args {
-    /// Match the names of evals to run.
-    #[arg(long)]
-    exercise_names: Vec<String>,
-    /// Runs all exercises, causes the exercise_names to be ignored.
+    /// Regexes to match the names of evals to run.
+    eval_name_regexes: Vec<String>,
+    /// Runs all evals in `evaluation_data`, causes the regex to be ignored.
    #[arg(long)]
    all: bool,
-    /// Supported language types to evaluate (default: internal).
-    /// Internal is data generated from the agent panel
-    #[arg(long, default_value = "internal")]
-    languages: String,
    /// Name of the model (default: "claude-3-7-sonnet-latest")
    #[arg(long, default_value = "claude-3-7-sonnet-latest")]
    model_name: String,
+    /// Name of the editor model (default: value of `--model_name`).
+    #[arg(long)]
+    editor_model_name: Option<String>,
    /// Name of the judge model (default: value of `--model_name`).
    #[arg(long)]
    judge_model_name: Option<String>,
-    /// Number of evaluations to run concurrently (default: 3)
-    #[arg(short, long, default_value = "3")]
+    /// Number of evaluations to run concurrently (default: 10)
+    #[arg(short, long, default_value = "10")]
    concurrency: usize,
-    /// Maximum number of exercises to evaluate per language
-    #[arg(long)]
-    max_exercises_per_language: Option<usize>,
 }

-// First, let's define the order in which templates should be executed
-const TEMPLATE_EXECUTION_ORDER: [&str; 3] = [
-    "ProjectCreation",
-    "CodeModification",
-    "ConversationalGuidance",
-];
-
 fn main() {
    env_logger::init();
    let args = Args::parse();
    let http_client = Arc::new(ReqwestClient::new());
    let app = Application::headless().with_http_client(http_client.clone());

-    // Path to the zed-ace-framework repo
-    let framework_path = PathBuf::from("../zed-ace-framework")
-        .canonicalize()
-        .unwrap();
+    let crate_dir = PathBuf::from("../zed-agent-bench");
+    let evaluation_data_dir = crate_dir.join("evaluation_data").canonicalize().unwrap();

-    // Fix the 'languages' lifetime issue by creating owned Strings instead of slices
-    let languages: Vec<String> = args.languages.split(',').map(|s| s.to_string()).collect();
+    let repos_dir = crate_dir.join("repos");
+    if !repos_dir.exists() {
+        std::fs::create_dir_all(&repos_dir).unwrap();
+    }
+    let repos_dir = repos_dir.canonicalize().unwrap();

-    println!("Using zed-ace-framework at: {:?}", framework_path);
-    println!("Evaluating languages: {:?}", languages);
+    let all_evals = std::fs::read_dir(&evaluation_data_dir)
+        .unwrap()
+        .map(|path| path.unwrap().file_name().to_string_lossy().to_string())
+        .collect::<Vec<_>>();
+
+    let evals_to_run = if args.all {
+        all_evals
+    } else {
+        args.eval_name_regexes
+            .into_iter()
+            .map(|regex_string| Regex::new(&regex_string).unwrap())
+            .flat_map(|regex| {
+                all_evals
+                    .iter()
+                    .filter(|eval_name| regex.is_match(eval_name))
+                    .cloned()
+                    .collect::<Vec<_>>()
+            })
+            .collect::<Vec<_>>()
+    };
+
+    if evals_to_run.is_empty() {
+        panic!("Names of evals to run must be provided or `--all` specified");
+    }
+
+    println!("Will run the following evals: {evals_to_run:?}");
+    println!("Running up to {} evals concurrently", args.concurrency);
+
+    let editor_model_name = if let Some(model_name) = args.editor_model_name {
+        model_name
+    } else {
+        args.model_name.clone()
+    };
+
+    let judge_model_name = if let Some(model_name) = args.judge_model_name {
+        model_name
+    } else {
+        args.model_name.clone()
+    };

    app.run(move |cx| {
        let app_state = headless_assistant::init(cx);

        let model = find_model(&args.model_name, cx).unwrap();
-        let judge_model = if let Some(model_name) = &args.judge_model_name {
-            find_model(model_name, cx).unwrap()
-        } else {
-            model.clone()
-        };
+        let editor_model = find_model(&editor_model_name, cx).unwrap();
+        let judge_model = find_model(&judge_model_name, cx).unwrap();

        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            registry.set_default_model(Some(model.clone()), cx);
+            registry.set_active_model(Some(model.clone()), cx);
+            registry.set_editor_model(Some(editor_model.clone()), cx);
        });

        let model_provider_id = model.provider_id();
+        let editor_model_provider_id = editor_model.provider_id();
        let judge_model_provider_id = judge_model.provider_id();

-        let framework_path_clone = framework_path.clone();
-        let languages_clone = languages.clone();
-        let exercise_names = args.exercise_names.clone();
-        let all_flag = args.all;
-
        cx.spawn(async move |cx| {
            // Authenticate all model providers first
            cx.update(|cx| authenticate_model_provider(model_provider_id.clone(), cx))
                .unwrap()
                .await
                .unwrap();
+            cx.update(|cx| authenticate_model_provider(editor_model_provider_id.clone(), cx))
+                .unwrap()
+                .await
+                .unwrap();
            cx.update(|cx| authenticate_model_provider(judge_model_provider_id.clone(), cx))
                .unwrap()
                .await
                .unwrap();

-            // Read base SHA from setup.json
-            let base_sha = read_base_sha(&framework_path_clone).await.unwrap();
-
-            // Find all exercises for the specified languages
-            let all_exercises = find_exercises(
-                &framework_path_clone,
-                &languages_clone
-                    .iter()
-                    .map(|s| s.as_str())
-                    .collect::<Vec<_>>(),
-                args.max_exercises_per_language,
-            )
-            .unwrap();
-            println!("Found {} exercises total", all_exercises.len());
-
-            // Filter exercises if specific ones were requested
-            let exercises_to_run = if !exercise_names.is_empty() {
-                // If exercise names are specified, filter by them regardless of --all flag
-                all_exercises
-                    .into_iter()
-                    .filter(|path| {
-                        let name = get_exercise_name(path);
-                        exercise_names.iter().any(|filter| name.contains(filter))
-                    })
-                    .collect()
-            } else if all_flag {
-                // Only use all_flag if no exercise names are specified
-                all_exercises
-            } else {
-                // Default behavior (no filters)
-                all_exercises
-            };
-
-            println!("Will run {} exercises", exercises_to_run.len());
-
-            // Get all templates and sort them according to the execution order
-            let mut templates = all_templates();
-            templates.sort_by_key(|template| {
-                TEMPLATE_EXECUTION_ORDER
-                    .iter()
-                    .position(|&name| name == template.name)
-                    .unwrap_or(usize::MAX)
-            });
-
-            // Create exercise eval tasks - each exercise is a single task that will run templates sequentially
-            let exercise_tasks: Vec<_> = exercises_to_run
+            let eval_load_futures = evals_to_run
                .into_iter()
-                .map(|exercise_path| {
-                    let exercise_name = get_exercise_name(&exercise_path);
-                    let templates_clone = templates.clone();
-                    let model_clone = model.clone();
-                    let judge_model_clone = judge_model.clone();
-                    let app_state_clone = app_state.clone();
-                    let base_sha_clone = base_sha.clone();
-                    let framework_path_clone = framework_path_clone.clone();
-                    let cx_clone = cx.clone();
-
+                .map(|eval_name| {
+                    let eval_path = evaluation_data_dir.join(&eval_name);
+                    let load_future = Eval::load(eval_name.clone(), eval_path, &repos_dir);
                    async move {
-                        println!("Processing exercise: {}", exercise_name);
-                        let mut exercise_results = Vec::new();
-
-                        // Determine the language for this exercise
-                        let language = match get_exercise_language(&exercise_path) {
-                            Ok(lang) => lang,
+                        match load_future.await {
+                            Ok(eval) => Some(eval),
                            Err(err) => {
-                                println!(
-                                    "Error determining language for {}: {}",
-                                    exercise_name, err
-                                );
-                                return exercise_results;
-                            }
-                        };
-
-                        // Run each template sequentially for this exercise
-                        for template in templates_clone {
-                            // For "multi" or "internal" language, only run the CodeModification template
-                            if (language == "multi" || language == "internal")
-                                && template.name != "CodeModification"
-                            {
-                                println!(
-                                    "Skipping {} template for {} language",
-                                    template.name, language
-                                );
-                                continue;
-                            }
-
-                            match run_exercise_eval(
-                                exercise_path.clone(),
-                                template.clone(),
-                                model_clone.clone(),
-                                judge_model_clone.clone(),
-                                app_state_clone.clone(),
-                                base_sha_clone.clone(),
-                                framework_path_clone.clone(),
-                                cx_clone.clone(),
-                            )
-                            .await
-                            {
-                                Ok(result) => {
-                                    println!(
-                                        "Completed {} with template {} - score: {}",
-                                        exercise_name, template.name, result.score
-                                    );
-                                    exercise_results.push(result);
-                                }
-                                Err(err) => {
-                                    println!(
-                                        "Error running {} with template {}: {}",
-                                        exercise_name, template.name, err
-                                    );
-                                }
+                                // TODO: Persist errors / surface errors at the end.
+                                println!("Error loading {eval_name}: {err}");
+                                None
                            }
                        }
-
-                        // Save results for this exercise
-                        if !exercise_results.is_empty() {
-                            if let Err(err) =
-                                save_eval_results(&exercise_path, exercise_results.clone()).await
-                            {
-                                println!("Error saving results for {}: {}", exercise_name, err);
-                            } else {
-                                println!("Saved results for {}", exercise_name);
-                            }
-                        }
-
-                        exercise_results
                    }
                })
-                .collect();
+                .collect::<Vec<_>>();

-            println!(
-                "Running {} exercises with concurrency: {}",
-                exercise_tasks.len(),
-                args.concurrency
-            );
+            let loaded_evals = future::join_all(eval_load_futures)
+                .await
+                .into_iter()
+                .flatten()
+                .collect::<Vec<_>>();

-            // Run exercises concurrently, with each exercise running its templates sequentially
-            let all_results = stream::iter(exercise_tasks)
-                .buffer_unordered(args.concurrency)
-                .flat_map(stream::iter)
-                .collect::<Vec<_>>()
-                .await;
+            // The evals need to be loaded and grouped by URL before concurrently running, since
+            // evals that use the same remote URL will use the same working directory.
+            let mut evals_grouped_by_url: Vec<Vec<Eval>> = loaded_evals
+                .into_iter()
+                .map(|eval| (eval.eval_setup.url.clone(), eval))
+                .into_group_map()
+                .into_values()
+                .collect::<Vec<_>>();
+
+            // Sort groups in descending order, so that bigger groups start first.
+            evals_grouped_by_url.sort_by_key(|evals| cmp::Reverse(evals.len()));
+
+            let result_futures = evals_grouped_by_url
+                .into_iter()
+                .map(|evals| {
+                    let model = model.clone();
+                    let judge_model = judge_model.clone();
+                    let app_state = app_state.clone();
+                    let cx = cx.clone();
+
+                    async move {
+                        let mut results = Vec::new();
+                        for eval in evals {
+                            let name = eval.name.clone();
+                            println!("Starting eval named {}", name);
+                            let result = run_eval(
+                                eval,
+                                model.clone(),
+                                judge_model.clone(),
+                                app_state.clone(),
+                                cx.clone(),
+                            )
+                            .await;
+                            results.push((name, result));
+                        }
+                        results
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            let results = future::join_all(result_futures)
+                .await
+                .into_iter()
+                .flatten()
+                .collect::<Vec<_>>();
+
+            // Process results in order of completion
+            for (eval_name, result) in results {
+                match result {
+                    Ok((eval_output, judge_output)) => {
+                        println!("Generated diff for {eval_name}:\n");
+                        println!("{}\n", eval_output.diff);
+                        println!("Last message for {eval_name}:\n");
+                        println!("{}\n", eval_output.last_message);
+                        println!("Elapsed time: {:?}", eval_output.elapsed_time);
+                        println!(
+                            "Assistant response count: {}",
+                            eval_output.assistant_response_count
+                        );
+                        println!("Tool use counts: {:?}", eval_output.tool_use_counts);
+                        println!("Judge output for {eval_name}: {judge_output}");
+                    }
+                    Err(err) => {
+                        // TODO: Persist errors / surface errors at the end.
+                        println!("Error running {eval_name}: {err}");
+                    }
+                }
+            }

-            println!("Completed {} evaluation runs", all_results.len());
            cx.update(|cx| cx.quit()).unwrap();
        })
        .detach();
@@ -256,3 +226,18 @@ fn main() {

    println!("Done running evals");
 }
+
+async fn run_eval(
+    eval: Eval,
+    model: Arc<dyn LanguageModel>,
+    judge_model: Arc<dyn LanguageModel>,
+    app_state: Arc<HeadlessAppState>,
+    cx: AsyncApp,
+) -> anyhow::Result<(EvalOutput, String)> {
+    let path = eval.path.clone();
+    let judge = Judge::load(&path, judge_model).await?;
+    let eval_output = cx.update(|cx| eval.run(app_state, model, cx))?.await?;
+    let judge_output = cx.update(|cx| judge.run(&eval_output, cx))?.await?;
+    eval_output.save_to_directory(&path, judge_output.to_string())?;
+    Ok((eval_output, judge_output))
+}
--- a/crates/assistant_eval/src/templates_eval.rs
+++ b/crates/assistant_eval/src/templates_eval.rs
@@ -1,210 +0,0 @@
-#[derive(Clone, Debug)]
-pub struct Template {
-    pub name: &'static str,
-    pub content: &'static str,
-}
-
-pub fn all_templates() -> Vec<Template> {
-    vec![
-        Template {
-            name: "ProjectCreation",
-            content: r#"
-# Project Creation Evaluation Template
-
-## Instructions
-
-Evaluate how well the AI assistant created a new implementation from scratch. Score it between 0.0 and 1.0 based on quality and fulfillment of requirements.
- 1.0 = Perfect implementation that creates all necessary files with correct functionality.
- 0.0 = Completely fails to create working files or meet requirements.
-
-Note: A git diff output is required. If no code changes are provided (i.e., no git diff output), the score must be 0.0.
-
-## Evaluation Criteria
-
-Please consider the following aspects in order of importance:
-
-1. **File Creation (25%)**
-   - Did the assistant create all necessary files?
-   - Are the files appropriately named and organized?
-   - Did the assistant create a complete solution without missing components?
-
-2. **Functional Correctness (40%)**
-   - Does the implementation fulfill all specified requirements?
-   - Does it handle edge cases properly?
-   - Is it free of logical errors and bugs?
-   - Do all components work together as expected?
-
-3. **Code Quality (20%)**
-   - Is the code well-structured, readable and well-documented?
-   - Does it follow language-specific best practices?
-   - Is there proper error handling?
-   - Are naming conventions clear and consistent?
-
-4. **Architecture Design (15%)**
-   - Is the code modular and extensible?
-   - Is there proper separation of concerns?
-   - Are appropriate design patterns used?
-   - Is the overall architecture appropriate for the requirements?
-
-## Input
-
-Requirements:
-<!-- ```requirements go here``` -->
-
-Reference Implementation:
-<!-- ```reference code goes here``` -->
-
-AI-Generated Implementation (git diff output):
-<!-- ```git diff goes here``` -->
-
-## Output Format
-
-THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
-
-EXAMPLE ONE:
-
-0.92
-
-EXAMPLE TWO:
-
-0.85
-
-EXAMPLE THREE:
-
-0.78
-"#,
-        },
-        Template {
-            name: "CodeModification",
-            content: r#"
-# Code Modification Evaluation Template
-
-## Instructions
-
-Evaluate how well the AI assistant modified existing code to meet requirements. Score between 0.0 and 1.0 based on quality and appropriateness of changes.
- 1.0 = Perfect modifications that correctly implement all requirements.
- 0.0 = Failed to make appropriate changes or introduced serious errors.
-
-## Evaluation Criteria
-
-Please consider the following aspects in order of importance:
-
-1. **Functional Correctness (50%)**
-   - Do the modifications correctly implement the requirements?
-   - Did the assistant modify the right files and code sections?
-   - Are the changes free of bugs and logical errors?
-   - Do the modifications maintain compatibility with existing code?
-
-2. **Modification Approach (25%)**
-   - Are the changes minimal and focused on what needs to be changed?
-   - Did the assistant avoid unnecessary modifications?
-   - Are the changes integrated seamlessly with the existing codebase?
-   - Did the assistant preserve the original code style and patterns?
-
-3. **Code Quality (15%)**
-   - Are the modifications well-structured and documented?
-   - Do they follow the same conventions as the original code?
-   - Is there proper error handling in the modified code?
-   - Are the changes readable and maintainable?
-
-4. **Solution Completeness (10%)**
-   - Do the modifications completely address all requirements?
-   - Are there any missing changes or overlooked requirements?
-   - Did the assistant consider all necessary edge cases?
-
-## Input
-
-Original:
-<!-- ```reference code goes here``` -->
-
-New (git diff output):
-<!-- ```git diff goes here``` -->
-
-## Output Format
-
-THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
-
-EXAMPLE ONE:
-
-0.92
-
-EXAMPLE TWO:
-
-0.85
-
-EXAMPLE THREE:
-
-0.78
-"#,
-        },
-        Template {
-            name: "ConversationalGuidance",
-            content: r#"
-# Conversational Guidance Evaluation Template
-
-## Instructions
-
-Evaluate the quality of the AI assistant's conversational guidance and score it between 0.0 and 1.0.
- 1.0 = Perfect guidance with ideal information gathering, clarification, and advice without writing code.
- 0.0 = Completely unhelpful, inappropriate guidance, or wrote code when it should not have.
-
-## Evaluation Criteria
-
-ABSOLUTE REQUIREMENT:
-   - The assistant should NOT generate complete code solutions in conversation mode.
-   - If the git diff shows the assistant wrote complete code, the score should be significantly reduced.
-
-1. **Information Gathering Effectiveness (30%)**
-   - Did the assistant ask relevant and precise questions?
-   - Did it efficiently narrow down the problem scope?
-   - Did it avoid unnecessary or redundant questions?
-   - Was questioning appropriately paced and contextual?
-
-2. **Conceptual Guidance (30%)**
-   - Did the assistant provide high-level approaches and strategies?
-   - Did it explain relevant concepts and algorithms?
-   - Did it offer planning advice without implementing the solution?
-   - Did it suggest a structured approach to solving the problem?
-
-3. **Educational Value (20%)**
-   - Did the assistant help the user understand the problem better?
-   - Did it provide explanations that would help the user learn?
-   - Did it guide without simply giving away answers?
-   - Did it encourage the user to think through parts of the problem?
-
-4. **Conversation Quality (20%)**
-   - Was the conversation logically structured and easy to follow?
-   - Did the assistant maintain appropriate context throughout?
-   - Was the interaction helpful without being condescending?
-   - Did the conversation reach a satisfactory conclusion with clear next steps?
-
-## Input
-
-Initial Query:
-<!-- ```query goes here``` -->
-
-Conversation Transcript:
-<!-- ```transcript goes here``` -->
-
-Git Diff:
-<!-- ```git diff goes here``` -->
-
-## Output Format
-
-THE ONLY OUTPUT SHOULD BE A SCORE BETWEEN 0.0 AND 1.0.
-
-EXAMPLE ONE:
-
-0.92
-
-EXAMPLE TWO:
-
-0.85
-
-EXAMPLE THREE:
-
-0.78
-"#,
-        },
-    ]
-}
--- a/crates/assistant_settings/Cargo.toml
+++ b/crates/assistant_settings/Cargo.toml
@@ -26,7 +26,6 @@ deepseek = { workspace = true, features = ["schemars"] }
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 fs.workspace = true
--- a/crates/assistant_settings/src/agent_profile.rs
+++ b/crates/assistant_settings/src/agent_profile.rs
@@ -2,29 +2,6 @@ use std::sync::Arc;

 use gpui::SharedString;
 use indexmap::IndexMap;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct AgentProfileId(pub Arc<str>);
-
-impl AgentProfileId {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl std::fmt::Display for AgentProfileId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Default for AgentProfileId {
-    fn default() -> Self {
-        Self("write".into())
-    }
-}

 /// A profile for the Zed Agent that controls its behavior.
 #[derive(Debug, Clone)]
@@ -32,7 +9,6 @@ pub struct AgentProfile {
    /// The name of the profile.
    pub name: SharedString,
    pub tools: IndexMap<Arc<str>, bool>,
-    pub enable_all_context_servers: bool,
    pub context_servers: IndexMap<Arc<str>, ContextServerPreset>,
 }

--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -4,15 +4,14 @@ use std::sync::Arc;

 use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
-use anyhow::{Result, bail};
 use deepseek::Model as DeepseekModel;
-use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
+use feature_flags::FeatureFlagAppExt;
 use gpui::{App, Pixels};
 use indexmap::IndexMap;
 use language_model::{CloudModel, LanguageModel};
 use lmstudio::Model as LmStudioModel;
 use ollama::Model as OllamaModel;
-use schemars::{JsonSchema, schema::Schema};
+use schemars::{schema::Schema, JsonSchema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};

@@ -77,45 +76,27 @@ pub struct AssistantSettings {
    pub default_width: Pixels,
    pub default_height: Pixels,
    pub default_model: LanguageModelSelection,
-    pub inline_assistant_model: Option<LanguageModelSelection>,
-    pub commit_message_model: Option<LanguageModelSelection>,
-    pub thread_summary_model: Option<LanguageModelSelection>,
+    pub editor_model: LanguageModelSelection,
    pub inline_alternatives: Vec<LanguageModelSelection>,
    pub using_outdated_settings_version: bool,
    pub enable_experimental_live_diffs: bool,
-    pub default_profile: AgentProfileId,
-    pub profiles: IndexMap<AgentProfileId, AgentProfile>,
+    pub default_profile: Arc<str>,
+    pub profiles: IndexMap<Arc<str>, AgentProfile>,
    pub always_allow_tool_actions: bool,
    pub notify_when_agent_waiting: NotifyWhenAgentWaiting,
 }

 impl AssistantSettings {
    pub fn are_live_diffs_enabled(&self, cx: &App) -> bool {
-        if cx.has_flag::<Assistant2FeatureFlag>() {
-            return false;
-        }
-
        cx.is_staff() || self.enable_experimental_live_diffs
    }
-
-    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        self.inline_assistant_model = Some(LanguageModelSelection { provider, model });
-    }
-
-    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
-        self.commit_message_model = Some(LanguageModelSelection { provider, model });
-    }
-
-    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        self.thread_summary_model = Some(LanguageModelSelection { provider, model });
-    }
 }

 /// Assistant panel settings
 #[derive(Clone, Serialize, Deserialize, Debug)]
 #[serde(untagged)]
 pub enum AssistantSettingsContent {
-    Versioned(Box<VersionedAssistantSettingsContent>),
+    Versioned(VersionedAssistantSettingsContent),
    Legacy(LegacyAssistantSettingsContent),
 }

@@ -135,14 +116,14 @@ impl JsonSchema for AssistantSettingsContent {

 impl Default for AssistantSettingsContent {
    fn default() -> Self {
-        Self::Versioned(Box::new(VersionedAssistantSettingsContent::default()))
+        Self::Versioned(VersionedAssistantSettingsContent::default())
    }
 }

 impl AssistantSettingsContent {
    pub fn is_version_outdated(&self) -> bool {
        match self {
-            AssistantSettingsContent::Versioned(settings) => match **settings {
+            AssistantSettingsContent::Versioned(settings) => match settings {
                VersionedAssistantSettingsContent::V1(_) => true,
                VersionedAssistantSettingsContent::V2(_) => false,
            },
@@ -152,8 +133,8 @@ impl AssistantSettingsContent {

    fn upgrade(&self) -> AssistantSettingsContentV2 {
        match self {
-            AssistantSettingsContent::Versioned(settings) => match **settings {
-                VersionedAssistantSettingsContent::V1(ref settings) => AssistantSettingsContentV2 {
+            AssistantSettingsContent::Versioned(settings) => match settings {
+                VersionedAssistantSettingsContent::V1(settings) => AssistantSettingsContentV2 {
                    enabled: settings.enabled,
                    button: settings.button,
                    dock: settings.dock,
@@ -200,9 +181,7 @@ impl AssistantSettingsContent {
                                })
                            }
                        }),
-                    inline_assistant_model: None,
-                    commit_message_model: None,
-                    thread_summary_model: None,
+                    editor_model: None,
                    inline_alternatives: None,
                    enable_experimental_live_diffs: None,
                    default_profile: None,
@@ -210,7 +189,7 @@ impl AssistantSettingsContent {
                    always_allow_tool_actions: None,
                    notify_when_agent_waiting: None,
                },
-                VersionedAssistantSettingsContent::V2(ref settings) => settings.clone(),
+                VersionedAssistantSettingsContent::V2(settings) => settings.clone(),
            },
            AssistantSettingsContent::Legacy(settings) => AssistantSettingsContentV2 {
                enabled: None,
@@ -227,9 +206,7 @@ impl AssistantSettingsContent {
                        .id()
                        .to_string(),
                }),
-                inline_assistant_model: None,
-                commit_message_model: None,
-                thread_summary_model: None,
+                editor_model: None,
                inline_alternatives: None,
                enable_experimental_live_diffs: None,
                default_profile: None,
@@ -242,11 +219,11 @@ impl AssistantSettingsContent {

    pub fn set_dock(&mut self, dock: AssistantDockPosition) {
        match self {
-            AssistantSettingsContent::Versioned(settings) => match **settings {
-                VersionedAssistantSettingsContent::V1(ref mut settings) => {
+            AssistantSettingsContent::Versioned(settings) => match settings {
+                VersionedAssistantSettingsContent::V1(settings) => {
                    settings.dock = Some(dock);
                }
-                VersionedAssistantSettingsContent::V2(ref mut settings) => {
+                VersionedAssistantSettingsContent::V2(settings) => {
                    settings.dock = Some(dock);
                }
            },
@@ -261,79 +238,77 @@ impl AssistantSettingsContent {
        let provider = language_model.provider_id().0.to_string();

        match self {
-            AssistantSettingsContent::Versioned(settings) => match **settings {
-                VersionedAssistantSettingsContent::V1(ref mut settings) => {
-                    match provider.as_ref() {
-                        "zed.dev" => {
-                            log::warn!("attempted to set zed.dev model on outdated settings");
-                        }
-                        "anthropic" => {
-                            let api_url = match &settings.provider {
-                                Some(AssistantProviderContentV1::Anthropic { api_url, .. }) => {
-                                    api_url.clone()
-                                }
-                                _ => None,
-                            };
-                            settings.provider = Some(AssistantProviderContentV1::Anthropic {
-                                default_model: AnthropicModel::from_id(&model).ok(),
-                                api_url,
-                            });
-                        }
-                        "ollama" => {
-                            let api_url = match &settings.provider {
-                                Some(AssistantProviderContentV1::Ollama { api_url, .. }) => {
-                                    api_url.clone()
-                                }
-                                _ => None,
-                            };
-                            settings.provider = Some(AssistantProviderContentV1::Ollama {
-                                default_model: Some(ollama::Model::new(&model, None, None)),
-                                api_url,
-                            });
-                        }
-                        "lmstudio" => {
-                            let api_url = match &settings.provider {
-                                Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
-                                    api_url.clone()
-                                }
-                                _ => None,
-                            };
-                            settings.provider = Some(AssistantProviderContentV1::LmStudio {
-                                default_model: Some(lmstudio::Model::new(&model, None, None)),
-                                api_url,
-                            });
-                        }
-                        "openai" => {
-                            let (api_url, available_models) = match &settings.provider {
-                                Some(AssistantProviderContentV1::OpenAi {
-                                    api_url,
-                                    available_models,
-                                    ..
-                                }) => (api_url.clone(), available_models.clone()),
-                                _ => (None, None),
-                            };
-                            settings.provider = Some(AssistantProviderContentV1::OpenAi {
-                                default_model: OpenAiModel::from_id(&model).ok(),
+            AssistantSettingsContent::Versioned(settings) => match settings {
+                VersionedAssistantSettingsContent::V1(settings) => match provider.as_ref() {
+                    "zed.dev" => {
+                        log::warn!("attempted to set zed.dev model on outdated settings");
+                    }
+                    "anthropic" => {
+                        let api_url = match &settings.provider {
+                            Some(AssistantProviderContentV1::Anthropic { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AssistantProviderContentV1::Anthropic {
+                            default_model: AnthropicModel::from_id(&model).ok(),
+                            api_url,
+                        });
+                    }
+                    "ollama" => {
+                        let api_url = match &settings.provider {
+                            Some(AssistantProviderContentV1::Ollama { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AssistantProviderContentV1::Ollama {
+                            default_model: Some(ollama::Model::new(&model, None, None)),
+                            api_url,
+                        });
+                    }
+                    "lmstudio" => {
+                        let api_url = match &settings.provider {
+                            Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AssistantProviderContentV1::LmStudio {
+                            default_model: Some(lmstudio::Model::new(&model, None, None)),
+                            api_url,
+                        });
+                    }
+                    "openai" => {
+                        let (api_url, available_models) = match &settings.provider {
+                            Some(AssistantProviderContentV1::OpenAi {
                                api_url,
                                available_models,
-                            });
-                        }
-                        "deepseek" => {
-                            let api_url = match &settings.provider {
-                                Some(AssistantProviderContentV1::DeepSeek { api_url, .. }) => {
-                                    api_url.clone()
-                                }
-                                _ => None,
-                            };
-                            settings.provider = Some(AssistantProviderContentV1::DeepSeek {
-                                default_model: DeepseekModel::from_id(&model).ok(),
-                                api_url,
-                            });
-                        }
-                        _ => {}
+                                ..
+                            }) => (api_url.clone(), available_models.clone()),
+                            _ => (None, None),
+                        };
+                        settings.provider = Some(AssistantProviderContentV1::OpenAi {
+                            default_model: OpenAiModel::from_id(&model).ok(),
+                            api_url,
+                            available_models,
+                        });
                    }
-                }
-                VersionedAssistantSettingsContent::V2(ref mut settings) => {
+                    "deepseek" => {
+                        let api_url = match &settings.provider {
+                            Some(AssistantProviderContentV1::DeepSeek { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AssistantProviderContentV1::DeepSeek {
+                            default_model: DeepseekModel::from_id(&model).ok(),
+                            api_url,
+                        });
+                    }
+                    _ => {}
+                },
+                VersionedAssistantSettingsContent::V2(settings) => {
                    settings.default_model = Some(LanguageModelSelection { provider, model });
                }
            },
@@ -345,89 +320,17 @@ impl AssistantSettingsContent {
        }
    }

-    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        if let AssistantSettingsContent::Versioned(boxed) = self {
-            if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-                settings.inline_assistant_model = Some(LanguageModelSelection { provider, model });
-            }
+    pub fn set_profile(&mut self, profile_id: Arc<str>) {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match settings {
+                VersionedAssistantSettingsContent::V2(settings) => {
+                    settings.default_profile = Some(profile_id);
+                }
+                VersionedAssistantSettingsContent::V1(_) => {}
+            },
+            AssistantSettingsContent::Legacy(_) => {}
        }
    }
-
-    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
-        if let AssistantSettingsContent::Versioned(boxed) = self {
-            if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-                settings.commit_message_model = Some(LanguageModelSelection { provider, model });
-            }
-        }
-    }
-
-    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        if let AssistantSettingsContent::Versioned(boxed) = self {
-            if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-                settings.thread_summary_model = Some(LanguageModelSelection { provider, model });
-            }
-        }
-    }
-
-    pub fn set_always_allow_tool_actions(&mut self, allow: bool) {
-        let AssistantSettingsContent::Versioned(boxed) = self else {
-            return;
-        };
-
-        if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-            settings.always_allow_tool_actions = Some(allow);
-        }
-    }
-
-    pub fn set_profile(&mut self, profile_id: AgentProfileId) {
-        let AssistantSettingsContent::Versioned(boxed) = self else {
-            return;
-        };
-
-        if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-            settings.default_profile = Some(profile_id);
-        }
-    }
-
-    pub fn create_profile(
-        &mut self,
-        profile_id: AgentProfileId,
-        profile: AgentProfile,
-    ) -> Result<()> {
-        let AssistantSettingsContent::Versioned(boxed) = self else {
-            return Ok(());
-        };
-
-        if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-            let profiles = settings.profiles.get_or_insert_default();
-            if profiles.contains_key(&profile_id) {
-                bail!("profile with ID '{profile_id}' already exists");
-            }
-
-            profiles.insert(
-                profile_id,
-                AgentProfileContent {
-                    name: profile.name.into(),
-                    tools: profile.tools,
-                    enable_all_context_servers: Some(profile.enable_all_context_servers),
-                    context_servers: profile
-                        .context_servers
-                        .into_iter()
-                        .map(|(server_id, preset)| {
-                            (
-                                server_id,
-                                ContextServerPresetContent {
-                                    tools: preset.tools,
-                                },
-                            )
-                        })
-                        .collect(),
-                },
-            );
-        }
-
-        Ok(())
-    }
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
@@ -448,9 +351,7 @@ impl Default for VersionedAssistantSettingsContent {
            default_width: None,
            default_height: None,
            default_model: None,
-            inline_assistant_model: None,
-            commit_message_model: None,
-            thread_summary_model: None,
+            editor_model: None,
            inline_alternatives: None,
            enable_experimental_live_diffs: None,
            default_profile: None,
@@ -483,26 +384,20 @@ pub struct AssistantSettingsContentV2 {
    ///
    /// Default: 320
    default_height: Option<f32>,
-    /// The default model to use when creating new chats and for other features when a specific model is not specified.
+    /// The default model to use when creating new chats.
    default_model: Option<LanguageModelSelection>,
-    /// Model to use for the inline assistant. Defaults to default_model when not specified.
-    inline_assistant_model: Option<LanguageModelSelection>,
-    /// Model to use for generating git commit messages. Defaults to default_model when not specified.
-    commit_message_model: Option<LanguageModelSelection>,
-    /// Model to use for generating thread summaries. Defaults to default_model when not specified.
-    thread_summary_model: Option<LanguageModelSelection>,
+    /// The model to use when applying edits from the assistant.
+    editor_model: Option<LanguageModelSelection>,
    /// Additional models with which to generate alternatives when performing inline assists.
    inline_alternatives: Option<Vec<LanguageModelSelection>>,
    /// Enable experimental live diffs in the assistant panel.
    ///
    /// Default: false
    enable_experimental_live_diffs: Option<bool>,
-    /// The default profile to use in the Agent.
-    ///
-    /// Default: write
-    default_profile: Option<AgentProfileId>,
-    /// The available agent profiles.
-    pub profiles: Option<IndexMap<AgentProfileId, AgentProfileContent>>,
+    #[schemars(skip)]
+    default_profile: Option<Arc<str>>,
+    #[schemars(skip)]
+    pub profiles: Option<IndexMap<Arc<str>, AgentProfileContent>>,
    /// Whenever a tool action would normally wait for your confirmation
    /// that you allow it, always choose to allow it.
    ///
@@ -551,10 +446,7 @@ impl Default for LanguageModelSelection {
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct AgentProfileContent {
    pub name: Arc<str>,
-    #[serde(default)]
    pub tools: IndexMap<Arc<str>, bool>,
-    /// Whether all context servers are enabled by default.
-    pub enable_all_context_servers: Option<bool>,
    #[serde(default)]
    pub context_servers: IndexMap<Arc<str>, ContextServerPresetContent>,
 }
@@ -652,15 +544,7 @@ impl Settings for AssistantSettings {
                value.default_height.map(Into::into),
            );
            merge(&mut settings.default_model, value.default_model);
-            settings.inline_assistant_model = value
-                .inline_assistant_model
-                .or(settings.inline_assistant_model.take());
-            settings.commit_message_model = value
-                .commit_message_model
-                .or(settings.commit_message_model.take());
-            settings.thread_summary_model = value
-                .thread_summary_model
-                .or(settings.thread_summary_model.take());
+            merge(&mut settings.editor_model, value.editor_model);
            merge(&mut settings.inline_alternatives, value.inline_alternatives);
            merge(
                &mut settings.enable_experimental_live_diffs,
@@ -685,9 +569,6 @@ impl Settings for AssistantSettings {
                            AgentProfile {
                                name: profile.name.into(),
                                tools: profile.tools,
-                                enable_all_context_servers: profile
-                                    .enable_all_context_servers
-                                    .unwrap_or_default(),
                                context_servers: profile
                                    .context_servers
                                    .into_iter()
@@ -751,15 +632,16 @@ mod tests {
            settings::SettingsStore::global(cx).update_settings_file::<AssistantSettings>(
                fs.clone(),
                |settings, _| {
-                    *settings = AssistantSettingsContent::Versioned(Box::new(
+                    *settings = AssistantSettingsContent::Versioned(
                        VersionedAssistantSettingsContent::V2(AssistantSettingsContentV2 {
                            default_model: Some(LanguageModelSelection {
                                provider: "test-provider".into(),
                                model: "gpt-99".into(),
                            }),
-                            inline_assistant_model: None,
-                            commit_message_model: None,
-                            thread_summary_model: None,
+                            editor_model: Some(LanguageModelSelection {
+                                provider: "test-provider".into(),
+                                model: "gpt-99".into(),
+                            }),
                            inline_alternatives: None,
                            enabled: None,
                            button: None,
@@ -772,7 +654,7 @@ mod tests {
                            always_allow_tool_actions: None,
                            notify_when_agent_waiting: None,
                        }),
-                    ))
+                    )
                },
            );
        });
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -26,7 +26,6 @@ serde.workspace = true
 serde_json.workspace = true
 ui.workspace = true
 workspace.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -6,17 +6,17 @@ pub use crate::extension_slash_command::*;
 pub use crate::slash_command_registry::*;
 pub use crate::slash_command_working_set::*;
 use anyhow::Result;
-use futures::StreamExt;
 use futures::stream::{self, BoxStream};
+use futures::StreamExt;
 use gpui::{App, SharedString, Task, WeakEntity, Window};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
 pub use language_model::Role;
 use serde::{Deserialize, Serialize};
 use std::{
    ops::Range,
-    sync::{Arc, atomic::AtomicBool},
+    sync::{atomic::AtomicBool, Arc},
 };
-use workspace::{Workspace, ui::IconName};
+use workspace::{ui::IconName, Workspace};

 pub fn init(cx: &mut App) {
    SlashCommandRegistry::default_global(cx);
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -1,5 +1,5 @@
 use std::path::PathBuf;
-use std::sync::{Arc, atomic::AtomicBool};
+use std::sync::{atomic::AtomicBool, Arc};

 use anyhow::Result;
 use async_trait::async_trait;
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -42,7 +42,6 @@ ui.workspace = true
 util.workspace = true
 workspace.workspace = true
 worktree.workspace = true
-workspace-hack.workspace = true

 [dev-dependencies]
 env_logger.workspace = true
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{anyhow, Context as _, Result};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
    SlashCommandResult,
@@ -10,7 +10,7 @@ use project::{Project, ProjectPath};
 use std::{
    fmt::Write,
    path::Path,
-    sync::{Arc, atomic::AtomicBool},
+    sync::{atomic::AtomicBool, Arc},
 };
 use ui::prelude::*;
 use workspace::Workspace;
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -1,4 +1,4 @@
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use assistant_slash_command::{
    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
    SlashCommandOutputSection, SlashCommandResult,
@@ -10,8 +10,8 @@ use context_server::{
 };
 use gpui::{App, Entity, Task, WeakEntity, Window};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 use text::LineEnding;
 use ui::{IconName, SharedString};
 use workspace::Workspace;
@@ -88,8 +88,8 @@ impl SlashCommand for ContextServerSlashCommand {
        let server_id = self.server_id.clone();
        let prompt_name = self.prompt.name.clone();

-        if let Some(server) = self.server_manager.read(cx).get_server(&server_id) {
-            cx.foreground_executor().spawn(async move {
+        match self.server_manager.read(cx).get_server(&server_id) {
+            Some(server) => cx.foreground_executor().spawn(async move {
                let Some(protocol) = server.client() else {
                    return Err(anyhow!("Context server not initialized"));
                };
@@ -118,9 +118,8 @@ impl SlashCommand for ContextServerSlashCommand {
                    })
                    .collect();
                Ok(completions)
-            })
-        } else {
-            Task::ready(Err(anyhow!("Context server not found")))
+            }),
+            _ => Task::ready(Err(anyhow!("Context server not found"))),
        }
    }

@@ -143,56 +142,57 @@ impl SlashCommand for ContextServerSlashCommand {
        };

        let manager = self.server_manager.read(cx);
-        if let Some(server) = manager.get_server(&server_id) {
-            cx.foreground_executor().spawn(async move {
-                let Some(protocol) = server.client() else {
-                    return Err(anyhow!("Context server not initialized"));
-                };
-                let result = protocol.run_prompt(&prompt_name, prompt_args).await?;
+        match manager.get_server(&server_id) {
+            Some(server) => {
+                cx.foreground_executor().spawn(async move {
+                    let Some(protocol) = server.client() else {
+                        return Err(anyhow!("Context server not initialized"));
+                    };
+                    let result = protocol.run_prompt(&prompt_name, prompt_args).await?;

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

-                // Extract text from user messages into a single prompt string
-                let mut prompt = result
-                    .messages
-                    .into_iter()
-                    .filter_map(|msg| match msg.content {
-                        context_server::types::MessageContent::Text { text, .. } => Some(text),
-                        _ => None,
-                    })
-                    .collect::<Vec<String>>()
-                    .join("\n\n");
+                    // Extract text from user messages into a single prompt string
+                    let mut prompt = result
+                        .messages
+                        .into_iter()
+                        .filter_map(|msg| match msg.content {
+                            context_server::types::MessageContent::Text { text, .. } => Some(text),
+                            _ => None,
+                        })
+                        .collect::<Vec<String>>()
+                        .join("\n\n");

-                // We must normalize the line endings here, since servers might return CR characters.
-                LineEnding::normalize(&mut prompt);
+                    // We must normalize the line endings here, since servers might return CR characters.
+                    LineEnding::normalize(&mut prompt);

-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: 0..(prompt.len()),
-                        icon: IconName::ZedAssistant,
-                        label: SharedString::from(
-                            result
-                                .description
-                                .unwrap_or(format!("Result from {}", prompt_name)),
-                        ),
-                        metadata: None,
-                    }],
-                    text: prompt,
-                    run_commands_in_text: false,
-                }
-                .to_event_stream())
-            })
-        } else {
-            Task::ready(Err(anyhow!("Context server not found")))
+                    Ok(SlashCommandOutput {
+                        sections: vec![SlashCommandOutputSection {
+                            range: 0..(prompt.len()),
+                            icon: IconName::ZedAssistant,
+                            label: SharedString::from(
+                                result
+                                    .description
+                                    .unwrap_or(format!("Result from {}", prompt_name)),
+                            ),
+                            metadata: None,
+                        }],
+                        text: prompt,
+                        run_commands_in_text: false,
+                    }
+                    .to_event_stream())
+                })
+            }
+            _ => Task::ready(Err(anyhow!("Context server not found"))),
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Piotr Osiewicz	8f44ff7d31	Cargo fmt	2025-03-31 15:31:27 +02:00
Piotr Osiewicz	e85ec8ffb7	chore: Prepare for Rust 2024 This is just a result of `cargo fix --edition`, without actually bumping the edition just yet.	2025-03-31 15:29:44 +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-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></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-bug-off-icon lucide-bug-off"><path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2"/><path d="M14.12 3.88 16 2"/><path d="M22 13h-4v-2a4 4 0 0 0-4-4h-1.3"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="m2 2 20 20"/><path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13"/><path d="M12 20v-8"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/></svg>