Fix warnings

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Send serialized EvaluatedExample structs to Snowflake
2025-04-23 15:05:54 -06:00 · 2025-04-23 14:53:31 -06:00 · 2025-04-23 14:44:06 -06:00
607 changed files with 19442 additions and 90330 deletions
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -2,7 +2,7 @@ name: Run Agent Eval

 on:
  schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 * * * *"

  pull_request:
    branches:
@@ -25,15 +25,6 @@ env:
  ZED_EVAL_TELEMETRY: 1

 jobs:
-  # This is a no-op job that we run to prevent GitHub from marking the workflow
-  # as failed for PRs that don't have the `run-eval` label.
-  noop:
-    name: No-op
-    runs-on: ubuntu-latest
-    steps:
-      - name: No-op
-        run: echo "Nothing to do"
-
  run_eval:
    timeout-minutes: 60
    name: Run Agent Eval
@@ -69,7 +60,7 @@ jobs:
        run: cargo build --package=eval

      - name: Run eval
-        run: cargo run --package=eval -- --repetitions=8 --concurrency=1
+        run: cargo run --package=eval -- --repetitions=3 --concurrency=1

      # Even the Linux runner is not stateful, in theory there is no need to do this cleanup.
      # But, to avoid potential issues in the future if we choose to use a stateful Linux runner and forget to add code
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -170,6 +170,55 @@ jobs:
      - name: Upload Zed Nightly
        run: script/upload-nightly linux-targz

+  bundle-nix:
+    timeout-minutes: 60
+    name: (${{ matrix.system.os }}) Nix Build
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        system:
+          - os: x86 Linux
+            runner: buildjet-16vcpu-ubuntu-2204
+            install_nix: true
+          - os: arm Mac
+            runner: [macOS, ARM64, test]
+            install_nix: false
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ${{ matrix.system.runner }}
+    needs: tests
+    env:
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
+      GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+
+      # on our macs we manually install nix. for some reason the cachix action is running
+      # under a non-login /bin/bash shell which doesn't source the proper script to add the
+      # nix profile to PATH, so we manually add them here
+      - name: Set path
+        if: ${{ ! matrix.system.install_nix }}
+        run: |
+          echo "/nix/var/nix/profiles/default/bin" >> $GITHUB_PATH
+          echo "/Users/administrator/.nix-profile/bin" >> $GITHUB_PATH
+
+      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        if: ${{ matrix.system.install_nix }}
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          name: zed-industries
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+      - run: nix build
+      - name: Limit /nix/store to 50GB
+        run: '[ $(du -sm /nix/store | cut -f1) -gt 50000 ] && nix-collect-garbage -d'
+
  update-nightly-tag:
    name: Update nightly tag
    if: github.repository_owner == 'zed-industries'
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@
 /crates/theme/schemas/theme.json
 /crates/zed/resources/flatpak/flatpak-cargo-sources.json
 /dev.zed.Zed*.json
-/node_modules/
 /plugins/bin
 /script/node_modules
 /snap
@@ -33,5 +32,4 @@ Packages
 xcuserdata/

 # Don't commit any secrets to the repo.
-.env
 .env.secret.toml
--- a/.rules
+++ b/.rules
@@ -119,8 +119,3 @@ GPUI has had some changes to its APIs. Always write code using the new APIs:
 * Use `App` references. This replaces `AppContext` which no longer exists and should NEVER be used.
 * Use `Context<T>` references. This replaces `ModelContext<T>` which no longer exists and should NEVER be used.
 * `Window` is now passed around explicitly. The new interface adds a `Window` reference parameter to some methods, and adds some new "*_in" methods for plumbing `Window`. The old types `WindowContext` and `ViewContext<T>` should NEVER be used.
-
-
-## General guidelines
-
- Use `./script/clippy` instead of `cargo clippy`
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -46,17 +46,5 @@
  "formatter": "auto",
  "remove_trailing_whitespace_on_save": true,
  "ensure_final_newline_on_save": true,
-  "file_scan_exclusions": [
-    "crates/eval/worktrees/",
-    "crates/eval/repos/",
-    "**/.git",
-    "**/.svn",
-    "**/.hg",
-    "**/.jj",
-    "**/CVS",
-    "**/.DS_Store",
-    "**/Thumbs.db",
-    "**/.classpath",
-    "**/.settings"
-  ]
+  "file_scan_exclusions": ["crates/eval/worktrees/", "crates/eval/repos/"]
 }
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,9 +39,9 @@ members = [
    "crates/credentials_provider",
    "crates/dap",
    "crates/dap_adapters",
-    "crates/db",
    "crates/debugger_tools",
    "crates/debugger_ui",
+    "crates/db",
    "crates/deepseek",
    "crates/diagnostics",
    "crates/docs_preprocessor",
@@ -109,6 +109,7 @@ members = [
    "crates/project",
    "crates/project_panel",
    "crates/project_symbols",
+    "crates/prompt_library",
    "crates/prompt_store",
    "crates/proto",
    "crates/recent_projects",
@@ -122,7 +123,6 @@ members = [
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
-    "crates/rules_library",
    "crates/schema_generator",
    "crates/search",
    "crates/semantic_index",
@@ -229,7 +229,6 @@ auto_update_ui = { path = "crates/auto_update_ui" }
 aws_http_client = { path = "crates/aws_http_client" }
 bedrock = { path = "crates/bedrock" }
 breadcrumbs = { path = "crates/breadcrumbs" }
-buffer_diff = { path = "crates/buffer_diff" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
 cli = { path = "crates/cli" }
@@ -249,10 +248,11 @@ credentials_provider = { path = "crates/credentials_provider" }
 dap = { path = "crates/dap" }
 dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
-debugger_tools = { path = "crates/debugger_tools" }
 debugger_ui = { path = "crates/debugger_ui" }
+debugger_tools = { path = "crates/debugger_tools" }
 deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
+buffer_diff = { path = "crates/buffer_diff" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
 extension_host = { path = "crates/extension_host" }
@@ -309,8 +309,8 @@ ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
 outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
-panel = { path = "crates/panel" }
 paths = { path = "crates/paths" }
+panel = { path = "crates/panel" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
@@ -318,6 +318,7 @@ prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
 project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
+prompt_library = { path = "crates/prompt_library" }
 prompt_store = { path = "crates/prompt_store" }
 proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
@@ -330,7 +331,6 @@ reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
-rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
 semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
@@ -417,6 +417,7 @@ bitflags = "2.6.0"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
 blade-macros = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
 blade-util = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+naga = { version = "23.1.0", features = ["wgsl-in"] }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -426,17 +427,15 @@ circular-buffer = "1.0"
 clap = { version = "4.4", features = ["derive"] }
 cocoa = "0.26"
 cocoa-foundation = "0.2.0"
+core-video = { version = "0.4.3", features = ["metal"] }
 convert_case = "0.8.0"
 core-foundation = "0.10.0"
 core-foundation-sys = "0.8.6"
-core-video = { version = "0.4.3", features = ["metal"] }
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "be69a016ba710191b9fdded28c8b042af4b617f7" }
 dashmap = "6.0"
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "be69a016ba710191b9fdded28c8b042af4b617f7" }
 derive_more = "0.99.17"
 dirs = "4.0"
-documented = "0.9.1"
-dotenv = "0.15.0"
 ec4rs = "1.1"
 emojis = "0.6.1"
 env_logger = "0.11"
@@ -453,8 +452,8 @@ heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
 html5ever = "0.27.0"
-http = "1.1"
 hyper = "0.14"
+http = "1.1"
 ignore = "0.4.22"
 image = "0.25.1"
 imara-diff = "0.1.8"
@@ -462,7 +461,6 @@ indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"
 inventory = "0.3.19"
 itertools = "0.14.0"
-jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 jupyter-websocket-client = {  git = "https://github.com/ConradIrwin/runtimed" ,rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
@@ -471,30 +469,26 @@ libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
 linkme = "0.3.31"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
-lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "c9c189f1c5dd53c624a419ce35bc77ad6a908d18" }
 markup5ever_rcdom = "0.3.0"
-metal = "0.29"
 mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
-naga = { version = "23.1.0", features = ["wgsl-in"] }
 nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
-num-format = "0.4.4"
 objc = "0.2"
 open = "5.0.0"
+num-format = "0.4.4"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 pathdiff = "0.2"
 pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
+pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
+pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
 pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "845945b830297a50de0e24020b980a65e4820559" }
-portable-pty = "0.9.0"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
 proc-macro2 = "1.0.93"
@@ -506,10 +500,9 @@ pulldown-cmark = { version = "0.12.0", default-features = false }
 quote = "1.0.9"
 rand = "0.8.5"
 rayon = "1.8"
-ref-cast = "1.0.24"
 regex = "1.5"
 repair_json = "0.1.0"
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c770a32f1998d6e999cef3e59e0013e6c4415", default-features = false, features = [
+reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f6998da16bbca97b6dddda9be7827c50e29", default-features = false, features = [
    "charset",
    "http2",
    "macos-system-configuration",
@@ -521,8 +514,8 @@ rsa = "0.9.6"
 runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
-rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-demangle = "0.1.23"
+rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
@@ -564,16 +557,15 @@ time = { version = "0.3", features = [
    "formatting",
 ] }
 tiny_http = "0.8"
+toml = "0.8"
 tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
-toml = "0.8"
 tower-http = "0.4.4"
 tree-sitter = { version = "0.25.3", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
 tree-sitter-css = "0.23"
-tree-sitter-diff = "0.1.0"
 tree-sitter-elixir = "0.3"
 tree-sitter-embedded-template = "0.23.0"
 tree-sitter-gitcommit = { git = "https://github.com/zed-industries/tree-sitter-git-commit", rev = "88309716a69dd13ab83443721ba6e0b491d37ee9" }
@@ -581,6 +573,7 @@ tree-sitter-go = "0.23"
 tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c", package = "tree-sitter-gomod" }
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
+tree-sitter-diff = "0.1.0"
 tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
@@ -592,15 +585,15 @@ tree-sitter-rust = "0.24"
 tree-sitter-typescript = "0.23"
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unicase = "2.6"
-unicode-script = "0.5.7"
-unicode-segmentation = "1.10"
 unindent = "0.2.0"
+unicode-segmentation = "1.10"
+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"
-wasm-encoder = "0.221"
 wasmparser = "0.221"
+wasm-encoder = "0.221"
 wasmtime = { version = "29", default-features = false, features = [
    "async",
    "demangle",
@@ -612,8 +605,9 @@ wasmtime-wasi = "29"
 which = "6.0.0"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.7.4"
+zed_llm_client = "0.7.0"
 zstd = "0.11"
+metal = "0.29"

 [workspace.dependencies.async-stripe]
 git = "https://github.com/zed-industries/async-stripe"
@@ -800,6 +794,5 @@ ignored = [
    "serde",
    "component",
    "linkme",
-    "documented",
    "workspace-hack",
 ]
--- a/assets/icons/crosshair.svg
+++ b/assets/icons/crosshair.svg
@@ -1,7 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 12C9.76142 12 12 9.76142 12 7C12 4.23858 9.76142 2 7 2C4.23858 2 2 4.23858 2 7C2 9.76142 4.23858 12 7 12Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 7H9" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.5 7H2" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 4.5V2" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 11.5V9" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/hammer.svg
+++ b/assets/icons/hammer.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-hammer-icon lucide-hammer"><path d="m15 12-8.373 8.373a1 1 0 1 1-3-3L12 9"/><path d="m18 15 4-4"/><path d="m21.5 11.5-1.914-1.914A2 2 0 0 1 19 8.172V7l-2.26-2.26a6 6 0 0 0-4.202-1.756L9 2.96l.92.82A6.18 6.18 0 0 1 12 8.4V10l2 2h1.172a2 2 0 0 1 1.414.586L18.5 14.5"/></svg>
--- a/assets/icons/list_collapse.svg
+++ b/assets/icons/list_collapse.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-list-collapse-icon lucide-list-collapse"><path d="m3 10 2.5-2.5L3 5"/><path d="m3 19 2.5-2.5L3 14"/><path d="M10 6h11"/><path d="M10 12h11"/><path d="M10 18h11"/></svg>
--- a/assets/icons/menu_alt.svg
+++ b/assets/icons/menu_alt.svg
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 12H16" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 6H20" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 18H12" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/scissors.svg
+++ b/assets/icons/scissors.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-scissors-icon lucide-scissors"><circle cx="6" cy="6" r="3"/><path d="M8.12 8.12 12 12"/><path d="M20 4 8.12 15.88"/><circle cx="6" cy="18" r="3"/><path d="M14.8 14.8 20 20"/></svg>
--- a/assets/icons/user_check.svg
+++ b/assets/icons/user_check.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-user-round-check-icon lucide-user-round-check"><path d="M2 21a8 8 0 0 1 13.292-6"/><circle cx="10" cy="8" r="5"/><path d="m16 19 2 2 4-4"/></svg>
--- a/assets/icons/zed_max_mode.svg
+++ b/assets/icons/zed_max_mode.svg
@@ -1,14 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2489_484)">
-<path d="M11 8.9V11C8.51716 11 7.48284 11 5 11V10.4L11 5.6V5H5V7.1" stroke="black" stroke-width="1.5"/>
-<path d="M1.5 5.5V1.5H5" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M14.5 5.5V1.5H11" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M1.5 10.5V14.5H5" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M14.5 10.5V14.5H11" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-<defs>
-<clipPath id="clip0_2489_484">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -194,16 +194,6 @@
      "alt-shift-y": "git::UnstageAndNext"
    }
  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
  {
    "context": "AgentDiff",
    "bindings": {
@@ -222,7 +212,7 @@
      "ctrl-shift-g": "search::SelectPreviousMatch",
      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
-      "ctrl-k l": "assistant::OpenRulesLibrary",
+      "ctrl-k l": "assistant::OpenPromptLibrary",
      "new": "assistant::NewChat",
      "ctrl-t": "assistant::NewChat",
      "ctrl-n": "assistant::NewChat"
@@ -251,22 +241,15 @@
      "ctrl-alt-n": "agent::NewTextThread",
      "ctrl-shift-h": "agent::OpenHistory",
      "ctrl-alt-c": "agent::OpenConfiguration",
-      "ctrl-alt-p": "assistant::OpenRulesLibrary",
+      "ctrl-alt-p": "assistant::OpenPromptLibrary",
      "ctrl-i": "agent::ToggleProfileSelector",
      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-shift-a": "agent::ToggleContextPicker",
-      "ctrl-shift-o": "agent::ToggleNavigationMenu",
-      "ctrl-shift-i": "agent::ToggleOptionsMenu",
      "shift-escape": "agent::ExpandMessageEditor",
+      "ctrl-e": "agent::ChatMode",
      "ctrl-alt-e": "agent::RemoveAllContext"
    }
  },
-  {
-    "context": "AgentPanel > NavigationMenu",
-    "bindings": {
-      "shift-backspace": "agent::DeleteRecentlyOpenThread"
-    }
-  },
  {
    "context": "AgentPanel > Markdown",
    "bindings": {
@@ -325,9 +308,9 @@
  {
    "context": "PromptLibrary",
    "bindings": {
-      "new": "rules_library::NewRule",
-      "ctrl-n": "rules_library::NewRule",
-      "ctrl-shift-s": "rules_library::ToggleDefaultRule"
+      "new": "prompt_library::NewPrompt",
+      "ctrl-n": "prompt_library::NewPrompt",
+      "ctrl-shift-s": "prompt_library::ToggleDefaultPrompt"
    }
  },
  {
@@ -537,7 +520,6 @@
      "shift-new": "workspace::NewWindow",
      "ctrl-shift-n": "workspace::NewWindow",
      "ctrl-`": "terminal_panel::ToggleFocus",
-      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
      "alt-1": ["workspace::ActivatePane", 0],
      "alt-2": ["workspace::ActivatePane", 1],
      "alt-3": ["workspace::ActivatePane", 2],
@@ -596,7 +578,6 @@
  {
    "context": "ApplicationMenu",
    "bindings": {
-      "f10": "menu::Cancel",
      "left": "app_menu::ActivateMenuLeft",
      "right": "app_menu::ActivateMenuRight"
    }
@@ -694,7 +675,7 @@
    }
  },
  {
-    "context": "!ContextEditor > Editor && mode == full",
+    "context": "Editor && mode == full",
    "bindings": {
      "alt-enter": "editor::OpenExcerpts",
      "shift-enter": "editor::ExpandExcerpts",
@@ -971,20 +952,5 @@
    "bindings": {
      "escape": "menu::Cancel"
    }
-  },
-  {
-    "context": "ConfigureContextServerModal > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "ctrl-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "Diagnostics",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
-    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -5,8 +5,8 @@
    "context": "PromptLibrary",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "rules_library::NewRule",
-      "cmd-shift-s": "rules_library::ToggleDefaultRule",
+      "cmd-n": "prompt_library::NewPrompt",
+      "cmd-shift-s": "prompt_library::ToggleDefaultPrompt",
      "cmd-w": "workspace::CloseWindow"
    }
  },
@@ -247,17 +247,6 @@
      "cmd-shift-n": "agent::RejectAll"
    }
  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-y": "agent::Keep",
-      "cmd-n": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
  {
    "context": "AssistantPanel",
    "use_key_equivalents": true,
@@ -268,7 +257,7 @@
      "cmd-shift-g": "search::SelectPreviousMatch",
      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
-      "cmd-k l": "assistant::OpenRulesLibrary",
+      "cmd-k l": "assistant::OpenPromptLibrary",
      "cmd-t": "assistant::NewChat",
      "cmd-n": "assistant::NewChat"
    }
@@ -297,22 +286,15 @@
      "cmd-alt-n": "agent::NewTextThread",
      "cmd-shift-h": "agent::OpenHistory",
      "cmd-alt-c": "agent::OpenConfiguration",
-      "cmd-alt-p": "assistant::OpenRulesLibrary",
+      "cmd-alt-p": "assistant::OpenPromptLibrary",
      "cmd-i": "agent::ToggleProfileSelector",
      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-shift-a": "agent::ToggleContextPicker",
-      "cmd-shift-o": "agent::ToggleNavigationMenu",
-      "cmd-shift-i": "agent::ToggleOptionsMenu",
      "shift-escape": "agent::ExpandMessageEditor",
+      "cmd-e": "agent::ChatMode",
      "cmd-alt-e": "agent::RemoveAllContext"
    }
  },
-  {
-    "context": "AgentPanel > NavigationMenu",
-    "bindings": {
-      "shift-backspace": "agent::DeleteRecentlyOpenThread"
-    }
-  },
  {
    "context": "AgentPanel > Markdown",
    "use_key_equivalents": true,
@@ -756,7 +738,7 @@
    }
  },
  {
-    "context": "!ContextEditor > Editor && mode == full",
+    "context": "Editor && mode == full",
    "use_key_equivalents": true,
    "bindings": {
      "alt-enter": "editor::OpenExcerpts",
@@ -1078,21 +1060,5 @@
    "bindings": {
      "escape": "menu::Cancel"
    }
-  },
-  {
-    "context": "ConfigureContextServerModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "cmd-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "Diagnostics",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
-    }
  }
 ]
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -50,12 +50,6 @@
      "] -": "vim::NextLesserIndent",
      "] +": "vim::NextGreaterIndent",
      "] =": "vim::NextSameIndent",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0],
-      "] space": "vim::InsertEmptyLineBelow",
-      "[ space": "vim::InsertEmptyLineAbove",
      // Word motions
      "w": "vim::NextWordStart",
      "e": "vim::NextWordEnd",
@@ -114,11 +108,7 @@
      "ctrl-e": "vim::LineDown",
      "ctrl-y": "vim::LineUp",
      // "g" commands
-      "g shift-r": "vim::PushReplaceWithRegister",
-      "g r n": "editor::Rename",
-      "g r r": "editor::FindAllReferences",
-      "g r i": "editor::GoToImplementation",
-      "g r a": "editor::ToggleCodeActions",
+      "g r": "vim::PushReplaceWithRegister",
      "g g": "vim::StartOfDocument",
      "g h": "editor::Hover",
      "g t": "pane::ActivateNextItem",
@@ -137,7 +127,6 @@
      "g <": ["editor::SelectPrevious", { "replace_newest": true }],
      "g a": "editor::SelectAllMatches",
      "g s": "outline::Toggle",
-      "g shift-o": "outline::Toggle",
      "g shift-s": "project_symbols::Toggle",
      "g .": "editor::ToggleCodeActions", // zed specific
      "g shift-a": "editor::FindAllReferences", // zed specific
@@ -316,7 +305,7 @@
      "!": "vim::ShellCommand",
      "i": ["vim::PushObject", { "around": false }],
      "a": ["vim::PushObject", { "around": true }],
-      "g shift-r": ["vim::Paste", { "preserve_clipboard": true }],
+      "g r": ["vim::Paste", { "preserve_clipboard": true }],
      "g c": "vim::ToggleComments",
      "g q": "vim::Rewrap",
      "g ?": "vim::ConvertToRot13",
@@ -350,8 +339,7 @@
      "ctrl-shift-q": ["vim::PushLiteral", {}],
      "ctrl-r": "vim::PushRegister",
      "insert": "vim::ToggleReplace",
-      "ctrl-o": "vim::TemporaryNormal",
-      "ctrl-s": "editor::ShowSignatureHelp"
+      "ctrl-o": "vim::TemporaryNormal"
    }
  },
  {
@@ -516,14 +504,12 @@
      "'": "vim::Quotes",
      "`": "vim::BackQuotes",
      "\"": "vim::DoubleQuotes",
-      // "q": "vim::AnyQuotes",
-      "q": "vim::MiniQuotes",
+      "q": "vim::AnyQuotes",
      "|": "vim::VerticalBars",
      "(": "vim::Parentheses",
      ")": "vim::Parentheses",
      "b": "vim::Parentheses",
      // "b": "vim::AnyBrackets",
-      // "b": "vim::MiniBrackets",
      "[": "vim::SquareBrackets",
      "]": "vim::SquareBrackets",
      "r": "vim::SquareBrackets",
@@ -644,10 +630,9 @@
    }
  },
  {
-    "context": "vim_operator == gR",
+    "context": "vim_operator == gr",
    "bindings": {
-      "r": "vim::CurrentLine",
-      "shift-r": "vim::CurrentLine"
+      "r": "vim::CurrentLine"
    }
  },
  {
@@ -708,7 +693,7 @@
    }
  },
  {
-    "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || DebugPanel",
+    "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
    "bindings": {
      // window related commands (ctrl-w X)
      "ctrl-w": null,
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -3,12 +3,11 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 ## Communication

 1. Be conversational but professional.
-2. Refer to the user in the second person and yourself in the first person.
+2. Refer to the USER in the second person and yourself in the first person.
 3. Format your responses in markdown. Use backticks to format file, directory, function, and class names.
 4. NEVER lie or make things up.
 5. Refrain from apologizing all the time when results are unexpected. Instead, just try your best to proceed or explain the circumstances to the user without apologizing.

-{{#if has_tools}}
 ## Tool Use

 1. Make sure to adhere to the tools schema.
@@ -16,113 +15,23 @@ You are a highly skilled software engineer with extensive knowledge in many prog
 3. DO NOT use tools to access items that are already available in the context section.
 4. Use only the tools that are currently available.
 5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.

 ## Searching and Reading

 If you are unsure how to fulfill the user's request, gather more information with tool calls and/or clarifying questions.

 {{! TODO: If there are files, we should mention it but otherwise omit that fact }}
-{{#if has_tools}}
 If appropriate, use tool calls to explore the current project, which contains the following root directories:

 {{#each worktrees}}
 - `{{root_name}}`
 {{/each}}

- Bias towards not asking the user for help if you can find the answer yourself.
 - When providing paths to tools, the path should always begin with a path that starts with a project root directory listed above.
- Before you read or edit a file, you must first find the full path. DO NOT ever guess a file path!
-{{# if (has_tool 'grep') }}
 - When looking for symbols in the project, prefer the `grep` tool.
 - As you learn about the structure of the project, use that information to scope `grep` searches to targeted subtrees of the project.
- The user might specify a partial file path. If you don't know the full path, use `find_path` (not `grep`) before you read the file.
-{{/if}}
-{{/if}}
-{{else}}
-You are being tasked with providing a response, but you have no ability to use tools or to read or write any aspect of the user's system (other than any context the user might have provided to you).
+- Bias towards not asking the user for help if you can find the answer yourself.

-As such, if you need the user to perform any actions for you, you must request them explicitly. Bias towards giving a response to the best of your ability, and then making requests for the user to take action (e.g. to give you more context) only optionally.
-
-The one exception to this is if the user references something you don't know about - for example, the name of a source code file, function, type, or other piece of code that you have no awareness of. In this case, you MUST NOT MAKE SOMETHING UP, or assume you know what that thing is or how it works. Instead, you must ask the user for clarification rather than giving a response.
-{{/if}}
-
-## Code Block Formatting
-
-Whenever you mention a code block, you MUST use ONLY use the following format:
-```path/to/Something.blah#L123-456
-(code goes here)
-```
-The `#L123-456` means the line number range 123 through 456, and the path/to/Something.blah
-is a path in the project. (If there is no valid path in the project, then you can use
-/dev/null/path.extension for its path.) This is the ONLY valid way to format code blocks, because the Markdown parser
-does not understand the more common ```language syntax, or bare ``` blocks. It only
-understands this path-based syntax, and if the path is missing, then it will error and you will have to do it over again.
-Just to be really clear about this, if you ever find yourself writing three backticks followed by a language name, STOP!
-You have made a mistake. You can only ever put paths after triple backticks!
-<example>
-Based on all the information I've gathered, here's a summary of how this system works:
-1. The README file is loaded into the system.
-2. The system finds the first two headers, including everything in between. In this case, that would be:
-```path/to/README.md#L8-12
-# First Header
-This is the info under the first header.
-## Sub-header
-```
-3. Then the system finds the last header in the README:
-```path/to/README.md#L27-29
-## Last Header
-This is the last header in the README.
-```
-4. Finally, it passes this information on to the next process.
-</example>
-<example>
-In Markdown, hash marks signify headings. For example:
-```/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</example>
-Here are examples of ways you must never render code blocks:
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-This example is unacceptable because it does not include the path.
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```markdown
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-This example is unacceptable because it has the language instead of the path.
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-    # Level 1 heading
-    ## Level 2 heading
-    ### Level 3 heading
-</bad_example_do_not_do_this>
-This example is unacceptable because it uses indentation to mark the code block
-instead of backticks with a path.
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```markdown
-/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-This example is unacceptable because the path is in the wrong place. The path must be directly after the opening backticks.
-
-{{#if has_tools}}
 ## Fixing Diagnostics

 1. Make 1-2 attempts at fixing diagnostics, then defer to the user.
@@ -136,11 +45,10 @@ Otherwise, follow debugging best practices:
 2. Add descriptive logging statements and error messages to track variable and code state.
 3. Add test functions and statements to isolate the problem.

-{{/if}}
 ## Calling External APIs

 1. Unless explicitly requested by the user, use the best suited external APIs and packages to solve the task. There is no need to ask the user for permission.
-2. When selecting which version of an API or package to use, choose one that is compatible with the user's dependency management file(s). If no such file exists or if the package is not present, use the latest version that is in your training data.
+2. When selecting which version of an API or package to use, choose one that is compatible with the user's dependency management file. If no such file exists or if the package is not present, use the latest version that is in your training data.
 3. If an external API requires an API Key, be sure to point this out to the user. Adhere to best security practices (e.g. DO NOT hardcode an API key in a place where it can be exposed)

 ## System Information
@@ -148,10 +56,10 @@ Otherwise, follow debugging best practices:
 Operating System: {{os}}
 Default Shell: {{shell}}

-{{#if (or has_rules has_user_rules)}}
+{{#if (or has_rules has_default_user_rules)}}
 ## User's Custom Instructions

-The following additional instructions are provided by the user, and should be followed to the best of your ability{{#if has_tools}} without interfering with the tool use guidelines{{/if}}.
+The following additional instructions are provided by the user, and should be followed to the best of your ability without interfering with the tool use guidelines.

 {{#if has_rules}}
 There are project rules that apply to these root directories:
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -167,23 +167,7 @@
  // Default: not set, defaults to "bar"
  "cursor_shape": null,
  // Determines when the mouse cursor should be hidden in an editor or input box.
-  //
-  // 1. Never hide the mouse cursor:
-  //    "never"
-  // 2. Hide only when typing:
-  //    "on_typing"
-  // 3. Hide on both typing and cursor movement:
-  //    "on_typing_and_movement"
  "hide_mouse": "on_typing_and_movement",
-  // Determines how snippets are sorted relative to other completion items.
-  //
-  // 1. Place snippets at the top of the completion list:
-  //    "top"
-  // 2. Place snippets normally without any preference:
-  //    "inline"
-  // 3. Place snippets at the bottom of the completion list:
-  //    "bottom"
-  "snippet_sort_order": "inline",
  // How to highlight the current line in the editor.
  //
  // 1. Don't highlight the current line:
@@ -226,7 +210,7 @@
  // Hide the values of in variables from visual display in private files
  "redact_private_values": false,
  // The default number of lines to expand excerpts in the multibuffer by.
-  "expand_excerpt_lines": 5,
+  "expand_excerpt_lines": 3,
  // Globs to match against file paths to determine if a file is private.
  "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
  // Whether to use additional LSP queries to format (and amend) the code after
@@ -300,10 +284,8 @@
    "breadcrumbs": true,
    // Whether to show quick action buttons.
    "quick_actions": true,
-    // Whether to show the Selections menu in the editor toolbar.
-    "selections_menu": true,
-    // Whether to show agent review buttons in the editor toolbar.
-    "agent_review": true
+    // Whether to show the Selections menu in the editor toolbar
+    "selections_menu": true
  },
  // Scrollbar related settings
  "scrollbar": {
@@ -603,13 +585,6 @@
    //
    // Default: main
    "fallback_branch_name": "main",
-
-    // Whether to sort entries in the panel by path
-    // or by status (the default).
-    //
-    // Default: false
-    "sort_by_path": false,
-
    "scrollbar": {
      // When to show the scrollbar in the git panel.
      //
@@ -659,33 +634,8 @@
    },
    // When enabled, the agent can run potentially destructive actions without asking for your confirmation.
    "always_allow_tool_actions": false,
-    // When enabled, the agent will stream edits.
-    "stream_edits": false,
-    // When enabled, agent edits will be displayed in single-file editors for review
-    "single_file_review": true,
    "default_profile": "write",
    "profiles": {
-      "write": {
-        "name": "Write",
-        "enable_all_context_servers": true,
-        "tools": {
-          "copy_path": true,
-          "create_directory": true,
-          "delete_path": true,
-          "diagnostics": true,
-          "edit_file": true,
-          "fetch": true,
-          "list_directory": true,
-          "move_path": true,
-          "now": true,
-          "find_path": true,
-          "read_file": true,
-          "grep": true,
-          "terminal": true,
-          "thinking": true,
-          "web_search": true
-        }
-      },
      "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.
@@ -694,20 +644,41 @@
          "contents": true,
          "diagnostics": true,
          "fetch": true,
-          "list_directory": true,
+          "list_directory": false,
          "now": true,
-          "find_path": true,
+          "path_search": true,
          "read_file": true,
-          "open": true,
          "grep": true,
          "thinking": true,
          "web_search": true
        }
      },
-      "manual": {
-        "name": "Manual",
-        "enable_all_context_servers": false,
-        "tools": {}
+      "write": {
+        "name": "Write",
+        "enable_all_context_servers": true,
+        "tools": {
+          "batch_tool": false,
+          "code_actions": false,
+          "code_symbols": false,
+          "contents": false,
+          "copy_path": false,
+          "create_file": true,
+          "delete_path": false,
+          "diagnostics": true,
+          "edit_file": true,
+          "fetch": true,
+          "list_directory": true,
+          "move_path": false,
+          "now": false,
+          "path_search": true,
+          "read_file": true,
+          "grep": true,
+          "rename": false,
+          "symbol_info": false,
+          "terminal": true,
+          "thinking": true,
+          "web_search": true
+        }
      }
    },
    // Where to show notifications when an agent has either completed
@@ -835,20 +806,7 @@
    //    "modal_max_width": "full"
    //
    // Default: small
-    "modal_max_width": "small",
-    // Determines whether the file finder should skip focus for the active file in search results.
-    // There are 2 possible values:
-    //
-    // 1. true: When searching for files, if the currently active file appears as the first result,
-    //    auto-focus will skip it and focus the second result instead.
-    //    "skip_focus_for_active_in_search": true
-    //
-    // 2. false: When searching for files, the first result will always receive focus,
-    //    even if it's the currently active file.
-    //    "skip_focus_for_active_in_search": false
-    //
-    // Default: true
-    "skip_focus_for_active_in_search": true
+    "modal_max_width": "small"
  },
  // Whether or not to remove any trailing whitespace from lines of a buffer
  // before saving it.
@@ -931,11 +889,6 @@
      // The minimum severity of the diagnostics to show inline.
      // Shows all diagnostics when not specified.
      "max_severity": null
-    },
-    "cargo": {
-      // When enabled, Zed disables rust-analyzer's check on save and starts to query
-      // Cargo diagnostics separately.
-      "fetch_cargo_diagnostics": false
    }
  },
  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,7 +1,2 @@
 allow-private-module-inception = true
 avoid-breaking-exported-api = false
-ignore-interior-mutability = [
-    # Suppresses clippy::mutable_key_type, which is a false positive as the Eq
-    # and Hash impls do not use fields with interior mutability.
-    "agent::context::AgentContextKey"
-]
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -28,6 +28,7 @@ async-watch.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 client.workspace = true
+clock.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 component.workspace = true
@@ -35,7 +36,6 @@ context_server.workspace = true
 convert_case.workspace = true
 db.workspace = true
 editor.workspace = true
-extension.workspace = true
 feature_flags.workspace = true
 file_icons.workspace = true
 fs.workspace = true
@@ -46,8 +46,8 @@ gpui.workspace = true
 heed.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
+indexmap.workspace = true
 itertools.workspace = true
-jsonschema.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
@@ -57,23 +57,19 @@ lsp.workspace = true
 markdown.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
-notifications.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
-postage.workspace = true
 project.workspace = true
-rules_library.workspace = true
+prompt_library.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
-ref-cast.workspace = true
 release_channel.workspace = true
 rope.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_json_lenient.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
--- a/crates/agent/src/assistant.rs
+++ b/crates/agent/src/assistant.rs
@@ -6,10 +6,8 @@ mod assistant_panel;
 mod buffer_codegen;
 mod context;
 mod context_picker;
-mod context_server_configuration;
 mod context_store;
 mod context_strip;
-mod debug;
 mod history_store;
 mod inline_assistant;
 mod inline_prompt_editor;
@@ -32,7 +30,6 @@ use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{App, actions, impl_actions};
-use language::LanguageRegistry;
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -42,22 +39,16 @@ use thread::ThreadId;
 pub use crate::active_thread::ActiveThread;
 use crate::assistant_configuration::{AddContextServerModal, ManageProfilesModal};
 pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate};
-pub use crate::context::{ContextLoadResult, LoadedContext};
 pub use crate::inline_assistant::InlineAssistant;
-pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
+pub use crate::thread::{Message, Thread, ThreadEvent};
 pub use crate::thread_store::ThreadStore;
-pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
-pub use context_store::ContextStore;
-pub use ui::preview::{all_agent_previews, get_agent_preview};
+pub use agent_diff::{AgentDiff, AgentDiffToolbar};

 actions!(
    agent,
    [
        NewTextThread,
        ToggleContextPicker,
-        ToggleNavigationMenu,
-        ToggleOptionsMenu,
-        DeleteRecentlyOpenThread,
        ToggleProfileSelector,
        RemoveAllContext,
        ExpandMessageEditor,
@@ -65,6 +56,7 @@ actions!(
        AddContextServer,
        RemoveSelectedThread,
        Chat,
+        ChatMode,
        CycleNextInlineAssist,
        CyclePreviousInlineAssist,
        FocusUp,
@@ -78,8 +70,7 @@ actions!(
        Keep,
        Reject,
        RejectAll,
-        KeepAll,
-        Follow
+        KeepAll
    ]
 );

@@ -112,13 +103,11 @@ pub fn init(
    fs: Arc<dyn Fs>,
    client: Arc<Client>,
    prompt_builder: Arc<PromptBuilder>,
-    language_registry: Arc<LanguageRegistry>,
    cx: &mut App,
 ) {
    AssistantSettings::register(cx);
    thread_store::init(cx);
    assistant_panel::init(cx);
-    context_server_configuration::init(language_registry, cx);

    inline_assistant::init(
        fs.clone(),
--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -1,18 +1,16 @@
 mod add_context_server_modal;
-mod configure_context_server_modal;
 mod manage_profiles_modal;
 mod tool_picker;

-use std::{sync::Arc, time::Duration};
+use std::sync::Arc;

 use assistant_settings::AssistantSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use collections::HashMap;
-use context_server::manager::{ContextServer, ContextServerManager, ContextServerStatus};
+use context_server::manager::ContextServerManager;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyView, App, Entity, EventEmitter, FocusHandle,
-    Focusable, ScrollHandle, Subscription, pulsating_between,
+    Action, AnyView, App, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle, Subscription,
 };
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
 use settings::{Settings, update_settings_file};
@@ -24,7 +22,6 @@ use util::ResultExt as _;
 use zed_actions::ExtensionCategoryFilter;

 pub(crate) use add_context_server_modal::AddContextServerModal;
-pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;

 use crate::AddContextServer;
@@ -214,99 +211,53 @@ 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;

-        h_flex()
-            .gap_4()
-            .justify_between()
-            .flex_wrap()
-            .child(
-                v_flex()
-                    .gap_0p5()
-                    .max_w_5_6()
-                    .child(Label::new("Allow running editing tools without asking for confirmation"))
-                    .child(
-                        Label::new(
-                            "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(),
-                )
-                .color(SwitchColor::Accent)
-                .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);
-                            },
-                        );
-                    }
-                }),
-            )
-    }
+        const HEADING: &str = "Allow running editing tools without asking for confirmation";

-    fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let single_file_review = AssistantSettings::get_global(cx).single_file_review;
-
-        h_flex()
-            .gap_4()
-            .justify_between()
-            .flex_wrap()
-            .child(
-                v_flex()
-                    .gap_0p5()
-                    .max_w_5_6()
-                    .child(Label::new("Enable single-file agent reviews"))
-                    .child(
-                        Label::new(
-                            "Agent edits are also displayed in single-file editors for review.",
-                        )
-                        .color(Color::Muted),
-                    ),
-            )
-            .child(
-                Switch::new("single-file-review-switch", single_file_review.into())
-                    .color(SwitchColor::Accent)
-                    .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_single_file_review(allow);
-                                },
-                            );
-                        }
-                    }),
-            )
-    }
-
-    fn render_general_settings_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
            .p(DynamicSpacing::Base16.rems(cx))
            .pr(DynamicSpacing::Base20.rems(cx))
-            .gap_2p5()
+            .gap_2()
            .flex_1()
            .child(Headline::new("General Settings"))
-            .child(self.render_command_permission(cx))
-            .child(self.render_single_file_review(cx))
+            .child(
+                h_flex()
+                    .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(),
+                        )
+                        .color(SwitchColor::Accent)
+                        .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,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
+    fn render_context_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
        let context_servers = self.context_server_manager.read(cx).all_servers().clone();
+        let tools_by_source = self.tools.read(cx).tools_by_source(cx);
+        let empty = Vec::new();

        const SUBHEADING: &str = "Connect to context servers via the Model Context Protocol either via Zed extensions or directly.";

@@ -321,11 +272,136 @@ impl AssistantConfiguration {
                    .child(Headline::new("Model Context Protocol (MCP) Servers"))
                    .child(Label::new(SUBHEADING).color(Color::Muted)),
            )
-            .children(
-                context_servers
-                    .into_iter()
-                    .map(|context_server| self.render_context_server(context_server, window, cx)),
-            )
+            .children(context_servers.into_iter().map(|context_server| {
+                let is_running = context_server.client().is_some();
+                let are_tools_expanded = self
+                    .expanded_context_server_tools
+                    .get(&context_server.id())
+                    .copied()
+                    .unwrap_or_default();
+
+                let tools = tools_by_source
+                    .get(&ToolSource::ContextServer {
+                        id: context_server.id().into(),
+                    })
+                    .unwrap_or_else(|| &empty);
+                let tool_count = tools.len();
+
+                v_flex()
+                    .id(SharedString::from(context_server.id()))
+                    .border_1()
+                    .rounded_md()
+                    .border_color(cx.theme().colors().border)
+                    .bg(cx.theme().colors().background.opacity(0.25))
+                    .child(
+                        h_flex()
+                            .p_1()
+                            .justify_between()
+                            .when(are_tools_expanded && tool_count > 1, |element| {
+                                element
+                                    .border_b_1()
+                                    .border_color(cx.theme().colors().border)
+                            })
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .child(
+                                        Disclosure::new("tool-list-disclosure", are_tools_expanded)
+                                            .disabled(tool_count == 0)
+                                            .on_click(cx.listener({
+                                                let context_server_id = context_server.id();
+                                                move |this, _event, _window, _cx| {
+                                                    let is_open = this
+                                                        .expanded_context_server_tools
+                                                        .entry(context_server_id.clone())
+                                                        .or_insert(false);
+
+                                                    *is_open = !*is_open;
+                                                }
+                                            })),
+                                    )
+                                    .child(Indicator::dot().color(if is_running {
+                                        Color::Success
+                                    } else {
+                                        Color::Error
+                                    }))
+                                    .child(Label::new(context_server.id()))
+                                    .child(
+                                        Label::new(format!("{tool_count} tools"))
+                                            .color(Color::Muted)
+                                            .size(LabelSize::Small),
+                                    ),
+                            )
+                            .child(
+                                Switch::new("context-server-switch", is_running.into())
+                                    .color(SwitchColor::Accent)
+                                    .on_click({
+                                        let context_server_manager =
+                                            self.context_server_manager.clone();
+                                        let context_server = context_server.clone();
+                                        move |state, _window, cx| match state {
+                                            ToggleState::Unselected
+                                            | ToggleState::Indeterminate => {
+                                                context_server_manager.update(cx, |this, cx| {
+                                                    this.stop_server(context_server.clone(), cx)
+                                                        .log_err();
+                                                });
+                                            }
+                                            ToggleState::Selected => {
+                                                cx.spawn({
+                                                    let context_server_manager =
+                                                        context_server_manager.clone();
+                                                    let context_server = context_server.clone();
+                                                    async move |cx| {
+                                                        if let Some(start_server_task) =
+                                                            context_server_manager
+                                                                .update(cx, |this, cx| {
+                                                                    this.start_server(
+                                                                        context_server,
+                                                                        cx,
+                                                                    )
+                                                                })
+                                                                .log_err()
+                                                        {
+                                                            start_server_task.await.log_err();
+                                                        }
+                                                    }
+                                                })
+                                                .detach();
+                                            }
+                                        }
+                                    }),
+                            ),
+                    )
+                    .map(|parent| {
+                        if !are_tools_expanded {
+                            return parent;
+                        }
+
+                        parent.child(v_flex().py_1p5().px_1().gap_1().children(
+                            tools.into_iter().enumerate().map(|(ix, tool)| {
+                                h_flex()
+                                    .id(("tool-item", ix))
+                                    .px_1()
+                                    .gap_2()
+                                    .justify_between()
+                                    .hover(|style| style.bg(cx.theme().colors().element_hover))
+                                    .rounded_sm()
+                                    .child(
+                                        Label::new(tool.name())
+                                            .buffer_font(cx)
+                                            .size(LabelSize::Small),
+                                    )
+                                    .child(
+                                        Icon::new(IconName::Info)
+                                            .size(IconSize::Small)
+                                            .color(Color::Ignored),
+                                    )
+                                    .tooltip(Tooltip::text(tool.description()))
+                            }),
+                        ))
+                    })
+            }))
            .child(
                h_flex()
                    .justify_between()
@@ -353,7 +429,7 @@ impl AssistantConfiguration {
                            .style(ButtonStyle::Filled)
                            .layer(ElevationIndex::ModalSurface)
                            .full_width()
-                            .icon(IconName::Hammer)
+                            .icon(IconName::DatabaseZap)
                            .icon_size(IconSize::Small)
                            .icon_position(IconPosition::Start)
                            .on_click(|_event, window, cx| {
@@ -371,214 +447,10 @@ impl AssistantConfiguration {
                    ),
            )
    }
-
-    fn render_context_server(
-        &self,
-        context_server: Arc<ContextServer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl use<> + IntoElement {
-        let tools_by_source = self.tools.read(cx).tools_by_source(cx);
-        let server_status = self
-            .context_server_manager
-            .read(cx)
-            .status_for_server(&context_server.id());
-
-        let is_running = matches!(server_status, Some(ContextServerStatus::Running));
-
-        let error = if let Some(ContextServerStatus::Error(error)) = server_status.clone() {
-            Some(error)
-        } else {
-            None
-        };
-
-        let are_tools_expanded = self
-            .expanded_context_server_tools
-            .get(&context_server.id())
-            .copied()
-            .unwrap_or_default();
-
-        let tools = tools_by_source
-            .get(&ToolSource::ContextServer {
-                id: context_server.id().into(),
-            })
-            .map_or([].as_slice(), |tools| tools.as_slice());
-        let tool_count = tools.len();
-
-        let border_color = cx.theme().colors().border.opacity(0.6);
-
-        v_flex()
-            .id(SharedString::from(context_server.id()))
-            .border_1()
-            .rounded_md()
-            .border_color(border_color)
-            .bg(cx.theme().colors().background.opacity(0.2))
-            .overflow_hidden()
-            .child(
-                h_flex()
-                    .p_1()
-                    .justify_between()
-                    .when(
-                        error.is_some() || are_tools_expanded && tool_count > 1,
-                        |element| element.border_b_1().border_color(border_color),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1p5()
-                            .child(
-                                Disclosure::new(
-                                    "tool-list-disclosure",
-                                    are_tools_expanded || error.is_some(),
-                                )
-                                .disabled(tool_count == 0)
-                                .on_click(cx.listener({
-                                    let context_server_id = context_server.id();
-                                    move |this, _event, _window, _cx| {
-                                        let is_open = this
-                                            .expanded_context_server_tools
-                                            .entry(context_server_id.clone())
-                                            .or_insert(false);
-
-                                        *is_open = !*is_open;
-                                    }
-                                })),
-                            )
-                            .child(match server_status {
-                                Some(ContextServerStatus::Starting) => {
-                                    let color = Color::Success.color(cx);
-                                    Indicator::dot()
-                                        .color(Color::Success)
-                                        .with_animation(
-                                            SharedString::from(format!(
-                                                "{}-starting",
-                                                context_server.id(),
-                                            )),
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.4, 1.)),
-                                            move |this, delta| {
-                                                this.color(color.alpha(delta).into())
-                                            },
-                                        )
-                                        .into_any_element()
-                                }
-                                Some(ContextServerStatus::Running) => {
-                                    Indicator::dot().color(Color::Success).into_any_element()
-                                }
-                                Some(ContextServerStatus::Error(_)) => {
-                                    Indicator::dot().color(Color::Error).into_any_element()
-                                }
-                                None => Indicator::dot().color(Color::Muted).into_any_element(),
-                            })
-                            .child(Label::new(context_server.id()).ml_0p5())
-                            .when(is_running, |this| {
-                                this.child(
-                                    Label::new(if tool_count == 1 {
-                                        SharedString::from("1 tool")
-                                    } else {
-                                        SharedString::from(format!("{} tools", tool_count))
-                                    })
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                                )
-                            }),
-                    )
-                    .child(
-                        Switch::new("context-server-switch", is_running.into())
-                            .color(SwitchColor::Accent)
-                            .on_click({
-                                let context_server_manager = self.context_server_manager.clone();
-                                let context_server = context_server.clone();
-                                move |state, _window, cx| match state {
-                                    ToggleState::Unselected | ToggleState::Indeterminate => {
-                                        context_server_manager.update(cx, |this, cx| {
-                                            this.stop_server(context_server.clone(), cx).log_err();
-                                        });
-                                    }
-                                    ToggleState::Selected => {
-                                        cx.spawn({
-                                            let context_server_manager =
-                                                context_server_manager.clone();
-                                            let context_server = context_server.clone();
-                                            async move |cx| {
-                                                if let Some(start_server_task) =
-                                                    context_server_manager
-                                                        .update(cx, |this, cx| {
-                                                            this.start_server(context_server, cx)
-                                                        })
-                                                        .log_err()
-                                                {
-                                                    start_server_task.await.log_err();
-                                                }
-                                            }
-                                        })
-                                        .detach();
-                                    }
-                                }
-                            }),
-                    ),
-            )
-            .map(|parent| {
-                if let Some(error) = error {
-                    return parent.child(
-                        h_flex()
-                            .p_2()
-                            .gap_2()
-                            .items_start()
-                            .child(
-                                h_flex()
-                                    .flex_none()
-                                    .h(window.line_height() / 1.6_f32)
-                                    .justify_center()
-                                    .child(
-                                        Icon::new(IconName::XCircle)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Error),
-                                    ),
-                            )
-                            .child(
-                                div().w_full().child(
-                                    Label::new(error)
-                                        .buffer_font(cx)
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small),
-                                ),
-                            ),
-                    );
-                }
-
-                if !are_tools_expanded || tools.is_empty() {
-                    return parent;
-                }
-
-                parent.child(v_flex().py_1p5().px_1().gap_1().children(
-                    tools.into_iter().enumerate().map(|(ix, tool)| {
-                        h_flex()
-                            .id(("tool-item", ix))
-                            .px_1()
-                            .gap_2()
-                            .justify_between()
-                            .hover(|style| style.bg(cx.theme().colors().element_hover))
-                            .rounded_sm()
-                            .child(
-                                Label::new(tool.name())
-                                    .buffer_font(cx)
-                                    .size(LabelSize::Small),
-                            )
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::Small)
-                                    .color(Color::Ignored),
-                            )
-                            .tooltip(Tooltip::text(tool.description()))
-                    }),
-                ))
-            })
-    }
 }

 impl Render for AssistantConfiguration {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
            .id("assistant-configuration")
            .key_context("AgentConfiguration")
@@ -593,9 +465,9 @@ impl Render for AssistantConfiguration {
                    .track_scroll(&self.scroll_handle)
                    .size_full()
                    .overflow_y_scroll()
-                    .child(self.render_general_settings_section(cx))
+                    .child(self.render_command_permission(cx))
                    .child(Divider::horizontal().color(DividerColor::Border))
-                    .child(self.render_context_servers_section(window, cx))
+                    .child(self.render_context_servers_section(cx))
                    .child(Divider::horizontal().color(DividerColor::Border))
                    .child(self.render_provider_configuration_section(cx)),
            )
--- a/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
@@ -1,446 +0,0 @@
-use std::{
-    sync::{Arc, Mutex},
-    time::Duration,
-};
-
-use anyhow::Context as _;
-use context_server::manager::{ContextServerManager, ContextServerStatus};
-use editor::{Editor, EditorElement, EditorStyle};
-use extension::ContextServerConfiguration;
-use gpui::{
-    Animation, AnimationExt, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task,
-    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, percentage,
-};
-use language::{Language, LanguageRegistry};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use settings::{Settings as _, update_settings_file};
-use theme::ThemeSettings;
-use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace};
-
-pub(crate) struct ConfigureContextServerModal {
-    workspace: WeakEntity<Workspace>,
-    context_servers_to_setup: Vec<ConfigureContextServer>,
-    context_server_manager: Entity<ContextServerManager>,
-}
-
-struct ConfigureContextServer {
-    id: Arc<str>,
-    installation_instructions: Entity<markdown::Markdown>,
-    settings_validator: Option<jsonschema::Validator>,
-    settings_editor: Entity<Editor>,
-    last_error: Option<SharedString>,
-    waiting_for_context_server: bool,
-}
-
-impl ConfigureContextServerModal {
-    pub fn new(
-        configurations: impl Iterator<Item = (Arc<str>, ContextServerConfiguration)>,
-        jsonc_language: Option<Arc<Language>>,
-        context_server_manager: Entity<ContextServerManager>,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Self> {
-        let context_servers_to_setup = configurations
-            .map(|(id, manifest)| {
-                let jsonc_language = jsonc_language.clone();
-                let settings_validator = jsonschema::validator_for(&manifest.settings_schema)
-                    .context("Failed to load JSON schema for context server settings")
-                    .log_err();
-                ConfigureContextServer {
-                    id: id.clone(),
-                    installation_instructions: cx.new(|cx| {
-                        Markdown::new(
-                            manifest.installation_instructions.clone().into(),
-                            Some(language_registry.clone()),
-                            None,
-                            cx,
-                        )
-                    }),
-                    settings_validator,
-                    settings_editor: cx.new(|cx| {
-                        let mut editor = Editor::auto_height(16, window, cx);
-                        editor.set_text(manifest.default_settings.trim(), window, cx);
-                        editor.set_show_gutter(false, cx);
-                        editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
-                        if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                            buffer.update(cx, |buffer, cx| buffer.set_language(jsonc_language, cx))
-                        }
-                        editor
-                    }),
-                    waiting_for_context_server: false,
-                    last_error: None,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if context_servers_to_setup.is_empty() {
-            return None;
-        }
-
-        Some(Self {
-            workspace,
-            context_servers_to_setup,
-            context_server_manager,
-        })
-    }
-}
-
-impl ConfigureContextServerModal {
-    pub fn confirm(&mut self, cx: &mut Context<Self>) {
-        if self.context_servers_to_setup.is_empty() {
-            return;
-        }
-
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        let configuration = &mut self.context_servers_to_setup[0];
-        configuration.last_error.take();
-        if configuration.waiting_for_context_server {
-            return;
-        }
-
-        let settings_value = match serde_json_lenient::from_str::<serde_json::Value>(
-            &configuration.settings_editor.read(cx).text(cx),
-        ) {
-            Ok(value) => value,
-            Err(error) => {
-                configuration.last_error = Some(error.to_string().into());
-                cx.notify();
-                return;
-            }
-        };
-
-        if let Some(validator) = configuration.settings_validator.as_ref() {
-            if let Err(error) = validator.validate(&settings_value) {
-                configuration.last_error = Some(error.to_string().into());
-                cx.notify();
-                return;
-            }
-        }
-        let id = configuration.id.clone();
-
-        let settings_changed = context_server::ContextServerSettings::get_global(cx)
-            .context_servers
-            .get(&id)
-            .map_or(true, |config| {
-                config.settings.as_ref() != Some(&settings_value)
-            });
-
-        let is_running = self.context_server_manager.read(cx).status_for_server(&id)
-            == Some(ContextServerStatus::Running);
-
-        if !settings_changed && is_running {
-            self.complete_setup(id, cx);
-            return;
-        }
-
-        configuration.waiting_for_context_server = true;
-
-        let task = wait_for_context_server(&self.context_server_manager, id.clone(), cx);
-        cx.spawn({
-            let id = id.clone();
-            async move |this, cx| {
-                let result = task.await;
-                this.update(cx, |this, cx| match result {
-                    Ok(_) => {
-                        this.complete_setup(id, cx);
-                    }
-                    Err(err) => {
-                        if let Some(configuration) = this.context_servers_to_setup.get_mut(0) {
-                            configuration.last_error = Some(err.into());
-                            configuration.waiting_for_context_server = false;
-                        } else {
-                            this.dismiss(cx);
-                        }
-                        cx.notify();
-                    }
-                })
-            }
-        })
-        .detach();
-
-        // When we write the settings to the file, the context server will be restarted.
-        update_settings_file::<context_server::ContextServerSettings>(
-            workspace.read(cx).app_state().fs.clone(),
-            cx,
-            {
-                let id = id.clone();
-                |settings, _| {
-                    if let Some(server_config) = settings.context_servers.get_mut(&id) {
-                        server_config.settings = Some(settings_value);
-                    } else {
-                        settings.context_servers.insert(
-                            id,
-                            context_server::ServerConfig {
-                                settings: Some(settings_value),
-                                ..Default::default()
-                            },
-                        );
-                    }
-                }
-            },
-        );
-    }
-
-    fn complete_setup(&mut self, id: Arc<str>, cx: &mut Context<Self>) {
-        self.context_servers_to_setup.remove(0);
-        cx.notify();
-
-        if !self.context_servers_to_setup.is_empty() {
-            return;
-        }
-
-        self.workspace
-            .update(cx, {
-                |workspace, cx| {
-                    let status_toast = StatusToast::new(
-                        format!("{} configured successfully.", id),
-                        cx,
-                        |this, _cx| {
-                            this.icon(ToastIcon::new(IconName::Hammer).color(Color::Muted))
-                                .action("Dismiss", |_, _| {})
-                        },
-                    );
-
-                    workspace.toggle_status_toast(status_toast, cx);
-                }
-            })
-            .log_err();
-
-        self.dismiss(cx);
-    }
-
-    fn dismiss(&self, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-fn wait_for_context_server(
-    context_server_manager: &Entity<ContextServerManager>,
-    context_server_id: Arc<str>,
-    cx: &mut App,
-) -> Task<Result<(), Arc<str>>> {
-    let (tx, rx) = futures::channel::oneshot::channel();
-    let tx = Arc::new(Mutex::new(Some(tx)));
-
-    let subscription = cx.subscribe(context_server_manager, move |_, event, _cx| match event {
-        context_server::manager::Event::ServerStatusChanged { server_id, status } => match status {
-            Some(ContextServerStatus::Running) => {
-                if server_id == &context_server_id {
-                    if let Some(tx) = tx.lock().unwrap().take() {
-                        let _ = tx.send(Ok(()));
-                    }
-                }
-            }
-            Some(ContextServerStatus::Error(error)) => {
-                if server_id == &context_server_id {
-                    if let Some(tx) = tx.lock().unwrap().take() {
-                        let _ = tx.send(Err(error.clone()));
-                    }
-                }
-            }
-            _ => {}
-        },
-    });
-
-    cx.spawn(async move |_cx| {
-        let result = rx.await.unwrap();
-        drop(subscription);
-        result
-    })
-}
-
-impl Render for ConfigureContextServerModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(configuration) = self.context_servers_to_setup.first() else {
-            return div().child("No context servers to setup");
-        };
-
-        let focus_handle = self.focus_handle(cx);
-
-        div()
-            .elevation_3(cx)
-            .w(rems(42.))
-            .key_context("ConfigureContextServerModal")
-            .on_action(cx.listener(|this, _: &menu::Confirm, _window, cx| this.confirm(cx)))
-            .on_action(cx.listener(|this, _: &menu::Cancel, _window, cx| this.dismiss(cx)))
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .child(
-                Modal::new("configure-context-server", None)
-                    .header(ModalHeader::new().headline(format!("Configure {}", configuration.id)))
-                    .section(
-                        Section::new()
-                            .child(div().pb_2().text_sm().child(MarkdownElement::new(
-                                configuration.installation_instructions.clone(),
-                                default_markdown_style(window, cx),
-                            )))
-                            .child(
-                                div()
-                                    .p_2()
-                                    .rounded_md()
-                                    .border_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                                    .bg(cx.theme().colors().editor_background)
-                                    .gap_1()
-                                    .child({
-                                        let settings = ThemeSettings::get_global(cx);
-                                        let text_style = TextStyle {
-                                            color: cx.theme().colors().text,
-                                            font_family: settings.buffer_font.family.clone(),
-                                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                                            font_size: settings.buffer_font_size(cx).into(),
-                                            font_weight: settings.buffer_font.weight,
-                                            line_height: relative(
-                                                settings.buffer_line_height.value(),
-                                            ),
-                                            ..Default::default()
-                                        };
-                                        EditorElement::new(
-                                            &configuration.settings_editor,
-                                            EditorStyle {
-                                                background: cx.theme().colors().editor_background,
-                                                local_player: cx.theme().players().local(),
-                                                text: text_style,
-                                                syntax: cx.theme().syntax().clone(),
-                                                ..Default::default()
-                                            },
-                                        )
-                                    })
-                                    .when_some(configuration.last_error.clone(), |this, error| {
-                                        this.child(
-                                            h_flex()
-                                                .gap_2()
-                                                .px_2()
-                                                .py_1()
-                                                .child(
-                                                    Icon::new(IconName::Warning)
-                                                        .size(IconSize::XSmall)
-                                                        .color(Color::Warning),
-                                                )
-                                                .child(
-                                                    div().w_full().child(
-                                                        Label::new(error)
-                                                            .size(LabelSize::Small)
-                                                            .color(Color::Muted),
-                                                    ),
-                                                ),
-                                        )
-                                    }),
-                            )
-                            .when(configuration.waiting_for_context_server, |this| {
-                                this.child(
-                                    h_flex()
-                                        .gap_1p5()
-                                        .child(
-                                            Icon::new(IconName::ArrowCircle)
-                                                .size(IconSize::XSmall)
-                                                .color(Color::Info)
-                                                .with_animation(
-                                                    "arrow-circle",
-                                                    Animation::new(Duration::from_secs(2)).repeat(),
-                                                    |icon, delta| {
-                                                        icon.transform(Transformation::rotate(
-                                                            percentage(delta),
-                                                        ))
-                                                    },
-                                                )
-                                                .into_any_element(),
-                                        )
-                                        .child(
-                                            Label::new("Waiting for Context Server")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                )
-                            }),
-                    )
-                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Button::new("cancel", "Cancel")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Cancel,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, _window, cx| {
-                                            this.dismiss(cx)
-                                        })),
-                                )
-                                .child(
-                                    Button::new("configure-server", "Configure MCP")
-                                        .disabled(configuration.waiting_for_context_server)
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Confirm,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, _window, cx| {
-                                            this.confirm(cx)
-                                        })),
-                                ),
-                        ),
-                    ),
-            )
-    }
-}
-
-pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(TextSize::XSmall.rems(cx).into()),
-        color: Some(colors.text_muted),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        selection_background_color: cx.theme().players().local().selection,
-        link: TextStyleRefinement {
-            background_color: Some(colors.editor_foreground.opacity(0.025)),
-            underline: Some(UnderlineStyle {
-                color: Some(colors.text_accent.opacity(0.5)),
-                thickness: px(1.),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
-
-impl ModalView for ConfigureContextServerModal {}
-impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
-impl Focusable for ConfigureContextServerModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if let Some(current) = self.context_servers_to_setup.first() {
-            current.settings_editor.read(cx).focus_handle(cx)
-        } else {
-            cx.focus_handle()
-        }
-    }
-}
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
@@ -2,7 +2,7 @@ mod profile_modal_header;

 use std::sync::Arc;

-use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, builtin_profiles};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
 use assistant_tool::ToolWorkingSet;
 use convert_case::{Case, Casing as _};
 use editor::Editor;
@@ -22,8 +22,6 @@ use crate::assistant_configuration::manage_profiles_modal::profile_modal_header:
 use crate::assistant_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
 use crate::{AssistantPanel, ManageProfiles, ThreadStore};

-use super::tool_picker::ToolPickerMode;
-
 enum Mode {
    ChooseProfile(ChooseProfileMode),
    NewProfile(NewProfileMode),
@@ -33,39 +31,26 @@ enum Mode {
        tool_picker: Entity<ToolPicker>,
        _subscription: Subscription,
    },
-    ConfigureMcps {
-        profile_id: AgentProfileId,
-        tool_picker: Entity<ToolPicker>,
-        _subscription: Subscription,
-    },
 }

 impl Mode {
    pub fn choose_profile(_window: &mut Window, cx: &mut Context<ManageProfilesModal>) -> Self {
        let settings = AssistantSettings::get_global(cx);

-        let mut builtin_profiles = Vec::new();
-        let mut custom_profiles = Vec::new();
+        let mut profiles = settings.profiles.clone();
+        profiles.sort_unstable_by(|_, a, _, b| a.name.cmp(&b.name));

-        for (profile_id, profile) in settings.profiles.iter() {
-            let entry = ProfileEntry {
-                id: profile_id.clone(),
-                name: profile.name.clone(),
+        let profiles = profiles
+            .into_iter()
+            .map(|(id, profile)| ProfileEntry {
+                id,
+                name: profile.name,
                navigation: NavigableEntry::focusable(cx),
-            };
-            if builtin_profiles::is_builtin(profile_id) {
-                builtin_profiles.push(entry);
-            } else {
-                custom_profiles.push(entry);
-            }
-        }
-
-        builtin_profiles.sort_unstable_by(|a, b| a.name.cmp(&b.name));
-        custom_profiles.sort_unstable_by(|a, b| a.name.cmp(&b.name));
+            })
+            .collect::<Vec<_>>();

        Self::ChooseProfile(ChooseProfileMode {
-            builtin_profiles,
-            custom_profiles,
+            profiles,
            add_new_profile: NavigableEntry::focusable(cx),
        })
    }
@@ -80,8 +65,7 @@ struct ProfileEntry {

 #[derive(Clone)]
 pub struct ChooseProfileMode {
-    builtin_profiles: Vec<ProfileEntry>,
-    custom_profiles: Vec<ProfileEntry>,
+    profiles: Vec<ProfileEntry>,
    add_new_profile: NavigableEntry,
 }

@@ -90,8 +74,6 @@ pub struct ViewProfileMode {
    profile_id: AgentProfileId,
    fork_profile: NavigableEntry,
    configure_tools: NavigableEntry,
-    configure_mcps: NavigableEntry,
-    cancel_item: NavigableEntry,
 }

 #[derive(Clone)]
@@ -184,50 +166,10 @@ impl ManageProfilesModal {
            profile_id,
            fork_profile: NavigableEntry::focusable(cx),
            configure_tools: NavigableEntry::focusable(cx),
-            configure_mcps: NavigableEntry::focusable(cx),
-            cancel_item: NavigableEntry::focusable(cx),
        });
        self.focus_handle(cx).focus(window);
    }

-    fn configure_mcps(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = AssistantSettings::get_global(cx);
-        let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
-            return;
-        };
-
-        let tool_picker = cx.new(|cx| {
-            let delegate = ToolPickerDelegate::new(
-                ToolPickerMode::McpTools,
-                self.fs.clone(),
-                self.tools.clone(),
-                self.thread_store.clone(),
-                profile_id.clone(),
-                profile,
-                cx,
-            );
-            ToolPicker::mcp_tools(delegate, window, cx)
-        });
-        let dismiss_subscription = cx.subscribe_in(&tool_picker, window, {
-            let profile_id = profile_id.clone();
-            move |this, _tool_picker, _: &DismissEvent, window, cx| {
-                this.view_profile(profile_id.clone(), window, cx);
-            }
-        });
-
-        self.mode = Mode::ConfigureMcps {
-            profile_id,
-            tool_picker,
-            _subscription: dismiss_subscription,
-        };
-        self.focus_handle(cx).focus(window);
-    }
-
    fn configure_tools(
        &mut self,
        profile_id: AgentProfileId,
@@ -241,7 +183,6 @@ impl ManageProfilesModal {

        let tool_picker = cx.new(|cx| {
            let delegate = ToolPickerDelegate::new(
-                ToolPickerMode::BuiltinTools,
                self.fs.clone(),
                self.tools.clone(),
                self.thread_store.clone(),
@@ -249,7 +190,7 @@ impl ManageProfilesModal {
                profile,
                cx,
            );
-            ToolPicker::builtin_tools(delegate, window, cx)
+            ToolPicker::new(delegate, window, cx)
        });
        let dismiss_subscription = cx.subscribe_in(&tool_picker, window, {
            let profile_id = profile_id.clone();
@@ -300,7 +241,6 @@ impl ManageProfilesModal {
            }
            Mode::ViewProfile(_) => {}
            Mode::ConfigureTools { .. } => {}
-            Mode::ConfigureMcps { .. } => {}
        }
    }

@@ -317,12 +257,7 @@ impl ManageProfilesModal {
                }
            }
            Mode::ViewProfile(_) => self.choose_profile(window, cx),
-            Mode::ConfigureTools { profile_id, .. } => {
-                self.view_profile(profile_id.clone(), window, cx)
-            }
-            Mode::ConfigureMcps { profile_id, .. } => {
-                self.view_profile(profile_id.clone(), window, cx)
-            }
+            Mode::ConfigureTools { .. } => {}
        }
    }

@@ -349,7 +284,6 @@ impl Focusable for ManageProfilesModal {
            Mode::NewProfile(mode) => mode.name_editor.focus_handle(cx),
            Mode::ViewProfile(_) => self.focus_handle.clone(),
            Mode::ConfigureTools { tool_picker, .. } => tool_picker.focus_handle(cx),
-            Mode::ConfigureMcps { tool_picker, .. } => tool_picker.focus_handle(cx),
        }
    }
 }
@@ -357,51 +291,6 @@ impl Focusable for ManageProfilesModal {
 impl EventEmitter<DismissEvent> for ManageProfilesModal {}

 impl ManageProfilesModal {
-    fn render_profile(
-        &self,
-        profile: &ProfileEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        div()
-            .id(SharedString::from(format!("profile-{}", profile.id)))
-            .track_focus(&profile.navigation.focus_handle)
-            .on_action({
-                let profile_id = profile.id.clone();
-                cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                    this.view_profile(profile_id.clone(), window, cx);
-                })
-            })
-            .child(
-                ListItem::new(SharedString::from(format!("profile-{}", profile.id)))
-                    .toggle_state(profile.navigation.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ListItemSpacing::Sparse)
-                    .child(Label::new(profile.name.clone()))
-                    .end_slot(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                Label::new("Customize")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .children(KeyBinding::for_action_in(
-                                &menu::Confirm,
-                                &self.focus_handle,
-                                window,
-                                cx,
-                            )),
-                    )
-                    .on_click({
-                        let profile_id = profile.id.clone();
-                        cx.listener(move |this, _, window, cx| {
-                            this.view_profile(profile_id.clone(), window, cx);
-                        })
-                    }),
-            )
-    }
-
    fn render_choose_profile(
        &mut self,
        mode: ChooseProfileMode,
@@ -412,31 +301,57 @@ impl ManageProfilesModal {
            div()
                .track_focus(&self.focus_handle(cx))
                .size_full()
-                .child(ProfileModalHeader::new("Agent Profiles", None))
+                .child(ProfileModalHeader::new(
+                    "Agent Profiles",
+                    IconName::ZedAssistant,
+                ))
                .child(
                    v_flex()
                        .pb_1()
                        .child(ListSeparator)
-                        .children(
-                            mode.builtin_profiles
-                                .iter()
-                                .map(|profile| self.render_profile(profile, window, cx)),
-                        )
-                        .when(!mode.custom_profiles.is_empty(), |this| {
-                            this.child(ListSeparator)
+                        .children(mode.profiles.iter().map(|profile| {
+                            div()
+                                .id(SharedString::from(format!("profile-{}", profile.id)))
+                                .track_focus(&profile.navigation.focus_handle)
+                                .on_action({
+                                    let profile_id = profile.id.clone();
+                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
+                                        this.view_profile(profile_id.clone(), window, cx);
+                                    })
+                                })
                                .child(
-                                    div().pl_2().pb_1().child(
-                                        Label::new("Custom Profiles")
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
+                                    ListItem::new(SharedString::from(format!(
+                                        "profile-{}",
+                                        profile.id
+                                    )))
+                                    .toggle_state(
+                                        profile
+                                            .navigation
+                                            .focus_handle
+                                            .contains_focused(window, cx),
+                                    )
+                                    .inset(true)
+                                    .spacing(ListItemSpacing::Sparse)
+                                    .child(Label::new(profile.name.clone()))
+                                    .end_slot(
+                                        h_flex()
+                                            .gap_1()
+                                            .child(Label::new("Customize").size(LabelSize::Small))
+                                            .children(KeyBinding::for_action_in(
+                                                &menu::Confirm,
+                                                &self.focus_handle,
+                                                window,
+                                                cx,
+                                            )),
+                                    )
+                                    .on_click({
+                                        let profile_id = profile.id.clone();
+                                        cx.listener(move |this, _, window, cx| {
+                                            this.view_profile(profile_id.clone(), window, cx);
+                                        })
+                                    }),
                                )
-                                .children(
-                                    mode.custom_profiles
-                                        .iter()
-                                        .map(|profile| self.render_profile(profile, window, cx)),
-                                )
-                        })
+                        }))
                        .child(ListSeparator)
                        .child(
                            div()
@@ -467,10 +382,7 @@ impl ManageProfilesModal {
                .into_any_element(),
        )
        .map(|mut navigable| {
-            for profile in mode.builtin_profiles {
-                navigable = navigable.entry(profile.navigation);
-            }
-            for profile in mode.custom_profiles {
+            for profile in mode.profiles {
                navigable = navigable.entry(profile.navigation);
            }

@@ -499,14 +411,11 @@ impl ManageProfilesModal {
            .id("new-profile")
            .track_focus(&self.focus_handle(cx))
            .child(ProfileModalHeader::new(
-                match &base_profile_name {
+                match base_profile_name {
                    Some(base_profile) => format!("Fork {base_profile}"),
                    None => "New Profile".into(),
                },
-                match base_profile_name {
-                    Some(_) => Some(IconName::Scissors),
-                    None => Some(IconName::Plus),
-                },
+                IconName::Plus,
            ))
            .child(ListSeparator)
            .child(h_flex().p_2().child(mode.name_editor.clone()))
@@ -520,24 +429,20 @@ impl ManageProfilesModal {
    ) -> impl IntoElement {
        let settings = AssistantSettings::get_global(cx);

-        let profile_id = &settings.default_profile;
        let profile_name = settings
            .profiles
            .get(&mode.profile_id)
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let icon = match profile_id.as_str() {
-            "write" => IconName::Pencil,
-            "ask" => IconName::MessageBubbles,
-            _ => IconName::UserRoundPen,
-        };
-
        Navigable::new(
            div()
                .track_focus(&self.focus_handle(cx))
                .size_full()
-                .child(ProfileModalHeader::new(profile_name, Some(icon)))
+                .child(ProfileModalHeader::new(
+                    profile_name,
+                    IconName::ZedAssistant,
+                ))
                .child(
                    v_flex()
                        .pb_1()
@@ -561,11 +466,7 @@ impl ManageProfilesModal {
                                        )
                                        .inset(true)
                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Scissors)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
+                                        .start_slot(Icon::new(IconName::GitBranch))
                                        .child(Label::new("Fork Profile"))
                                        .on_click({
                                            let profile_id = mode.profile_id.clone();
@@ -598,11 +499,7 @@ impl ManageProfilesModal {
                                        )
                                        .inset(true)
                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Settings)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
+                                        .start_slot(Icon::new(IconName::Cog))
                                        .child(Label::new("Configure Tools"))
                                        .on_click({
                                            let profile_id = mode.profile_id.clone();
@@ -615,90 +512,12 @@ impl ManageProfilesModal {
                                            })
                                        }),
                                ),
-                        )
-                        .child(
-                            div()
-                                .id("configure-mcps")
-                                .track_focus(&mode.configure_mcps.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_mcps(profile_id.clone(), window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("configure-mcps")
-                                        .toggle_state(
-                                            mode.configure_mcps
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Hammer)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Configure MCP Servers"))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_mcps(profile_id.clone(), window, cx);
-                                            })
-                                        }),
-                                ),
-                        )
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("cancel-item")
-                                .track_focus(&mode.cancel_item.focus_handle)
-                                .on_action({
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.cancel(window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("cancel-item")
-                                        .toggle_state(
-                                            mode.cancel_item
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ArrowLeft)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Go Back"))
-                                        .end_slot(
-                                            div().children(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Cancel,
-                                                    &self.focus_handle,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(12.))),
-                                            ),
-                                        )
-                                        .on_click({
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.cancel(window, cx);
-                                            })
-                                        }),
-                                ),
                        ),
                )
                .into_any_element(),
        )
        .entry(mode.fork_profile)
        .entry(mode.configure_tools)
-        .entry(mode.configure_mcps)
-        .entry(mode.cancel_item)
    }
 }

@@ -706,43 +525,6 @@ impl Render for ManageProfilesModal {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AssistantSettings::get_global(cx);

-        let go_back_item = div()
-            .id("cancel-item")
-            .track_focus(&self.focus_handle)
-            .on_action({
-                cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                    this.cancel(window, cx);
-                })
-            })
-            .child(
-                ListItem::new("cancel-item")
-                    .toggle_state(self.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ListItemSpacing::Sparse)
-                    .start_slot(
-                        Icon::new(IconName::ArrowLeft)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new("Go Back"))
-                    .end_slot(
-                        div().children(
-                            KeyBinding::for_action_in(
-                                &menu::Cancel,
-                                &self.focus_handle,
-                                window,
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(12.))),
-                        ),
-                    )
-                    .on_click({
-                        cx.listener(move |this, _, window, cx| {
-                            this.cancel(window, cx);
-                        })
-                    }),
-            );
-
        div()
            .elevation_3(cx)
            .w(rems(34.))
@@ -774,39 +556,13 @@ impl Render for ManageProfilesModal {
                        .map(|profile| profile.name.clone())
                        .unwrap_or_else(|| "Unknown".into());

-                    v_flex()
-                        .pb_1()
+                    div()
                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure Tools"),
-                            Some(IconName::Cog),
+                            format!("{profile_name}: Configure Tools"),
+                            IconName::Cog,
                        ))
                        .child(ListSeparator)
                        .child(tool_picker.clone())
-                        .child(ListSeparator)
-                        .child(go_back_item)
-                        .into_any_element()
-                }
-                Mode::ConfigureMcps {
-                    profile_id,
-                    tool_picker,
-                    ..
-                } => {
-                    let profile_name = settings
-                        .profiles
-                        .get(profile_id)
-                        .map(|profile| profile.name.clone())
-                        .unwrap_or_else(|| "Unknown".into());
-
-                    v_flex()
-                        .pb_1()
-                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure MCP Servers"),
-                            Some(IconName::Hammer),
-                        ))
-                        .child(ListSeparator)
-                        .child(tool_picker.clone())
-                        .child(ListSeparator)
-                        .child(go_back_item)
                        .into_any_element()
                }
            })
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
@@ -3,11 +3,11 @@ use ui::prelude::*;
 #[derive(IntoElement)]
 pub struct ProfileModalHeader {
    label: SharedString,
-    icon: Option<IconName>,
+    icon: IconName,
 }

 impl ProfileModalHeader {
-    pub fn new(label: impl Into<SharedString>, icon: Option<IconName>) -> Self {
+    pub fn new(label: impl Into<SharedString>, icon: IconName) -> Self {
        Self {
            label: label.into(),
            icon,
@@ -17,26 +17,22 @@ impl ProfileModalHeader {

 impl RenderOnce for ProfileModalHeader {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut container = h_flex()
+        h_flex()
            .w_full()
            .px(DynamicSpacing::Base12.rems(cx))
            .pt(DynamicSpacing::Base08.rems(cx))
            .pb(DynamicSpacing::Base04.rems(cx))
            .rounded_t_sm()
-            .gap_1p5();
-
-        if let Some(icon) = self.icon {
-            container = container.child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted));
-        }
-
-        container.child(
-            h_flex().gap_1().overflow_x_hidden().child(
-                div()
-                    .max_w_96()
-                    .overflow_x_hidden()
-                    .text_ellipsis()
-                    .child(Headline::new(self.label).size(HeadlineSize::XSmall)),
-            ),
-        )
+            .gap_1p5()
+            .child(Icon::new(self.icon).size(IconSize::XSmall))
+            .child(
+                h_flex().gap_1().overflow_x_hidden().child(
+                    div()
+                        .max_w_96()
+                        .overflow_x_hidden()
+                        .text_ellipsis()
+                        .child(Headline::new(self.label).size(HeadlineSize::XSmall)),
+                ),
+            )
    }
 }
--- a/crates/agent/src/assistant_configuration/tool_picker.rs
+++ b/crates/agent/src/assistant_configuration/tool_picker.rs
@@ -1,15 +1,16 @@
-use std::{collections::BTreeMap, sync::Arc};
+use std::sync::Arc;

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

 use crate::ThreadStore;
@@ -18,30 +19,11 @@ pub struct ToolPicker {
    picker: Entity<Picker<ToolPickerDelegate>>,
 }

-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ToolPickerMode {
-    BuiltinTools,
-    McpTools,
-}
-
 impl ToolPicker {
-    pub fn builtin_tools(
-        delegate: ToolPickerDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
+    pub fn new(delegate: ToolPickerDelegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
        Self { picker }
    }
-
-    pub fn mcp_tools(
-        delegate: ToolPickerDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::list(delegate, window, cx).modal(false));
-        Self { picker }
-    }
 }

 impl EventEmitter<DismissEvent> for ToolPicker {}
@@ -59,31 +41,24 @@ impl Render for ToolPicker {
 }

 #[derive(Debug, Clone)]
-pub enum PickerItem {
-    Tool {
-        server_id: Option<Arc<str>>,
-        name: Arc<str>,
-    },
-    ContextServer {
-        server_id: Arc<str>,
-    },
+pub struct ToolEntry {
+    pub name: Arc<str>,
+    pub source: ToolSource,
 }

 pub struct ToolPickerDelegate {
    tool_picker: WeakEntity<ToolPicker>,
    thread_store: WeakEntity<ThreadStore>,
    fs: Arc<dyn Fs>,
-    items: Arc<Vec<PickerItem>>,
+    tools: Vec<ToolEntry>,
    profile_id: AgentProfileId,
    profile: AgentProfile,
-    filtered_items: Vec<PickerItem>,
+    matches: Vec<StringMatch>,
    selected_index: usize,
-    mode: ToolPickerMode,
 }

 impl ToolPickerDelegate {
    pub fn new(
-        mode: ToolPickerMode,
        fs: Arc<dyn Fs>,
        tool_set: Entity<ToolWorkingSet>,
        thread_store: WeakEntity<ThreadStore>,
@@ -91,60 +66,33 @@ impl ToolPickerDelegate {
        profile: AgentProfile,
        cx: &mut Context<ToolPicker>,
    ) -> Self {
-        let items = Arc::new(Self::resolve_items(mode, &tool_set, cx));
+        let mut tool_entries = Vec::new();
+
+        for (source, tools) in tool_set.read(cx).tools_by_source(cx) {
+            tool_entries.extend(tools.into_iter().map(|tool| ToolEntry {
+                name: tool.name().into(),
+                source: source.clone(),
+            }));
+        }

        Self {
            tool_picker: cx.entity().downgrade(),
            thread_store,
            fs,
-            items,
+            tools: tool_entries,
            profile_id,
            profile,
-            filtered_items: Vec::new(),
+            matches: Vec::new(),
            selected_index: 0,
-            mode,
        }
    }
-
-    fn resolve_items(
-        mode: ToolPickerMode,
-        tool_set: &Entity<ToolWorkingSet>,
-        cx: &mut App,
-    ) -> Vec<PickerItem> {
-        let mut items = Vec::new();
-        for (source, tools) in tool_set.read(cx).tools_by_source(cx) {
-            match source {
-                ToolSource::Native => {
-                    if mode == ToolPickerMode::BuiltinTools {
-                        items.extend(tools.into_iter().map(|tool| PickerItem::Tool {
-                            name: tool.name().into(),
-                            server_id: None,
-                        }));
-                    }
-                }
-                ToolSource::ContextServer { id } => {
-                    if mode == ToolPickerMode::McpTools && !tools.is_empty() {
-                        let server_id: Arc<str> = id.clone().into();
-                        items.push(PickerItem::ContextServer {
-                            server_id: server_id.clone(),
-                        });
-                        items.extend(tools.into_iter().map(|tool| PickerItem::Tool {
-                            name: tool.name().into(),
-                            server_id: Some(server_id.clone()),
-                        }));
-                    }
-                }
-            }
-        }
-        items
-    }
 }

 impl PickerDelegate for ToolPickerDelegate {
-    type ListItem = AnyElement;
+    type ListItem = ListItem;

    fn match_count(&self) -> usize {
-        self.filtered_items.len()
+        self.matches.len()
    }

    fn selected_index(&self) -> usize {
@@ -160,25 +108,8 @@ impl PickerDelegate for ToolPickerDelegate {
        self.selected_index = ix;
    }

-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        let item = &self.filtered_items[ix];
-        match item {
-            PickerItem::Tool { .. } => true,
-            PickerItem::ContextServer { .. } => false,
-        }
-    }
-
    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        match self.mode {
-            ToolPickerMode::BuiltinTools => "Search built-in tools…",
-            ToolPickerMode::McpTools => "Search MCP servers…",
-        }
-        .into()
+        "Search tools…".into()
    }

    fn update_matches(
@@ -187,76 +118,74 @@ impl PickerDelegate for ToolPickerDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
-        let all_items = self.items.clone();
+        let background = cx.background_executor().clone();
+        let candidates = self
+            .tools
+            .iter()
+            .enumerate()
+            .map(|(id, profile)| StringMatchCandidate::new(id, profile.name.as_ref()))
+            .collect::<Vec<_>>();

        cx.spawn_in(window, async move |this, cx| {
-            let filtered_items = cx
-                .background_spawn(async move {
-                    let mut tools_by_provider: BTreeMap<Option<Arc<str>>, Vec<Arc<str>>> =
-                        BTreeMap::default();
-
-                    for item in all_items.iter() {
-                        if let PickerItem::Tool { server_id, name } = item.clone() {
-                            if name.contains(&query) {
-                                tools_by_provider.entry(server_id).or_default().push(name);
-                            }
-                        }
-                    }
-
-                    let mut items = Vec::new();
-
-                    for (server_id, names) in tools_by_provider {
-                        if let Some(server_id) = server_id.clone() {
-                            items.push(PickerItem::ContextServer { server_id });
-                        }
-                        for name in names {
-                            items.push(PickerItem::Tool {
-                                server_id: server_id.clone(),
-                                name,
-                            });
-                        }
-                    }
-
-                    items
-                })
-                .await;
+            let matches = if query.is_empty() {
+                candidates
+                    .into_iter()
+                    .enumerate()
+                    .map(|(index, candidate)| StringMatch {
+                        candidate_id: index,
+                        string: candidate.string,
+                        positions: Vec::new(),
+                        score: 0.,
+                    })
+                    .collect()
+            } else {
+                match_strings(
+                    &candidates,
+                    &query,
+                    false,
+                    100,
+                    &Default::default(),
+                    background,
+                )
+                .await
+            };

            this.update(cx, |this, _cx| {
-                this.delegate.filtered_items = filtered_items;
+                this.delegate.matches = matches;
                this.delegate.selected_index = this
                    .delegate
                    .selected_index
-                    .min(this.delegate.filtered_items.len().saturating_sub(1));
+                    .min(this.delegate.matches.len().saturating_sub(1));
            })
            .log_err();
        })
    }

    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if self.filtered_items.is_empty() {
+        if self.matches.is_empty() {
            self.dismissed(window, cx);
            return;
        }

-        let item = &self.filtered_items[self.selected_index];
+        let candidate_id = self.matches[self.selected_index].candidate_id;
+        let tool = &self.tools[candidate_id];

-        let PickerItem::Tool {
-            name: tool_name,
-            server_id,
-        } = item
-        else {
-            return;
-        };
-
-        let is_currently_enabled = if let Some(server_id) = server_id.clone() {
-            let preset = self.profile.context_servers.entry(server_id).or_default();
-            let is_enabled = *preset.tools.entry(tool_name.clone()).or_default();
-            *preset.tools.entry(tool_name.clone()).or_default() = !is_enabled;
-            is_enabled
-        } else {
-            let is_enabled = *self.profile.tools.entry(tool_name.clone()).or_default();
-            *self.profile.tools.entry(tool_name.clone()).or_default() = !is_enabled;
-            is_enabled
+        let is_enabled = match &tool.source {
+            ToolSource::Native => {
+                let is_enabled = self.profile.tools.entry(tool.name.clone()).or_default();
+                *is_enabled = !*is_enabled;
+                *is_enabled
+            }
+            ToolSource::ContextServer { id } => {
+                let preset = self
+                    .profile
+                    .context_servers
+                    .entry(id.clone().into())
+                    .or_default();
+                let is_enabled = preset.tools.entry(tool.name.clone()).or_default();
+                *is_enabled = !*is_enabled;
+                *is_enabled
+            }
        };

        let active_profile_id = &AssistantSettings::get_global(cx).default_profile;
@@ -271,12 +200,11 @@ impl PickerDelegate for ToolPickerDelegate {
        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
            let profile_id = self.profile_id.clone();
            let default_profile = self.profile.clone();
-            let server_id = server_id.clone();
-            let tool_name = tool_name.clone();
-            move |settings: &mut AssistantSettingsContent, _cx| {
-                settings
-                    .v2_setting(|v2_settings| {
-                        let profiles = v2_settings.profiles.get_or_insert_default();
+            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)
@@ -300,16 +228,21 @@ impl PickerDelegate for ToolPickerDelegate {
                                        .collect(),
                                });

-                        if let Some(server_id) = server_id {
-                            let preset = profile.context_servers.entry(server_id).or_default();
-                            *preset.tools.entry(tool_name).or_default() = !is_currently_enabled;
-                        } else {
-                            *profile.tools.entry(tool_name).or_default() = !is_currently_enabled;
+                        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;
+                            }
                        }
-
-                        Ok(())
-                    })
-                    .ok();
+                    }
+                }
+                _ => {}
            }
        });
    }
@@ -325,53 +258,45 @@ impl PickerDelegate for ToolPickerDelegate {
        ix: usize,
        selected: bool,
        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
+        _cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let item = &self.filtered_items[ix];
-        match item {
-            PickerItem::ContextServer { server_id, .. } => Some(
-                div()
-                    .px_2()
-                    .pb_1()
-                    .when(ix > 1, |this| {
-                        this.mt_1()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(server_id)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            PickerItem::Tool { name, server_id } => {
-                let is_enabled = if let Some(server_id) = server_id {
-                    self.profile
-                        .context_servers
-                        .get(server_id.as_ref())
-                        .and_then(|preset| preset.tools.get(name))
-                        .copied()
-                        .unwrap_or(self.profile.enable_all_context_servers)
-                } else {
-                    self.profile.tools.get(name).copied().unwrap_or(false)
-                };
+        let tool_match = &self.matches[ix];
+        let tool = &self.tools[tool_match.candidate_id];

-                Some(
-                    ListItem::new(ix)
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(Label::new(name.clone()))
-                        .end_slot::<Icon>(is_enabled.then(|| {
-                            Icon::new(IconName::Check)
-                                .size(IconSize::Small)
-                                .color(Color::Success)
-                        }))
-                        .into_any_element(),
+        let is_enabled = match &tool.source {
+            ToolSource::Native => self.profile.tools.get(&tool.name).copied().unwrap_or(false),
+            ToolSource::ContextServer { id } => self
+                .profile
+                .context_servers
+                .get(id.as_ref())
+                .and_then(|preset| preset.tools.get(&tool.name))
+                .copied()
+                .unwrap_or(false),
+        };
+
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .spacing(ListItemSpacing::Sparse)
+                .toggle_state(selected)
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .child(HighlightedLabel::new(
+                            tool_match.string.clone(),
+                            tool_match.positions.clone(),
+                        ))
+                        .map(|parent| match &tool.source {
+                            ToolSource::Native => parent,
+                            ToolSource::ContextServer { id } => parent
+                                .child(Label::new(id).size(LabelSize::XSmall).color(Color::Muted)),
+                        }),
                )
-            }
-        }
+                .end_slot::<Icon>(is_enabled.then(|| {
+                    Icon::new(IconName::Check)
+                        .size(IconSize::Small)
+                        .color(Color::Success)
+                })),
+        )
    }
 }
--- a/crates/agent/src/assistant_model_selector.rs
+++ b/crates/agent/src/assistant_model_selector.rs
@@ -2,20 +2,14 @@ use assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};

-use crate::Thread;
-use language_model::{ConfiguredModel, LanguageModelRegistry};
 use language_model_selector::{
    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
 };
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::{PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{ButtonLike, PopoverMenuHandle, Tooltip, prelude::*};

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

 pub struct AssistantModelSelector {
    selector: Entity<LanguageModelSelector>,
@@ -30,39 +24,18 @@ impl AssistantModelSelector {
        focus_handle: FocusHandle,
        model_type: ModelType,
        window: &mut Window,
-        cx: &mut Context<Self>,
+        cx: &mut App,
    ) -> Self {
        Self {
-            selector: cx.new(move |cx| {
+            selector: cx.new(|cx| {
                let fs = fs.clone();
                LanguageModelSelector::new(
-                    {
-                        let model_type = model_type.clone();
-                        move |cx| match &model_type {
-                            ModelType::Default(thread) => thread.read(cx).configured_model(),
-                            ModelType::InlineAssistant => {
-                                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-                            }
-                        }
-                    },
                    move |model, cx| {
                        let provider = model.provider_id().0.to_string();
                        let model_id = model.id().0.to_string();
-                        match &model_type {
-                            ModelType::Default(thread) => {
-                                thread.update(cx, |thread, cx| {
-                                    let registry = LanguageModelRegistry::read_global(cx);
-                                    if let Some(provider) = registry.provider(&model.provider_id())
-                                    {
-                                        thread.set_configured_model(
-                                            Some(ConfiguredModel {
-                                                provider,
-                                                model: model.clone(),
-                                            }),
-                                            cx,
-                                        );
-                                    }
-                                });
+
+                        match model_type {
+                            ModelType::Default => {
                                update_settings_file::<AssistantSettings>(
                                    fs.clone(),
                                    cx,
@@ -85,6 +58,7 @@ impl AssistantModelSelector {
                            }
                        }
                    },
+                    model_type,
                    window,
                    cx,
                )
@@ -104,19 +78,35 @@ impl Render for AssistantModelSelector {
        let focus_handle = self.focus_handle.clone();

        let model = self.selector.read(cx).active_model(cx);
-        let model_name = model
-            .map(|model| model.model.name().0)
-            .unwrap_or_else(|| SharedString::from("No model selected"));
+        let (model_name, model_icon) = match model {
+            Some(model) => (model.model.name().0, Some(model.provider.icon())),
+            _ => (SharedString::from("No model selected"), None),
+        };

        LanguageModelSelectorPopoverMenu::new(
            self.selector.clone(),
-            Button::new("active-model", model_name)
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .icon(IconName::ChevronDown)
-                .icon_size(IconSize::XSmall)
-                .icon_position(IconPosition::End)
-                .icon_color(Color::Muted),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .gap_0p5()
+                        .children(
+                            model_icon.map(|icon| {
+                                Icon::new(icon).color(Color::Muted).size(IconSize::Small)
+                            }),
+                        )
+                        .child(
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted)
+                                .ml_1(),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                ),
            move |window, cx| {
                Tooltip::for_action_in(
                    "Change Model",
--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -1,14 +1,12 @@
-use crate::context::ContextLoadResult;
+use crate::context::attach_context_to_message;
+use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::CodegenStatus;
-use crate::{context::load_context, context_store::ContextStore};
 use anyhow::Result;
 use client::telemetry::Telemetry;
 use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use futures::{
-    SinkExt, Stream, StreamExt, TryStreamExt as _, channel::mpsc, future::LocalBoxFuture, join,
-};
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task, WeakEntity};
+use futures::{SinkExt, Stream, StreamExt, channel::mpsc, future::LocalBoxFuture, join};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
 use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
 use language_model::{
    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
@@ -16,9 +14,7 @@ use language_model::{
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::Project;
 use prompt_store::PromptBuilder;
-use prompt_store::PromptStore;
 use rope::Rope;
 use smol::future::FutureExt;
 use std::{
@@ -43,8 +39,6 @@ pub struct BufferCodegen {
    range: Range<Anchor>,
    initial_transaction_id: Option<TransactionId>,
    context_store: Entity<ContextStore>,
-    project: WeakEntity<Project>,
-    prompt_store: Option<Entity<PromptStore>>,
    telemetry: Arc<Telemetry>,
    builder: Arc<PromptBuilder>,
    pub is_insertion: bool,
@@ -56,8 +50,6 @@ impl BufferCodegen {
        range: Range<Anchor>,
        initial_transaction_id: Option<TransactionId>,
        context_store: Entity<ContextStore>,
-        project: WeakEntity<Project>,
-        prompt_store: Option<Entity<PromptStore>>,
        telemetry: Arc<Telemetry>,
        builder: Arc<PromptBuilder>,
        cx: &mut Context<Self>,
@@ -68,8 +60,6 @@ impl BufferCodegen {
                range.clone(),
                false,
                Some(context_store.clone()),
-                project.clone(),
-                prompt_store.clone(),
                Some(telemetry.clone()),
                builder.clone(),
                cx,
@@ -85,8 +75,6 @@ impl BufferCodegen {
            range,
            initial_transaction_id,
            context_store,
-            project,
-            prompt_store,
            telemetry,
            builder,
        };
@@ -165,8 +153,6 @@ impl BufferCodegen {
                    self.range.clone(),
                    false,
                    Some(self.context_store.clone()),
-                    self.project.clone(),
-                    self.prompt_store.clone(),
                    Some(self.telemetry.clone()),
                    self.builder.clone(),
                    cx,
@@ -243,14 +229,13 @@ pub struct CodegenAlternative {
    generation: Task<()>,
    diff: Diff,
    context_store: Option<Entity<ContextStore>>,
-    project: WeakEntity<Project>,
-    prompt_store: Option<Entity<PromptStore>>,
    telemetry: Option<Arc<Telemetry>>,
    _subscription: gpui::Subscription,
    builder: Arc<PromptBuilder>,
    active: bool,
    edits: Vec<(Range<Anchor>, String)>,
    line_operations: Vec<LineOperation>,
+    request: Option<LanguageModelRequest>,
    elapsed_time: Option<f64>,
    completion: Option<String>,
    pub message_id: Option<String>,
@@ -264,8 +249,6 @@ impl CodegenAlternative {
        range: Range<Anchor>,
        active: bool,
        context_store: Option<Entity<ContextStore>>,
-        project: WeakEntity<Project>,
-        prompt_store: Option<Entity<PromptStore>>,
        telemetry: Option<Arc<Telemetry>>,
        builder: Arc<PromptBuilder>,
        cx: &mut Context<Self>,
@@ -307,8 +290,6 @@ impl CodegenAlternative {
            generation: Task::ready(()),
            diff: Diff::default(),
            context_store,
-            project,
-            prompt_store,
            telemetry,
            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
            builder,
@@ -316,6 +297,7 @@ impl CodegenAlternative {
            edits: Vec::new(),
            line_operations: Vec::new(),
            range,
+            request: None,
            elapsed_time: None,
            completion: None,
        }
@@ -384,18 +366,16 @@ impl CodegenAlternative {
                async { Ok(LanguageModelTextStream::default()) }.boxed_local()
            } else {
                let request = self.build_request(user_prompt, cx)?;
-                cx.spawn(async move |_, cx| model.stream_completion_text(request.await, &cx).await)
+                self.request = Some(request.clone());
+
+                cx.spawn(async move |_, cx| model.stream_completion_text(request, &cx).await)
                    .boxed_local()
            };
        self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
        Ok(())
    }

-    fn build_request(
-        &self,
-        user_prompt: String,
-        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
+    fn build_request(&self, user_prompt: String, cx: &mut App) -> Result<LanguageModelRequest> {
        let buffer = self.buffer.read(cx).snapshot(cx);
        let language = buffer.language_at(self.range.start);
        let language_name = if let Some(language) = language.as_ref() {
@@ -428,45 +408,30 @@ impl CodegenAlternative {
            .generate_inline_transformation_prompt(user_prompt, language_name, buffer, range)
            .map_err(|e| anyhow::anyhow!("Failed to generate content prompt: {}", e))?;

-        let context_task = self.context_store.as_ref().map(|context_store| {
-            if let Some(project) = self.project.upgrade() {
-                let context = context_store
-                    .read(cx)
-                    .context()
-                    .cloned()
-                    .collect::<Vec<_>>();
-                load_context(context, &project, &self.prompt_store, cx)
-            } else {
-                Task::ready(ContextLoadResult::default())
-            }
-        });
+        let mut request_message = LanguageModelRequestMessage {
+            role: Role::User,
+            content: Vec::new(),
+            cache: false,
+        };

-        Ok(cx.spawn(async move |_cx| {
-            let mut request_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: Vec::new(),
-                cache: false,
-            };
+        if let Some(context_store) = &self.context_store {
+            attach_context_to_message(
+                &mut request_message,
+                context_store.read(cx).context().iter(),
+                cx,
+            );
+        }

-            if let Some(context_task) = context_task {
-                context_task
-                    .await
-                    .loaded_context
-                    .add_to_request_message(&mut request_message);
-            }
+        request_message.content.push(prompt.into());

-            request_message.content.push(prompt.into());
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                mode: None,
-                tools: Vec::new(),
-                stop: Vec::new(),
-                temperature: None,
-                messages: vec![request_message],
-            }
-        }))
+        Ok(LanguageModelRequest {
+            thread_id: None,
+            prompt_id: None,
+            tools: Vec::new(),
+            stop: Vec::new(),
+            temperature: None,
+            messages: vec![request_message],
+        })
    }

    pub fn handle_stream(
@@ -504,7 +469,7 @@ impl CodegenAlternative {
            }
        }

-        let http_client = cx.http_client();
+        let http_client = cx.http_client().clone();
        let telemetry = self.telemetry.clone();
        let language_name = {
            let multibuffer = self.buffer.read(cx);
@@ -543,9 +508,7 @@ impl CodegenAlternative {
                        let mut response_latency = None;
                        let request_start = Instant::now();
                        let diff = async {
-                            let chunks = StripInvalidSpans::new(
-                                stream?.stream.map_err(|error| error.into()),
-                            );
+                            let chunks = StripInvalidSpans::new(stream?.stream);
                            futures::pin_mut!(chunks);
                            let mut diff = StreamingDiff::new(selected_text.to_string());
                            let mut line_diff = LineDiff::default();
@@ -1071,7 +1034,6 @@ impl Diff {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use fs::FakeFs;
    use futures::{
        Stream,
        stream::{self},
@@ -1114,16 +1076,12 @@ mod tests {
            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(4, 5))
        });
        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, vec![], cx).await;
        let codegen = cx.new(|cx| {
            CodegenAlternative::new(
                buffer.clone(),
                range.clone(),
                true,
                None,
-                project.downgrade(),
-                None,
                None,
                prompt_builder,
                cx,
@@ -1182,16 +1140,12 @@ mod tests {
            snapshot.anchor_before(Point::new(1, 6))..snapshot.anchor_after(Point::new(1, 6))
        });
        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, vec![], cx).await;
        let codegen = cx.new(|cx| {
            CodegenAlternative::new(
                buffer.clone(),
                range.clone(),
                true,
                None,
-                project.downgrade(),
-                None,
                None,
                prompt_builder,
                cx,
@@ -1253,16 +1207,12 @@ mod tests {
            snapshot.anchor_before(Point::new(1, 2))..snapshot.anchor_after(Point::new(1, 2))
        });
        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, vec![], cx).await;
        let codegen = cx.new(|cx| {
            CodegenAlternative::new(
                buffer.clone(),
                range.clone(),
                true,
                None,
-                project.downgrade(),
-                None,
                None,
                prompt_builder,
                cx,
@@ -1324,16 +1274,12 @@ mod tests {
            snapshot.anchor_before(Point::new(0, 0))..snapshot.anchor_after(Point::new(4, 2))
        });
        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, vec![], cx).await;
        let codegen = cx.new(|cx| {
            CodegenAlternative::new(
                buffer.clone(),
                range.clone(),
                true,
                None,
-                project.downgrade(),
-                None,
                None,
                prompt_builder,
                cx,
@@ -1383,16 +1329,12 @@ mod tests {
            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 14))
        });
        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, vec![], cx).await;
        let codegen = cx.new(|cx| {
            CodegenAlternative::new(
                buffer.clone(),
                range.clone(),
                false,
                None,
-                project.downgrade(),
-                None,
                None,
                prompt_builder,
                cx,
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -10,11 +10,8 @@ use std::path::PathBuf;
 use std::sync::Arc;

 use anyhow::{Result, anyhow};
-pub use completion_provider::ContextPickerCompletionProvider;
-use editor::display_map::{Crease, CreaseId, CreaseMetadata, FoldId};
+use editor::display_map::{Crease, FoldId};
 use editor::{Anchor, AnchorRangeExt as _, Editor, ExcerptId, FoldPlaceholder, ToOffset};
-use fetch_context_picker::FetchContextPicker;
-use file_context_picker::FileContextPicker;
 use file_context_picker::render_file_context_entry;
 use gpui::{
    App, DismissEvent, Empty, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task,
@@ -23,10 +20,10 @@ use gpui::{
 use language::Buffer;
 use multi_buffer::MultiBufferRow;
 use project::{Entry, ProjectPath};
-use prompt_store::{PromptStore, UserPromptId};
-use rules_context_picker::{RulesContextEntry, RulesContextPicker};
+use prompt_store::UserPromptId;
+use rules_context_picker::RulesContextEntry;
 use symbol_context_picker::SymbolContextPicker;
-use thread_context_picker::{ThreadContextEntry, ThreadContextPicker, render_thread_context_entry};
+use thread_context_picker::{ThreadContextEntry, render_thread_context_entry};
 use ui::{
    ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
 };
@@ -35,6 +32,11 @@ use workspace::{Workspace, notifications::NotifyResultExt};

 use crate::AssistantPanel;
 use crate::context::RULES_ICON;
+pub use crate::context_picker::completion_provider::ContextPickerCompletionProvider;
+use crate::context_picker::fetch_context_picker::FetchContextPicker;
+use crate::context_picker::file_context_picker::FileContextPicker;
+use crate::context_picker::rules_context_picker::RulesContextPicker;
+use crate::context_picker::thread_context_picker::ThreadContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;
@@ -111,7 +113,7 @@ impl TryFrom<&str> for ContextPickerMode {
            "symbol" => Ok(Self::Symbol),
            "fetch" => Ok(Self::Fetch),
            "thread" => Ok(Self::Thread),
-            "rule" => Ok(Self::Rules),
+            "rules" => Ok(Self::Rules),
            _ => Err(format!("Invalid context picker mode: {}", value)),
        }
    }
@@ -124,7 +126,7 @@ impl ContextPickerMode {
            Self::Symbol => "symbol",
            Self::Fetch => "fetch",
            Self::Thread => "thread",
-            Self::Rules => "rule",
+            Self::Rules => "rules",
        }
    }

@@ -164,7 +166,6 @@ pub(super) struct ContextPicker {
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    prompt_store: Option<Entity<PromptStore>>,
    _subscriptions: Vec<Subscription>,
 }

@@ -192,13 +193,6 @@ impl ContextPicker {
            )
            .collect::<Vec<Subscription>>();

-        let prompt_store = thread_store.as_ref().and_then(|thread_store| {
-            thread_store
-                .read_with(cx, |thread_store, _cx| thread_store.prompt_store().clone())
-                .ok()
-                .flatten()
-        });
-
        ContextPicker {
            mode: ContextPickerState::Default(ContextMenu::build(
                window,
@@ -208,7 +202,6 @@ impl ContextPicker {
            workspace,
            context_store,
            thread_store,
-            prompt_store,
            _subscriptions: subscriptions,
        }
    }
@@ -233,12 +226,7 @@ impl ContextPicker {
                .workspace
                .upgrade()
                .map(|workspace| {
-                    available_context_picker_entries(
-                        &self.prompt_store,
-                        &self.thread_store,
-                        &workspace,
-                        cx,
-                    )
+                    available_context_picker_entries(&self.thread_store, &workspace, cx)
                })
                .unwrap_or_default();

@@ -267,7 +255,7 @@ impl ContextPicker {
                        context_picker.update(cx, |this, cx| this.select_entry(entry, window, cx))
                    })
            }))
-            .keep_open_on_confirm(true)
+            .keep_open_on_confirm()
        });

        cx.subscribe(&menu, move |_, _, _: &DismissEvent, cx| {
@@ -316,10 +304,10 @@ impl ContextPicker {
                    }));
                }
                ContextPickerMode::Rules => {
-                    if let Some(prompt_store) = self.prompt_store.as_ref() {
+                    if let Some(thread_store) = self.thread_store.as_ref() {
                        self.mode = ContextPickerState::Rules(cx.new(|cx| {
                            RulesContextPicker::new(
-                                prompt_store.clone(),
+                                thread_store.clone(),
                                context_picker.clone(),
                                self.context_store.clone(),
                                window,
@@ -388,7 +376,7 @@ impl ContextPicker {
                ContextMenuItem::custom_entry(
                    move |_window, cx| {
                        render_file_context_entry(
-                            ElementId::named_usize("ctx-recent", ix),
+                            ElementId::NamedInteger("ctx-recent".into(), ix),
                            worktree_id,
                            &path,
                            &path_prefix,
@@ -482,13 +470,7 @@ impl ContextPicker {
            return vec![];
        };

-        recent_context_picker_entries(
-            context_store,
-            self.thread_store.clone(),
-            workspace,
-            None,
-            cx,
-        )
+        recent_context_picker_entries(context_store, self.thread_store.clone(), workspace, cx)
    }

    fn notify_current_picker(&mut self, cx: &mut Context<Self>) {
@@ -544,7 +526,6 @@ enum RecentEntry {
 }

 fn available_context_picker_entries(
-    prompt_store: &Option<Entity<PromptStore>>,
    thread_store: &Option<WeakEntity<ThreadStore>>,
    workspace: &Entity<Workspace>,
    cx: &mut App,
@@ -569,9 +550,6 @@ fn available_context_picker_entries(

    if thread_store.is_some() {
        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Thread));
-    }
-
-    if prompt_store.is_some() {
        entries.push(ContextPickerEntry::Mode(ContextPickerMode::Rules));
    }

@@ -584,12 +562,11 @@ fn recent_context_picker_entries(
    context_store: Entity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
    workspace: Entity<Workspace>,
-    exclude_path: Option<ProjectPath>,
    cx: &App,
 ) -> Vec<RecentEntry> {
    let mut recent = Vec::with_capacity(6);
-    let mut current_files = context_store.read(cx).file_paths(cx);
-    current_files.extend(exclude_path);
+
+    let current_files = context_store.read(cx).file_paths(cx);
    let workspace = workspace.read(cx);
    let project = workspace.project().read(cx);

@@ -608,21 +585,22 @@ fn recent_context_picker_entries(
            }),
    );

-    let current_threads = context_store.read(cx).thread_ids();
+    let mut current_threads = context_store.read(cx).thread_ids();

-    let active_thread_id = workspace
+    if let Some(active_thread) = workspace
        .panel::<AssistantPanel>(cx)
-        .map(|panel| panel.read(cx).active_thread(cx).read(cx).id());
+        .map(|panel| panel.read(cx).active_thread(cx))
+    {
+        current_threads.insert(active_thread.read(cx).id().clone());
+    }

    if let Some(thread_store) = thread_store.and_then(|thread_store| thread_store.upgrade()) {
        recent.extend(
            thread_store
                .read(cx)
-                .reverse_chronological_threads()
+                .threads()
                .into_iter()
-                .filter(|thread| {
-                    Some(&thread.id) != active_thread_id && !current_threads.contains(&thread.id)
-                })
+                .filter(|thread| !current_threads.contains(&thread.id))
                .take(2)
                .map(|thread| {
                    RecentEntry::Thread(ThreadContextEntry {
@@ -644,7 +622,9 @@ fn add_selections_as_context(
    let selection_ranges = selection_ranges(workspace, cx);
    context_store.update(cx, |context_store, cx| {
        for (buffer, range) in selection_ranges {
-            context_store.add_selection(buffer, range, cx);
+            context_store
+                .add_selection(buffer, range, cx)
+                .detach_and_log_err(cx);
        }
    })
 }
@@ -682,20 +662,21 @@ fn selection_ranges(
    })
 }

-pub(crate) fn insert_crease_for_mention(
+pub(crate) fn insert_fold_for_mention(
    excerpt_id: ExcerptId,
    crease_start: text::Anchor,
    content_len: usize,
    crease_label: SharedString,
    crease_icon_path: SharedString,
    editor_entity: Entity<Editor>,
-    window: &mut Window,
    cx: &mut App,
-) -> Option<CreaseId> {
+) {
    editor_entity.update(cx, |editor, cx| {
        let snapshot = editor.buffer().read(cx).snapshot(cx);

-        let start = snapshot.anchor_in_excerpt(excerpt_id, crease_start)?;
+        let Some(start) = snapshot.anchor_in_excerpt(excerpt_id, crease_start) else {
+            return;
+        };

        let start = start.bias_right(&snapshot);
        let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
@@ -707,10 +688,10 @@ pub(crate) fn insert_crease_for_mention(
            editor_entity.downgrade(),
        );

-        let ids = editor.insert_creases(vec![crease.clone()], cx);
-        editor.fold_creases(vec![crease], false, window, cx);
-        Some(ids[0])
-    })
+        editor.display_map.update(cx, |display_map, cx| {
+            display_map.fold(vec![crease], cx);
+        });
+    });
 }

 pub fn crease_for_mention(
@@ -720,20 +701,20 @@ pub fn crease_for_mention(
    editor_entity: WeakEntity<Editor>,
 ) -> Crease<Anchor> {
    let placeholder = FoldPlaceholder {
-        render: render_fold_icon_button(icon_path.clone(), label.clone(), editor_entity),
+        render: render_fold_icon_button(icon_path, label, editor_entity),
        merge_adjacent: false,
        ..Default::default()
    };

    let render_trailer = move |_row, _unfold, _window: &mut Window, _cx: &mut App| Empty.into_any();

-    Crease::inline(
+    let crease = Crease::inline(
        range,
        placeholder.clone(),
        fold_toggle("mention"),
        render_trailer,
-    )
-    .with_metadata(CreaseMetadata { icon_path, label })
+    );
+    crease
 }

 fn render_fold_icon_button(
@@ -827,7 +808,7 @@ pub enum MentionLink {
    Selection(ProjectPath, Range<usize>),
    Fetch(String),
    Thread(ThreadId),
-    Rule(UserPromptId),
+    Rules(UserPromptId),
 }

 impl MentionLink {
@@ -836,7 +817,7 @@ impl MentionLink {
    const SELECTION: &str = "@selection";
    const THREAD: &str = "@thread";
    const FETCH: &str = "@fetch";
-    const RULE: &str = "@rule";
+    const RULES: &str = "@rules";

    const SEPARATOR: &str = ":";

@@ -846,7 +827,7 @@ impl MentionLink {
            || url.starts_with(Self::FETCH)
            || url.starts_with(Self::SELECTION)
            || url.starts_with(Self::THREAD)
-            || url.starts_with(Self::RULE)
+            || url.starts_with(Self::RULES)
    }

    pub fn for_file(file_name: &str, full_path: &str) -> String {
@@ -884,8 +865,8 @@ impl MentionLink {
        format!("[@{}]({}:{})", url, Self::FETCH, url)
    }

-    pub fn for_rule(rule: &RulesContextEntry) -> String {
-        format!("[@{}]({}:{})", rule.title, Self::RULE, rule.prompt_id.0)
+    pub fn for_rules(rules: &RulesContextEntry) -> String {
+        format!("[@{}]({}:{})", rules.title, Self::RULES, rules.prompt_id.0)
    }

    pub fn try_parse(link: &str, workspace: &Entity<Workspace>, cx: &App) -> Option<Self> {
@@ -943,9 +924,9 @@ impl MentionLink {
                Some(MentionLink::Thread(thread_id))
            }
            Self::FETCH => Some(MentionLink::Fetch(argument.to_string())),
-            Self::RULE => {
+            Self::RULES => {
                let prompt_id = UserPromptId(Uuid::try_parse(argument).ok()?);
-                Some(MentionLink::Rule(prompt_id))
+                Some(MentionLink::Rules(prompt_id))
            }
            _ => None,
        }
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -15,23 +15,22 @@ use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
 use project::{Completion, CompletionIntent, ProjectPath, Symbol, WorktreeId};
-use prompt_store::PromptStore;
+use prompt_store::PromptId;
 use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
 use ui::prelude::*;
-use util::ResultExt as _;
 use workspace::Workspace;

-use crate::Thread;
-use crate::context::{AgentContextHandle, AgentContextKey, ContextCreasesAddon, RULES_ICON};
+use crate::context::RULES_ICON;
+use crate::context_picker::file_context_picker::search_files;
+use crate::context_picker::symbol_context_picker::search_symbols;
 use crate::context_store::ContextStore;
 use crate::thread_store::ThreadStore;

 use super::fetch_context_picker::fetch_url_content;
-use super::file_context_picker::{FileMatch, search_files};
+use super::file_context_picker::FileMatch;
 use super::rules_context_picker::{RulesContextEntry, search_rules};
 use super::symbol_context_picker::SymbolMatch;
-use super::symbol_context_picker::search_symbols;
 use super::thread_context_picker::{ThreadContextEntry, ThreadMatch, search_threads};
 use super::{
    ContextPickerAction, ContextPickerEntry, ContextPickerMode, MentionLink, RecentEntry,
@@ -39,8 +38,8 @@ use super::{
 };

 pub(crate) enum Match {
-    File(FileMatch),
    Symbol(SymbolMatch),
+    File(FileMatch),
    Thread(ThreadMatch),
    Fetch(SharedString),
    Rules(RulesContextEntry),
@@ -70,7 +69,6 @@ fn search(
    query: String,
    cancellation_flag: Arc<AtomicBool>,
    recent_entries: Vec<RecentEntry>,
-    prompt_store: Option<Entity<PromptStore>>,
    thread_store: Option<WeakEntity<ThreadStore>>,
    workspace: Entity<Workspace>,
    cx: &mut App,
@@ -87,7 +85,6 @@ fn search(
                    .collect()
            })
        }
-
        Some(ContextPickerMode::Symbol) => {
            let search_symbols_task =
                search_symbols(query.clone(), cancellation_flag.clone(), &workspace, cx);
@@ -99,7 +96,6 @@ fn search(
                    .collect()
            })
        }
-
        Some(ContextPickerMode::Thread) => {
            if let Some(thread_store) = thread_store.as_ref().and_then(|t| t.upgrade()) {
                let search_threads_task =
@@ -115,7 +111,6 @@ fn search(
                Task::ready(Vec::new())
            }
        }
-
        Some(ContextPickerMode::Fetch) => {
            if !query.is_empty() {
                Task::ready(vec![Match::Fetch(query.into())])
@@ -123,11 +118,10 @@ fn search(
                Task::ready(Vec::new())
            }
        }
-
        Some(ContextPickerMode::Rules) => {
-            if let Some(prompt_store) = prompt_store.as_ref() {
+            if let Some(thread_store) = thread_store.as_ref().and_then(|t| t.upgrade()) {
                let search_rules_task =
-                    search_rules(query.clone(), cancellation_flag.clone(), prompt_store, cx);
+                    search_rules(query.clone(), cancellation_flag.clone(), thread_store, cx);
                cx.background_spawn(async move {
                    search_rules_task
                        .await
@@ -139,7 +133,6 @@ fn search(
                Task::ready(Vec::new())
            }
        }
-
        None => {
            if query.is_empty() {
                let mut matches = recent_entries
@@ -170,7 +163,7 @@ fn search(
                    .collect::<Vec<_>>();

                matches.extend(
-                    available_context_picker_entries(&prompt_store, &thread_store, &workspace, cx)
+                    available_context_picker_entries(&thread_store, &workspace, cx)
                        .into_iter()
                        .map(|mode| {
                            Match::Entry(EntryMatch {
@@ -187,8 +180,7 @@ fn search(
                let search_files_task =
                    search_files(query.clone(), cancellation_flag.clone(), &workspace, cx);

-                let entries =
-                    available_context_picker_entries(&prompt_store, &thread_store, &workspace, cx);
+                let entries = available_context_picker_entries(&thread_store, &workspace, cx);
                let entry_candidates = entries
                    .iter()
                    .enumerate()
@@ -237,7 +229,6 @@ pub struct ContextPickerCompletionProvider {
    context_store: WeakEntity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
    editor: WeakEntity<Editor>,
-    excluded_buffer: Option<WeakEntity<Buffer>>,
 }

 impl ContextPickerCompletionProvider {
@@ -246,14 +237,12 @@ impl ContextPickerCompletionProvider {
        context_store: WeakEntity<ContextStore>,
        thread_store: Option<WeakEntity<ThreadStore>>,
        editor: WeakEntity<Editor>,
-        exclude_buffer: Option<WeakEntity<Buffer>>,
    ) -> Self {
        Self {
            workspace,
            context_store,
            thread_store,
            editor,
-            excluded_buffer: exclude_buffer,
        }
    }

@@ -315,20 +304,18 @@ impl ContextPickerCompletionProvider {
                            let context_store = context_store.clone();
                            let selections = selections.clone();
                            let selection_infos = selection_infos.clone();
-                            move |_, window: &mut Window, cx: &mut App| {
+                            move |_, _: &mut Window, cx: &mut App| {
                                context_store.update(cx, |context_store, cx| {
                                    for (buffer, range) in &selections {
-                                        context_store.add_selection(
-                                            buffer.clone(),
-                                            range.clone(),
-                                            cx,
-                                        );
+                                        context_store
+                                            .add_selection(buffer.clone(), range.clone(), cx)
+                                            .detach_and_log_err(cx)
                                    }
                                });

                                let editor = editor.clone();
                                let selection_infos = selection_infos.clone();
-                                window.defer(cx, move |window, cx| {
+                                cx.defer(move |cx| {
                                    let mut current_offset = 0;
                                    for (file_name, link, line_range) in selection_infos.iter() {
                                        let snapshot =
@@ -359,8 +346,9 @@ impl ContextPickerCompletionProvider {
                                        );

                                        editor.update(cx, |editor, cx| {
-                                            editor.insert_creases(vec![crease.clone()], cx);
-                                            editor.fold_creases(vec![crease], false, window, cx);
+                                            editor.display_map.update(cx, |display_map, cx| {
+                                                display_map.fold(vec![crease], cx);
+                                            });
                                        });

                                        current_offset += text_len + 1;
@@ -423,26 +411,21 @@ impl ContextPickerCompletionProvider {
                source_range.start,
                new_text_len,
                editor.clone(),
-                context_store.clone(),
                move |cx| {
                    let thread_id = thread_entry.id.clone();
                    let context_store = context_store.clone();
                    let thread_store = thread_store.clone();
-                    cx.spawn::<_, Option<_>>(async move |cx| {
-                        let thread: Entity<Thread> = thread_store
+                    cx.spawn(async move |cx| {
+                        let thread = thread_store
                            .update(cx, |thread_store, cx| {
                                thread_store.open_thread(&thread_id, cx)
-                            })
-                            .ok()?
-                            .await
-                            .log_err()?;
-                        let context = context_store
-                            .update(cx, |context_store, cx| {
-                                context_store.add_thread(thread, false, cx)
-                            })
-                            .ok()??;
-                        Some(context)
+                            })?
+                            .await?;
+                        context_store.update(cx, |context_store, cx| {
+                            context_store.add_thread(thread, false, cx)
+                        })
                    })
+                    .detach_and_log_err(cx);
                },
            )),
        }
@@ -454,8 +437,9 @@ impl ContextPickerCompletionProvider {
        source_range: Range<Anchor>,
        editor: Entity<Editor>,
        context_store: Entity<ContextStore>,
+        thread_store: Entity<ThreadStore>,
    ) -> Completion {
-        let new_text = MentionLink::for_rule(&rules);
+        let new_text = MentionLink::for_rules(&rules);
        let new_text_len = new_text.len();
        Completion {
            replace_range: source_range.clone(),
@@ -472,13 +456,30 @@ impl ContextPickerCompletionProvider {
                source_range.start,
                new_text_len,
                editor.clone(),
-                context_store.clone(),
                move |cx| {
-                    let user_prompt_id = rules.prompt_id;
-                    let context = context_store.update(cx, |context_store, cx| {
-                        context_store.add_rules(user_prompt_id, false, cx)
-                    });
-                    Task::ready(context)
+                    let prompt_uuid = rules.prompt_id;
+                    let prompt_id = PromptId::User { uuid: prompt_uuid };
+                    let context_store = context_store.clone();
+                    let Some(prompt_store) = thread_store.read(cx).prompt_store() else {
+                        log::error!("Can't add user rules as prompt store is missing.");
+                        return;
+                    };
+                    let prompt_store = prompt_store.read(cx);
+                    let Some(metadata) = prompt_store.metadata(prompt_id) else {
+                        return;
+                    };
+                    let Some(title) = metadata.title else {
+                        return;
+                    };
+                    let text_task = prompt_store.load(prompt_id, cx);
+
+                    cx.spawn(async move |cx| {
+                        let text = text_task.await?;
+                        context_store.update(cx, |context_store, cx| {
+                            context_store.add_rules(prompt_uuid, title, text, false, cx)
+                        })
+                    })
+                    .detach_and_log_err(cx);
                },
            )),
        }
@@ -509,33 +510,27 @@ impl ContextPickerCompletionProvider {
                source_range.start,
                new_text_len,
                editor.clone(),
-                context_store.clone(),
                move |cx| {
                    let context_store = context_store.clone();
                    let http_client = http_client.clone();
                    let url_to_fetch = url_to_fetch.clone();
                    cx.spawn(async move |cx| {
-                        if let Some(context) = context_store
-                            .update(cx, |context_store, _| {
-                                context_store.get_url_context(url_to_fetch.clone())
-                            })
-                            .ok()?
-                        {
-                            return Some(context);
+                        if context_store.update(cx, |context_store, _| {
+                            context_store.includes_url(&url_to_fetch).is_some()
+                        })? {
+                            return Ok(());
                        }
                        let content = cx
                            .background_spawn(fetch_url_content(
                                http_client,
                                url_to_fetch.to_string(),
                            ))
-                            .await
-                            .log_err()?;
-                        context_store
-                            .update(cx, |context_store, cx| {
-                                context_store.add_fetched_url(url_to_fetch.to_string(), content, cx)
-                            })
-                            .ok()
+                            .await?;
+                        context_store.update(cx, |context_store, cx| {
+                            context_store.add_fetched_url(url_to_fetch.to_string(), content, cx)
+                        })
                    })
+                    .detach_and_log_err(cx);
                },
            )),
        }
@@ -594,23 +589,15 @@ impl ContextPickerCompletionProvider {
                source_range.start,
                new_text_len,
                editor,
-                context_store.clone(),
                move |cx| {
-                    if is_directory {
-                        Task::ready(
-                            context_store
-                                .update(cx, |context_store, cx| {
-                                    context_store.add_directory(&project_path, false, cx)
-                                })
-                                .log_err()
-                                .flatten(),
-                        )
-                    } else {
-                        let result = context_store.update(cx, |context_store, cx| {
+                    context_store.update(cx, |context_store, cx| {
+                        let task = if is_directory {
+                            context_store.add_directory(project_path.clone(), false, cx)
+                        } else {
                            context_store.add_file_from_path(project_path.clone(), false, cx)
-                        });
-                        cx.spawn(async move |_| result.await.log_err().flatten())
-                    }
+                        };
+                        task.detach_and_log_err(cx);
+                    })
                },
            )),
        }
@@ -665,19 +652,18 @@ impl ContextPickerCompletionProvider {
                source_range.start,
                new_text_len,
                editor.clone(),
-                context_store.clone(),
                move |cx| {
                    let symbol = symbol.clone();
                    let context_store = context_store.clone();
                    let workspace = workspace.clone();
-                    let result = super::symbol_context_picker::add_symbol(
+                    super::symbol_context_picker::add_symbol(
                        symbol.clone(),
                        false,
                        workspace.clone(),
                        context_store.downgrade(),
                        cx,
-                    );
-                    cx.spawn(async move |_| result.await.log_err()?.0)
+                    )
+                    .detach_and_log_err(cx);
                },
            )),
        })
@@ -734,39 +720,23 @@ impl CompletionProvider for ContextPickerCompletionProvider {

        let thread_store = self.thread_store.clone();
        let editor = self.editor.clone();
-        let http_client = workspace.read(cx).client().http_client();
+        let http_client = workspace.read(cx).client().http_client().clone();

        let MentionCompletion { mode, argument, .. } = state;
        let query = argument.unwrap_or_else(|| "".to_string());

-        let excluded_path = self
-            .excluded_buffer
-            .as_ref()
-            .and_then(WeakEntity::upgrade)
-            .and_then(|b| b.read(cx).file())
-            .map(|file| ProjectPath::from_file(file.as_ref(), cx));
-
        let recent_entries = recent_context_picker_entries(
            context_store.clone(),
            thread_store.clone(),
            workspace.clone(),
-            excluded_path.clone(),
            cx,
        );

-        let prompt_store = thread_store.as_ref().and_then(|thread_store| {
-            thread_store
-                .read_with(cx, |thread_store, _cx| thread_store.prompt_store().clone())
-                .ok()
-                .flatten()
-        });
-
        let search_task = search(
            mode,
            query,
            Arc::<AtomicBool>::default(),
            recent_entries,
-            prompt_store,
            thread_store.clone(),
            workspace.clone(),
            cx,
@@ -783,17 +753,11 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                    .into_iter()
                    .filter_map(|mat| match mat {
                        Match::File(FileMatch { mat, is_recent }) => {
-                            let project_path = ProjectPath {
-                                worktree_id: WorktreeId::from_usize(mat.worktree_id),
-                                path: mat.path.clone(),
-                            };
-
-                            if excluded_path.as_ref() == Some(&project_path) {
-                                return None;
-                            }
-
                            Some(Self::completion_for_path(
-                                project_path,
+                                ProjectPath {
+                                    worktree_id: WorktreeId::from_usize(mat.worktree_id),
+                                    path: mat.path.clone(),
+                                },
                                &mat.path_prefix,
                                is_recent,
                                mat.is_dir,
@@ -804,7 +768,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                cx,
                            ))
                        }
-
                        Match::Symbol(SymbolMatch { symbol, .. }) => Self::completion_for_symbol(
                            symbol,
                            excerpt_id,
@@ -814,7 +777,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                            workspace.clone(),
                            cx,
                        ),
-
                        Match::Thread(ThreadMatch {
                            thread, is_recent, ..
                        }) => {
@@ -829,15 +791,17 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                thread_store,
                            ))
                        }
-
-                        Match::Rules(user_rules) => Some(Self::completion_for_rules(
-                            user_rules,
-                            excerpt_id,
-                            source_range.clone(),
-                            editor.clone(),
-                            context_store.clone(),
-                        )),
-
+                        Match::Rules(user_rules) => {
+                            let thread_store = thread_store.as_ref().and_then(|t| t.upgrade())?;
+                            Some(Self::completion_for_rules(
+                                user_rules,
+                                excerpt_id,
+                                source_range.clone(),
+                                editor.clone(),
+                                context_store.clone(),
+                                thread_store,
+                            ))
+                        }
                        Match::Fetch(url) => Some(Self::completion_for_fetch(
                            source_range.clone(),
                            url,
@@ -846,7 +810,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                            context_store.clone(),
                            http_client.clone(),
                        )),
-
                        Match::Entry(EntryMatch { entry, .. }) => Self::completion_for_entry(
                            entry,
                            excerpt_id,
@@ -913,44 +876,24 @@ fn confirm_completion_callback(
    start: Anchor,
    content_len: usize,
    editor: Entity<Editor>,
-    context_store: Entity<ContextStore>,
-    add_context_fn: impl Fn(&mut App) -> Task<Option<AgentContextHandle>> + Send + Sync + 'static,
+    add_context_fn: impl Fn(&mut App) -> () + Send + Sync + 'static,
 ) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
-    Arc::new(move |_, window, cx| {
-        let context = add_context_fn(cx);
+    Arc::new(move |_, _, cx| {
+        add_context_fn(cx);

        let crease_text = crease_text.clone();
        let crease_icon_path = crease_icon_path.clone();
        let editor = editor.clone();
-        let context_store = context_store.clone();
-        window.defer(cx, move |window, cx| {
-            let crease_id = crate::context_picker::insert_crease_for_mention(
+        cx.defer(move |cx| {
+            crate::context_picker::insert_fold_for_mention(
                excerpt_id,
                start,
                content_len,
-                crease_text.clone(),
+                crease_text,
                crease_icon_path,
-                editor.clone(),
-                window,
+                editor,
                cx,
            );
-            cx.spawn(async move |cx| {
-                let crease_id = crease_id?;
-                let context = context.await?;
-                editor
-                    .update(cx, |editor, cx| {
-                        if let Some(addon) = editor.addon_mut::<ContextCreasesAddon>() {
-                            addon.add_creases(
-                                &context_store,
-                                AgentContextKey(context),
-                                [(crease_id, crease_text)],
-                                cx,
-                            );
-                        }
-                    })
-                    .ok()
-            })
-            .detach();
        });
        false
    })
@@ -1105,10 +1048,6 @@ mod tests {
        fn include_in_nav_history() -> bool {
            false
        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
    }

    impl EventEmitter<()> for AtMentionEditor {}
@@ -1155,7 +1094,6 @@ mod tests {
                        "five.txt": "",
                        "six.txt": "",
                        "seven.txt": "",
-                        "eight.txt": "",
                    }
                }),
            )
@@ -1182,12 +1120,9 @@ mod tests {
            separator!("b/five.txt"),
            separator!("b/six.txt"),
            separator!("b/seven.txt"),
-            separator!("b/eight.txt"),
        ];
-
-        let mut opened_editors = Vec::new();
        for path in paths {
-            let buffer = workspace
+            workspace
                .update_in(&mut cx, |workspace, window, cx| {
                    workspace.open_path(
                        ProjectPath {
@@ -1202,7 +1137,6 @@ mod tests {
                })
                .await
                .unwrap();
-            opened_editors.push(buffer);
        }

        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
@@ -1232,23 +1166,12 @@ mod tests {

        let editor_entity = editor.downgrade();
        editor.update_in(&mut cx, |editor, window, cx| {
-            let last_opened_buffer = opened_editors.last().and_then(|editor| {
-                editor
-                    .downcast::<Editor>()?
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .as_singleton()
-                    .as_ref()
-                    .map(Entity::downgrade)
-            });
            window.focus(&editor.focus_handle(cx));
            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
                workspace.downgrade(),
                context_store.downgrade(),
                None,
                editor_entity,
-                last_opened_buffer,
            ))));
        });

--- a/crates/agent/src/context_picker/fetch_context_picker.rs
+++ b/crates/agent/src/context_picker/fetch_context_picker.rs
@@ -193,7 +193,7 @@ impl PickerDelegate for FetchContextPickerDelegate {
            return;
        };

-        let http_client = workspace.read(cx).client().http_client();
+        let http_client = workspace.read(cx).client().http_client().clone();
        let url = self.url.clone();
        cx.spawn_in(window, async move |this, cx| {
            let text = cx
@@ -227,7 +227,7 @@ impl PickerDelegate for FetchContextPickerDelegate {
        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        let added = self.context_store.upgrade().map_or(false, |context_store| {
-            context_store.read(cx).includes_url(&self.url)
+            context_store.read(cx).includes_url(&self.url).is_some()
        });

        Some(
--- a/crates/agent/src/context_picker/file_context_picker.rs
+++ b/crates/agent/src/context_picker/file_context_picker.rs
@@ -130,19 +130,21 @@ impl PickerDelegate for FileContextPickerDelegate {

        let is_directory = mat.is_dir;

-        self.context_store
+        let Some(task) = self
+            .context_store
            .update(cx, |context_store, cx| {
                if is_directory {
-                    context_store
-                        .add_directory(&project_path, true, cx)
-                        .log_err();
+                    context_store.add_directory(project_path, true, cx)
                } else {
-                    context_store
-                        .add_file_from_path(project_path.clone(), true, cx)
-                        .detach_and_log_err(cx);
+                    context_store.add_file_from_path(project_path, true, cx)
                }
            })
-            .ok();
+            .ok()
+        else {
+            return;
+        };
+
+        task.detach_and_log_err(cx);
    }

    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
@@ -167,7 +169,7 @@ impl PickerDelegate for FileContextPickerDelegate {
                .inset(true)
                .toggle_state(selected)
                .child(render_file_context_entry(
-                    ElementId::named_usize("file-ctx-picker", ix),
+                    ElementId::NamedInteger("file-ctx-picker".into(), ix),
                    WorktreeId::from_usize(mat.worktree_id),
                    &mat.path,
                    &mat.path_prefix,
@@ -323,11 +325,11 @@ pub fn render_file_context_entry(
            path: path.clone(),
        };
        if is_directory {
+            context_store.read(cx).includes_directory(&project_path)
+        } else {
            context_store
                .read(cx)
-                .path_included_in_directory(&project_path, cx)
-        } else {
-            context_store.read(cx).file_path_included(&project_path, cx)
+                .will_include_file_path(&project_path, cx)
        }
    });

@@ -355,7 +357,7 @@ pub fn render_file_context_entry(
                })),
        )
        .when_some(added, |el, added| match added {
-            FileInclusion::Direct => el.child(
+            FileInclusion::Direct(_) => el.child(
                h_flex()
                    .w_full()
                    .justify_end()
@@ -367,8 +369,9 @@ pub fn render_file_context_entry(
                    )
                    .child(Label::new("Added").size(LabelSize::Small)),
            ),
-            FileInclusion::InDirectory { full_path } => {
-                let directory_full_path = full_path.to_string_lossy().into_owned();
+            FileInclusion::InDirectory(directory_project_path) => {
+                // TODO: Consider using worktree full_path to include worktree name.
+                let directory_path = directory_project_path.path.to_string_lossy().into_owned();

                el.child(
                    h_flex()
@@ -382,7 +385,7 @@ pub fn render_file_context_entry(
                        )
                        .child(Label::new("Included").size(LabelSize::Small)),
                )
-                .tooltip(Tooltip::text(format!("in {directory_full_path}")))
+                .tooltip(Tooltip::text(format!("in {directory_path}")))
            }
        })
 }
--- a/crates/agent/src/context_picker/rules_context_picker.rs
+++ b/crates/agent/src/context_picker/rules_context_picker.rs
@@ -1,15 +1,16 @@
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

+use anyhow::anyhow;
 use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
 use picker::{Picker, PickerDelegate};
-use prompt_store::{PromptId, PromptStore, UserPromptId};
+use prompt_store::{PromptId, UserPromptId};
 use ui::{ListItem, prelude::*};
-use util::ResultExt as _;

 use crate::context::RULES_ICON;
 use crate::context_picker::ContextPicker;
 use crate::context_store::{self, ContextStore};
+use crate::thread_store::ThreadStore;

 pub struct RulesContextPicker {
    picker: Entity<Picker<RulesContextPickerDelegate>>,
@@ -17,13 +18,13 @@ pub struct RulesContextPicker {

 impl RulesContextPicker {
    pub fn new(
-        prompt_store: Entity<PromptStore>,
+        thread_store: WeakEntity<ThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate = RulesContextPickerDelegate::new(prompt_store, context_picker, context_store);
+        let delegate = RulesContextPickerDelegate::new(thread_store, context_picker, context_store);
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        RulesContextPicker { picker }
@@ -49,7 +50,7 @@ pub struct RulesContextEntry {
 }

 pub struct RulesContextPickerDelegate {
-    prompt_store: Entity<PromptStore>,
+    thread_store: WeakEntity<ThreadStore>,
    context_picker: WeakEntity<ContextPicker>,
    context_store: WeakEntity<context_store::ContextStore>,
    matches: Vec<RulesContextEntry>,
@@ -58,12 +59,12 @@ pub struct RulesContextPickerDelegate {

 impl RulesContextPickerDelegate {
    pub fn new(
-        prompt_store: Entity<PromptStore>,
+        thread_store: WeakEntity<ThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
    ) -> Self {
        RulesContextPickerDelegate {
-            prompt_store,
+            thread_store,
            context_picker,
            context_store,
            matches: Vec::new(),
@@ -102,12 +103,11 @@ impl PickerDelegate for RulesContextPickerDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
-        let search_task = search_rules(
-            query,
-            Arc::new(AtomicBool::default()),
-            &self.prompt_store,
-            cx,
-        );
+        let Some(thread_store) = self.thread_store.upgrade() else {
+            return Task::ready(());
+        };
+
+        let search_task = search_rules(query, Arc::new(AtomicBool::default()), thread_store, cx);
        cx.spawn_in(window, async move |this, cx| {
            let matches = search_task.await;
            this.update(cx, |this, cx| {
@@ -124,11 +124,31 @@ impl PickerDelegate for RulesContextPickerDelegate {
            return;
        };

-        self.context_store
-            .update(cx, |context_store, cx| {
-                context_store.add_rules(entry.prompt_id, true, cx)
+        let Some(thread_store) = self.thread_store.upgrade() else {
+            return;
+        };
+
+        let prompt_id = entry.prompt_id;
+
+        let load_rules_task = thread_store.update(cx, |thread_store, cx| {
+            thread_store.load_rules(prompt_id, cx)
+        });
+
+        cx.spawn(async move |this, cx| {
+            let (metadata, text) = load_rules_task.await?;
+            let Some(title) = metadata.title else {
+                return Err(anyhow!("Encountered user rule with no title when attempting to add it to agent context."));
+            };
+            this.update(cx, |this, cx| {
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        context_store.add_rules(prompt_id, title, text, true, cx)
+                    })
+                    .ok();
            })
-            .log_err();
+        })
+        .detach_and_log_err(cx);
    }

    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
@@ -159,10 +179,11 @@ pub fn render_thread_context_entry(
    context_store: WeakEntity<ContextStore>,
    cx: &mut App,
 ) -> Div {
-    let added = context_store.upgrade().map_or(false, |context_store| {
-        context_store
+    let added = context_store.upgrade().map_or(false, |ctx_store| {
+        ctx_store
            .read(cx)
-            .includes_user_rules(user_rules.prompt_id)
+            .includes_user_rules(&user_rules.prompt_id)
+            .is_some()
    });

    h_flex()
@@ -197,9 +218,12 @@ pub fn render_thread_context_entry(
 pub(crate) fn search_rules(
    query: String,
    cancellation_flag: Arc<AtomicBool>,
-    prompt_store: &Entity<PromptStore>,
+    thread_store: Entity<ThreadStore>,
    cx: &mut App,
 ) -> Task<Vec<RulesContextEntry>> {
+    let Some(prompt_store) = thread_store.read(cx).prompt_store() else {
+        return Task::ready(vec![]);
+    };
    let search_task = prompt_store.read(cx).search(query, cancellation_flag, cx);
    cx.background_spawn(async move {
        search_task
--- a/crates/agent/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent/src/context_picker/symbol_context_picker.rs
@@ -10,11 +10,11 @@ use gpui::{
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
 use project::{DocumentSymbol, Symbol};
+use text::OffsetRangeExt;
 use ui::{ListItem, prelude::*};
 use util::ResultExt as _;
 use workspace::Workspace;

-use crate::context::AgentContextHandle;
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;

@@ -144,7 +144,7 @@ impl PickerDelegate for SymbolContextPickerDelegate {

        let selected_index = self.selected_index;
        cx.spawn(async move |this, cx| {
-            let (_, included) = add_symbol_task.await?;
+            let included = add_symbol_task.await?;
            this.update(cx, |this, _| {
                if let Some(mat) = this.delegate.matches.get_mut(selected_index) {
                    mat.is_included = included;
@@ -172,7 +172,10 @@ impl PickerDelegate for SymbolContextPickerDelegate {
        let mat = &self.matches[ix];

        Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
-            render_symbol_context_entry(ElementId::named_usize("symbol-ctx-picker", ix), mat),
+            render_symbol_context_entry(
+                ElementId::NamedInteger("symbol-ctx-picker".into(), ix),
+                mat,
+            ),
        ))
    }
 }
@@ -188,7 +191,7 @@ pub(crate) fn add_symbol(
    workspace: Entity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    cx: &mut App,
-) -> Task<Result<(Option<AgentContextHandle>, bool)>> {
+) -> Task<Result<bool>> {
    let project = workspace.read(cx).project().clone();
    let open_buffer_task = project.update(cx, |project, cx| {
        project.open_buffer(symbol.path.clone(), cx)
@@ -225,16 +228,18 @@ pub(crate) fn add_symbol(
            )
        })?;

-        context_store.update(cx, move |context_store, cx| {
-            context_store.add_symbol(
-                buffer,
-                name.into(),
-                range,
-                enclosing_range,
-                remove_if_exists,
-                cx,
-            )
-        })
+        context_store
+            .update(cx, move |context_store, cx| {
+                context_store.add_symbol(
+                    buffer,
+                    name.into(),
+                    range,
+                    enclosing_range,
+                    remove_if_exists,
+                    cx,
+                )
+            })?
+            .await
    })
 }

@@ -348,13 +353,38 @@ fn compute_symbol_entries(
    context_store: &ContextStore,
    cx: &App,
 ) -> Vec<SymbolEntry> {
-    symbols
-        .into_iter()
-        .map(|SymbolMatch { symbol, .. }| SymbolEntry {
-            is_included: context_store.includes_symbol(&symbol, cx),
+    let mut symbol_entries = Vec::with_capacity(symbols.len());
+    for SymbolMatch { symbol, .. } in symbols {
+        let symbols_for_path = context_store.included_symbols_by_path().get(&symbol.path);
+        let is_included = if let Some(symbols_for_path) = symbols_for_path {
+            let mut is_included = false;
+            for included_symbol_id in symbols_for_path {
+                if included_symbol_id.name.as_ref() == symbol.name.as_str() {
+                    if let Some(buffer) = context_store.buffer_for_symbol(included_symbol_id) {
+                        let snapshot = buffer.read(cx).snapshot();
+                        let included_symbol_range =
+                            included_symbol_id.range.to_point_utf16(&snapshot);
+
+                        if included_symbol_range.start == symbol.range.start.0
+                            && included_symbol_range.end == symbol.range.end.0
+                        {
+                            is_included = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            is_included
+        } else {
+            false
+        };
+
+        symbol_entries.push(SymbolEntry {
            symbol,
+            is_included,
        })
-        .collect::<Vec<_>>()
+    }
+    symbol_entries
 }

 pub fn render_symbol_context_entry(id: ElementId, entry: &SymbolEntry) -> Stateful<Div> {
--- a/crates/agent/src/context_picker/thread_context_picker.rs
+++ b/crates/agent/src/context_picker/thread_context_picker.rs
@@ -173,7 +173,7 @@ pub fn render_thread_context_entry(
    cx: &mut App,
 ) -> Div {
    let added = context_store.upgrade().map_or(false, |ctx_store| {
-        ctx_store.read(cx).includes_thread(&thread.id)
+        ctx_store.read(cx).includes_thread(&thread.id).is_some()
    });

    h_flex()
@@ -219,7 +219,7 @@ pub(crate) fn search_threads(
 ) -> Task<Vec<ThreadMatch>> {
    let threads = thread_store
        .read(cx)
-        .reverse_chronological_threads()
+        .threads()
        .into_iter()
        .map(|thread| ThreadContextEntry {
            id: thread.id,
--- a/crates/agent/src/context_server_configuration.rs
+++ b/crates/agent/src/context_server_configuration.rs
@@ -1,120 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Context as _;
-use context_server::ContextServerDescriptorRegistry;
-use extension::ExtensionManifest;
-use language::LanguageRegistry;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::Workspace;
-
-use crate::{AssistantPanel, assistant_configuration::ConfigureContextServerModal};
-
-pub(crate) fn init(language_registry: Arc<LanguageRegistry>, cx: &mut App) {
-    cx.observe_new(move |_: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-
-        if let Some(extension_events) = extension::ExtensionEvents::try_global(cx).as_ref() {
-            cx.subscribe_in(extension_events, window, {
-                let language_registry = language_registry.clone();
-                move |workspace, _, event, window, cx| match event {
-                    extension::Event::ExtensionInstalled(manifest) => {
-                        show_configure_mcp_modal(
-                            language_registry.clone(),
-                            manifest,
-                            workspace,
-                            window,
-                            cx,
-                        );
-                    }
-                    extension::Event::ConfigureExtensionRequested(manifest) => {
-                        if !manifest.context_servers.is_empty() {
-                            show_configure_mcp_modal(
-                                language_registry.clone(),
-                                manifest,
-                                workspace,
-                                window,
-                                cx,
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-            })
-            .detach();
-        } else {
-            log::info!(
-                "No extension events global found. Skipping context server configuration wizard"
-            );
-        }
-    })
-    .detach();
-}
-
-fn show_configure_mcp_modal(
-    language_registry: Arc<LanguageRegistry>,
-    manifest: &Arc<ExtensionManifest>,
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<'_, Workspace>,
-) {
-    let Some(context_server_manager) = workspace.panel::<AssistantPanel>(cx).map(|panel| {
-        panel
-            .read(cx)
-            .thread_store()
-            .read(cx)
-            .context_server_manager()
-    }) else {
-        return;
-    };
-
-    let registry = ContextServerDescriptorRegistry::global(cx).read(cx);
-    let project = workspace.project().clone();
-    let configuration_tasks = manifest
-        .context_servers
-        .keys()
-        .cloned()
-        .filter_map({
-            |key| {
-                let descriptor = registry.context_server_descriptor(&key)?;
-                Some(cx.spawn({
-                    let project = project.clone();
-                    async move |_, cx| {
-                        descriptor
-                            .configuration(project, &cx)
-                            .await
-                            .context("Failed to resolve context server configuration")
-                            .log_err()
-                            .flatten()
-                            .map(|config| (key, config))
-                    }
-                }))
-            }
-        })
-        .collect::<Vec<_>>();
-
-    let jsonc_language = language_registry.language_for_name("jsonc");
-
-    cx.spawn_in(window, async move |this, cx| {
-        let descriptors = futures::future::join_all(configuration_tasks).await;
-        let jsonc_language = jsonc_language.await.ok();
-
-        this.update_in(cx, |this, window, cx| {
-            let modal = ConfigureContextServerModal::new(
-                descriptors.into_iter().flatten(),
-                jsonc_language,
-                context_server_manager,
-                language_registry,
-                cx.entity().downgrade(),
-                window,
-                cx,
-            );
-            if let Some(modal) = modal {
-                this.toggle_modal(window, cx, |_, _| modal);
-            }
-        })
-    })
-    .detach();
-}
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -11,10 +11,10 @@ use gpui::{
 use itertools::Itertools;
 use language::Buffer;
 use project::ProjectItem;
-use ui::{PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
-use workspace::Workspace;
+use ui::{KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
+use workspace::{Workspace, notifications::NotifyResultExt};

-use crate::context::{AgentContextHandle, ContextKind};
+use crate::context::{ContextId, ContextKind};
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread::Thread;
@@ -32,7 +32,6 @@ pub struct ContextStrip {
    focus_handle: FocusHandle,
    suggest_context_kind: SuggestContextKind,
    workspace: WeakEntity<Workspace>,
-    thread_store: Option<WeakEntity<ThreadStore>>,
    _subscriptions: Vec<Subscription>,
    focused_index: Option<usize>,
    children_bounds: Option<Vec<Bounds<Pixels>>>,
@@ -74,33 +73,12 @@ impl ContextStrip {
            focus_handle,
            suggest_context_kind,
            workspace,
-            thread_store,
            _subscriptions: subscriptions,
            focused_index: None,
            children_bounds: None,
        }
    }

-    fn added_contexts(&self, cx: &App) -> Vec<AddedContext> {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let project = workspace.read(cx).project().read(cx);
-            let prompt_store = self
-                .thread_store
-                .as_ref()
-                .and_then(|thread_store| thread_store.upgrade())
-                .and_then(|thread_store| thread_store.read(cx).prompt_store().as_ref());
-            self.context_store
-                .read(cx)
-                .context()
-                .flat_map(|context| {
-                    AddedContext::new_pending(context.clone(), prompt_store, project, cx)
-                })
-                .collect::<Vec<_>>()
-        } else {
-            Vec::new()
-        }
-    }
-
    fn suggested_context(&self, cx: &Context<Self>) -> Option<SuggestedContext> {
        match self.suggest_context_kind {
            SuggestContextKind::File => self.suggested_file(cx),
@@ -115,19 +93,22 @@ impl ContextStrip {
        let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
        let active_buffer_entity = editor.buffer().read(cx).as_singleton()?;
        let active_buffer = active_buffer_entity.read(cx);
+
        let project_path = active_buffer.project_path(cx)?;

        if self
            .context_store
            .read(cx)
-            .file_path_included(&project_path, cx)
+            .will_include_buffer(active_buffer.remote_id(), &project_path)
            .is_some()
        {
            return None;
        }

        let file_name = active_buffer.file()?.file_name(cx);
+
        let icon_path = FileIcons::get_icon(&Path::new(&file_name), cx);
+
        Some(SuggestedContext::File {
            name: file_name.to_string_lossy().into_owned().into(),
            buffer: active_buffer_entity.downgrade(),
@@ -154,6 +135,7 @@ impl ContextStrip {
            .context_store
            .read(cx)
            .includes_thread(active_thread.id())
+            .is_some()
        {
            return None;
        }
@@ -290,12 +272,12 @@ impl ContextStrip {
        best.map(|(index, _, _)| index)
    }

-    fn open_context(&mut self, context: &AgentContextHandle, window: &mut Window, cx: &mut App) {
+    fn open_context(&mut self, id: ContextId, window: &mut Window, cx: &mut App) {
        let Some(workspace) = self.workspace.upgrade() else {
            return;
        };

-        crate::active_thread::open_context(context, workspace, window, cx);
+        crate::active_thread::open_context(id, self.context_store.clone(), workspace, window, cx);
    }

    fn remove_focused_context(
@@ -305,17 +287,17 @@ impl ContextStrip {
        cx: &mut Context<Self>,
    ) {
        if let Some(index) = self.focused_index {
-            let added_contexts = self.added_contexts(cx);
-            let Some(context) = added_contexts.get(index) else {
-                return;
-            };
+            let mut is_empty = false;

            self.context_store.update(cx, |this, cx| {
-                this.remove_context(&context.handle, cx);
+                if let Some(item) = this.context().get(index) {
+                    this.remove_context(item.id(), cx);
+                }
+
+                is_empty = this.context().is_empty();
            });

-            let is_now_empty = added_contexts.len() == 1;
-            if is_now_empty {
+            if is_empty {
                cx.emit(ContextStripEvent::BlurredEmpty);
            } else {
                self.focused_index = Some(index.saturating_sub(1));
@@ -324,28 +306,49 @@ impl ContextStrip {
        }
    }

-    fn is_suggested_focused(&self, added_contexts: &Vec<AddedContext>) -> bool {
+    fn is_suggested_focused<T>(&self, context: &Vec<T>) -> bool {
        // We only suggest one item after the actual context
-        self.focused_index == Some(added_contexts.len())
+        self.focused_index == Some(context.len())
    }

    fn accept_suggested_context(
        &mut self,
        _: &AcceptSuggestedContext,
-        _window: &mut Window,
+        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        if let Some(suggested) = self.suggested_context(cx) {
-            if self.is_suggested_focused(&self.added_contexts(cx)) {
-                self.add_suggested_context(&suggested, cx);
+            let context_store = self.context_store.read(cx);
+
+            if self.is_suggested_focused(context_store.context()) {
+                self.add_suggested_context(&suggested, window, cx);
            }
        }
    }

-    fn add_suggested_context(&mut self, suggested: &SuggestedContext, cx: &mut Context<Self>) {
-        self.context_store.update(cx, |context_store, cx| {
-            context_store.add_suggested_context(&suggested, cx)
+    fn add_suggested_context(
+        &mut self,
+        suggested: &SuggestedContext,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let task = self.context_store.update(cx, |context_store, cx| {
+            context_store.accept_suggested_context(&suggested, cx)
        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            match task.await.notify_async_err(cx) {
+                None => {}
+                Some(()) => {
+                    if let Some(this) = this.upgrade() {
+                        this.update(cx, |_, cx| cx.notify())?;
+                    }
+                }
+            }
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);
+
        cx.notify();
    }
 }
@@ -357,11 +360,18 @@ impl Focusable for ContextStrip {
 }

 impl Render for ContextStrip {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let context_store = self.context_store.read(cx);
+        let context = context_store.context();
        let context_picker = self.context_picker.clone();
        let focus_handle = self.focus_handle.clone();

-        let added_contexts = self.added_contexts(cx);
+        let suggested_context = self.suggested_context(cx);
+
+        let added_contexts = context
+            .iter()
+            .map(|c| AddedContext::new(c, cx))
+            .collect::<Vec<_>>();
        let dupe_names = added_contexts
            .iter()
            .map(|c| c.name.clone())
@@ -370,14 +380,6 @@ impl Render for ContextStrip {
            .filter(|(a, b)| a == b)
            .map(|(a, _)| a)
            .collect::<HashSet<SharedString>>();
-        let no_added_context = added_contexts.is_empty();
-
-        let suggested_context = self.suggested_context(cx).map(|suggested_context| {
-            (
-                suggested_context,
-                self.is_suggested_focused(&added_contexts),
-            )
-        });

        h_flex()
            .flex_wrap()
@@ -434,23 +436,46 @@ impl Render for ContextStrip {
                    })
                    .with_handle(self.context_picker_menu_handle.clone()),
            )
+            .when(context.is_empty() && suggested_context.is_none(), {
+                |parent| {
+                    parent.child(
+                        h_flex()
+                            .ml_1p5()
+                            .gap_2()
+                            .child(
+                                Label::new("Add Context")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Muted),
+                            )
+                            .opacity(0.5)
+                            .children(
+                                KeyBinding::for_action_in(
+                                    &ToggleContextPicker,
+                                    &focus_handle,
+                                    window,
+                                    cx,
+                                )
+                                .map(|binding| binding.into_any_element()),
+                            ),
+                    )
+                }
+            })
            .children(
                added_contexts
                    .into_iter()
                    .enumerate()
                    .map(|(i, added_context)| {
                        let name = added_context.name.clone();
-                        let context = added_context.handle.clone();
+                        let id = added_context.id;
                        ContextPill::added(
                            added_context,
                            dupe_names.contains(&name),
                            self.focused_index == Some(i),
                            Some({
-                                let context = context.clone();
                                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(&context, cx);
+                                        this.remove_context(id, cx);
                                    });
                                    cx.notify();
                                }))
@@ -459,7 +484,7 @@ impl Render for ContextStrip {
                        .on_click({
                            Rc::new(cx.listener(move |this, event: &ClickEvent, window, cx| {
                                if event.down.click_count > 1 {
-                                    this.open_context(&context, window, cx);
+                                    this.open_context(id, window, cx);
                                } else {
                                    this.focused_index = Some(i);
                                }
@@ -468,22 +493,22 @@ impl Render for ContextStrip {
                        })
                    }),
            )
-            .when_some(suggested_context, |el, (suggested, focused)| {
+            .when_some(suggested_context, |el, suggested| {
                el.child(
                    ContextPill::suggested(
                        suggested.name().clone(),
                        suggested.icon_path(),
                        suggested.kind(),
-                        focused,
+                        self.is_suggested_focused(&context),
                    )
                    .on_click(Rc::new(cx.listener(
-                        move |this, _event, _window, cx| {
-                            this.add_suggested_context(&suggested, cx);
+                        move |this, _event, window, cx| {
+                            this.add_suggested_context(&suggested, window, cx);
                        },
                    ))),
                )
            })
-            .when(!no_added_context, {
+            .when(!context.is_empty(), {
                move |parent| {
                    parent.child(
                        IconButton::new("remove-all-context", IconName::Eraser)
@@ -509,7 +534,6 @@ impl Render for ContextStrip {
                    )
                }
            })
-            .into_any()
    }
 }

--- a/crates/agent/src/debug.rs
+++ b/crates/agent/src/debug.rs
@@ -1,124 +0,0 @@
-#![allow(unused, dead_code)]
-
-use gpui::Global;
-use language_model::RequestUsage;
-use std::ops::{Deref, DerefMut};
-use ui::prelude::*;
-use zed_llm_client::{Plan, UsageLimit};
-
-/// Debug only: Used for testing various account states
-///
-/// Use this by initializing it with
-/// `cx.set_global(DebugAccountState::default());` somewhere
-///
-/// Then call `cx.debug_account()` to get access
-#[derive(Clone, Debug)]
-pub struct DebugAccountState {
-    pub enabled: bool,
-    pub trial_expired: bool,
-    pub plan: Plan,
-    pub custom_prompt_usage: RequestUsage,
-    pub usage_based_billing_enabled: bool,
-    pub monthly_spending_cap: i32,
-    pub custom_edit_prediction_usage: UsageLimit,
-}
-
-impl DebugAccountState {
-    pub fn enabled(&self) -> bool {
-        self.enabled
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) -> &mut Self {
-        self.enabled = enabled;
-        self
-    }
-
-    pub fn set_trial_expired(&mut self, trial_expired: bool) -> &mut Self {
-        self.trial_expired = trial_expired;
-        self
-    }
-
-    pub fn set_plan(&mut self, plan: Plan) -> &mut Self {
-        self.plan = plan;
-        self
-    }
-
-    pub fn set_custom_prompt_usage(&mut self, custom_prompt_usage: RequestUsage) -> &mut Self {
-        self.custom_prompt_usage = custom_prompt_usage;
-        self
-    }
-
-    pub fn set_usage_based_billing_enabled(
-        &mut self,
-        usage_based_billing_enabled: bool,
-    ) -> &mut Self {
-        self.usage_based_billing_enabled = usage_based_billing_enabled;
-        self
-    }
-
-    pub fn set_monthly_spending_cap(&mut self, monthly_spending_cap: i32) -> &mut Self {
-        self.monthly_spending_cap = monthly_spending_cap;
-        self
-    }
-
-    pub fn set_custom_edit_prediction_usage(
-        &mut self,
-        custom_edit_prediction_usage: UsageLimit,
-    ) -> &mut Self {
-        self.custom_edit_prediction_usage = custom_edit_prediction_usage;
-        self
-    }
-}
-
-impl Default for DebugAccountState {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            trial_expired: false,
-            plan: Plan::Free,
-            custom_prompt_usage: RequestUsage {
-                limit: UsageLimit::Unlimited,
-                amount: 0,
-            },
-            usage_based_billing_enabled: false,
-            // $50.00
-            monthly_spending_cap: 5000,
-            custom_edit_prediction_usage: UsageLimit::Unlimited,
-        }
-    }
-}
-
-impl DebugAccountState {
-    pub fn get_global(cx: &App) -> &Self {
-        &cx.global::<GlobalDebugAccountState>().0
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct GlobalDebugAccountState(pub DebugAccountState);
-
-impl Global for GlobalDebugAccountState {}
-
-impl Deref for GlobalDebugAccountState {
-    type Target = DebugAccountState;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for GlobalDebugAccountState {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-pub trait DebugAccount {
-    fn debug_account(&self) -> &DebugAccountState;
-}
-
-impl DebugAccount for App {
-    fn debug_account(&self) -> &DebugAccountState {
-        &self.global::<GlobalDebugAccountState>().0
-    }
-}
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -1,27 +1,10 @@
-use std::{collections::VecDeque, path::Path};
-
-use anyhow::{Context as _, anyhow};
-use assistant_context_editor::{AssistantContext, SavedContextMetadata};
+use assistant_context_editor::SavedContextMetadata;
 use chrono::{DateTime, Utc};
-use futures::future::{TryFutureExt as _, join_all};
-use gpui::{Entity, Task, prelude::*};
-use serde::{Deserialize, Serialize};
-use smol::future::FutureExt;
-use std::time::Duration;
-use ui::{App, SharedString};
-use util::ResultExt as _;
+use gpui::{Entity, prelude::*};

-use crate::{
-    Thread,
-    thread::ThreadId,
-    thread_store::{SerializedThreadMetadata, ThreadStore},
-};
+use crate::thread_store::{SerializedThreadMetadata, ThreadStore};

-const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
-const NAVIGATION_HISTORY_PATH: &str = "agent-navigation-history.json";
-const SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE: Duration = Duration::from_millis(50);
-
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub enum HistoryEntry {
    Thread(SerializedThreadMetadata),
    Context(SavedContextMetadata),
@@ -36,52 +19,16 @@ impl HistoryEntry {
    }
 }

-#[derive(Clone, Debug)]
-pub(crate) enum RecentEntry {
-    Thread(ThreadId, Entity<Thread>),
-    Context(Entity<AssistantContext>),
-}
-
-impl PartialEq for RecentEntry {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Thread(l0, _), Self::Thread(r0, _)) => l0 == r0,
-            (Self::Context(l0), Self::Context(r0)) => l0 == r0,
-            _ => false,
-        }
-    }
-}
-
-impl Eq for RecentEntry {}
-
-impl RecentEntry {
-    pub(crate) fn summary(&self, cx: &App) -> SharedString {
-        match self {
-            RecentEntry::Thread(_, thread) => thread.read(cx).summary_or_default(),
-            RecentEntry::Context(context) => context.read(cx).summary_or_default(),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-enum SerializedRecentEntry {
-    Thread(String),
-    Context(String),
-}
-
 pub struct HistoryStore {
    thread_store: Entity<ThreadStore>,
    context_store: Entity<assistant_context_editor::ContextStore>,
-    recently_opened_entries: VecDeque<RecentEntry>,
    _subscriptions: Vec<gpui::Subscription>,
-    _save_recently_opened_entries_task: Task<()>,
 }

 impl HistoryStore {
    pub fn new(
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
-        initial_recent_entries: impl IntoIterator<Item = RecentEntry>,
        cx: &mut Context<Self>,
    ) -> Self {
        let subscriptions = vec![
@@ -89,62 +36,10 @@ impl HistoryStore {
            cx.observe(&context_store, |_, _, cx| cx.notify()),
        ];

-        cx.spawn({
-            let thread_store = thread_store.downgrade();
-            let context_store = context_store.downgrade();
-            async move |this, cx| {
-                let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
-                let contents = cx
-                    .background_spawn(async move { std::fs::read_to_string(path) })
-                    .await
-                    .context("reading persisted agent panel navigation history")?;
-                let entries = serde_json::from_str::<Vec<SerializedRecentEntry>>(&contents)
-                    .context("deserializing persisted agent panel navigation history")?
-                    .into_iter()
-                    .take(MAX_RECENTLY_OPENED_ENTRIES)
-                    .map(|serialized| match serialized {
-                        SerializedRecentEntry::Thread(id) => thread_store
-                            .update(cx, |thread_store, cx| {
-                                let thread_id = ThreadId::from(id.as_str());
-                                thread_store
-                                    .open_thread(&thread_id, cx)
-                                    .map_ok(|thread| RecentEntry::Thread(thread_id, thread))
-                                    .boxed()
-                            })
-                            .unwrap_or_else(|_| async { Err(anyhow!("no thread store")) }.boxed()),
-                        SerializedRecentEntry::Context(id) => context_store
-                            .update(cx, |context_store, cx| {
-                                context_store
-                                    .open_local_context(Path::new(&id).into(), cx)
-                                    .map_ok(RecentEntry::Context)
-                                    .boxed()
-                            })
-                            .unwrap_or_else(|_| async { Err(anyhow!("no context store")) }.boxed()),
-                    });
-                let entries = join_all(entries)
-                    .await
-                    .into_iter()
-                    .filter_map(|result| result.log_err())
-                    .collect::<VecDeque<_>>();
-
-                this.update(cx, |this, _| {
-                    this.recently_opened_entries.extend(entries);
-                    this.recently_opened_entries
-                        .truncate(MAX_RECENTLY_OPENED_ENTRIES);
-                })
-                .ok();
-
-                anyhow::Ok(())
-            }
-        })
-        .detach_and_log_err(cx);
-
        Self {
            thread_store,
            context_store,
-            recently_opened_entries: initial_recent_entries.into_iter().collect(),
            _subscriptions: subscriptions,
-            _save_recently_opened_entries_task: Task::ready(()),
        }
    }

@@ -156,10 +51,7 @@ impl HistoryStore {
            return history_entries;
        }

-        for thread in self
-            .thread_store
-            .update(cx, |this, _cx| this.reverse_chronological_threads())
-        {
+        for thread in self.thread_store.update(cx, |this, _cx| this.threads()) {
            history_entries.push(HistoryEntry::Thread(thread));
        }

@@ -174,63 +66,4 @@ impl HistoryStore {
    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
        self.entries(cx).into_iter().take(limit).collect()
    }
-
-    fn save_recently_opened_entries(&mut self, cx: &mut Context<Self>) {
-        let serialized_entries = self
-            .recently_opened_entries
-            .iter()
-            .filter_map(|entry| match entry {
-                RecentEntry::Context(context) => Some(SerializedRecentEntry::Context(
-                    context.read(cx).path()?.to_str()?.to_owned(),
-                )),
-                RecentEntry::Thread(id, _) => Some(SerializedRecentEntry::Thread(id.to_string())),
-            })
-            .collect::<Vec<_>>();
-
-        self._save_recently_opened_entries_task = cx.spawn(async move |_, cx| {
-            cx.background_executor()
-                .timer(SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE)
-                .await;
-            cx.background_spawn(async move {
-                let path = paths::data_dir().join(NAVIGATION_HISTORY_PATH);
-                let content = serde_json::to_string(&serialized_entries)?;
-                std::fs::write(path, content)?;
-                anyhow::Ok(())
-            })
-            .await
-            .log_err();
-        });
-    }
-
-    pub fn push_recently_opened_entry(&mut self, entry: RecentEntry, cx: &mut Context<Self>) {
-        self.recently_opened_entries
-            .retain(|old_entry| old_entry != &entry);
-        self.recently_opened_entries.push_front(entry);
-        self.recently_opened_entries
-            .truncate(MAX_RECENTLY_OPENED_ENTRIES);
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn remove_recently_opened_thread(&mut self, id: ThreadId, cx: &mut Context<Self>) {
-        self.recently_opened_entries.retain(|entry| match entry {
-            RecentEntry::Thread(thread_id, _) if thread_id == &id => false,
-            _ => true,
-        });
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn remove_recently_opened_entry(&mut self, entry: &RecentEntry, cx: &mut Context<Self>) {
-        self.recently_opened_entries
-            .retain(|old_entry| old_entry != entry);
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn recently_opened_entries(&self, _cx: &mut Context<Self>) -> VecDeque<RecentEntry> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return VecDeque::new();
-        }
-
-        self.recently_opened_entries.clone()
-    }
 }
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -32,7 +32,6 @@ use project::LspAction;
 use project::Project;
 use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
-use prompt_store::PromptStore;
 use settings::{Settings, SettingsStore};
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
@@ -246,13 +245,9 @@ impl InlineAssistant {
                .map_or(false, |model| model.provider.is_authenticated(cx))
        };

-        let assistant_panel = workspace
+        let thread_store = workspace
            .panel::<AssistantPanel>(cx)
-            .map(|assistant_panel| assistant_panel.read(cx));
-        let prompt_store = assistant_panel
-            .and_then(|assistant_panel| assistant_panel.prompt_store().as_ref().cloned());
-        let thread_store =
-            assistant_panel.map(|assistant_panel| assistant_panel.thread_store().downgrade());
+            .map(|assistant_panel| assistant_panel.read(cx).thread_store().downgrade());

        let handle_assist =
            |window: &mut Window, cx: &mut Context<Workspace>| match inline_assist_target {
@@ -262,7 +257,6 @@ impl InlineAssistant {
                            &active_editor,
                            cx.entity().downgrade(),
                            workspace.project().downgrade(),
-                            prompt_store,
                            thread_store,
                            window,
                            cx,
@@ -275,7 +269,6 @@ impl InlineAssistant {
                            &active_terminal,
                            cx.entity().downgrade(),
                            workspace.project().downgrade(),
-                            prompt_store,
                            thread_store,
                            window,
                            cx,
@@ -330,7 +323,6 @@ impl InlineAssistant {
        editor: &Entity<Editor>,
        workspace: WeakEntity<Workspace>,
        project: WeakEntity<Project>,
-        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
        window: &mut Window,
        cx: &mut App,
@@ -445,8 +437,6 @@ impl InlineAssistant {
                    range.clone(),
                    None,
                    context_store.clone(),
-                    project.clone(),
-                    prompt_store.clone(),
                    self.telemetry.clone(),
                    self.prompt_builder.clone(),
                    cx,
@@ -535,7 +525,6 @@ impl InlineAssistant {
        initial_transaction_id: Option<TransactionId>,
        focus: bool,
        workspace: Entity<Workspace>,
-        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
        window: &mut Window,
        cx: &mut App,
@@ -554,7 +543,7 @@ impl InlineAssistant {
        }

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

        let codegen = cx.new(|cx| {
            BufferCodegen::new(
@@ -562,8 +551,6 @@ impl InlineAssistant {
                range.clone(),
                initial_transaction_id,
                context_store.clone(),
-                project,
-                prompt_store,
                self.telemetry.clone(),
                self.prompt_builder.clone(),
                cx,
@@ -1199,7 +1186,6 @@ impl InlineAssistant {
    ) -> Vec<InlineAssistId> {
        let assist_group = self.assist_groups.get_mut(&assist_group_id).unwrap();
        assist_group.linked = false;
-
        for assist_id in &assist_group.assist_ids {
            let assist = self.assists.get_mut(assist_id).unwrap();
            if let Some(editor_decorations) = assist.decorations.as_ref() {
@@ -1803,7 +1789,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
        let editor = self.editor.clone();
        let workspace = self.workspace.clone();
        let thread_store = self.thread_store.clone();
-        let prompt_store = PromptStore::global(cx);
        window.spawn(cx, async move |cx| {
            let workspace = workspace.upgrade().context("workspace was released")?;
            let editor = editor.upgrade().context("editor was released")?;
@@ -1844,7 +1829,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
                })?
                .context("invalid range")?;

-            let prompt_store = prompt_store.await.ok();
            cx.update_global(|assistant: &mut InlineAssistant, window, cx| {
                let assist_id = assistant.suggest_assist(
                    &editor,
@@ -1853,7 +1837,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
                    None,
                    true,
                    workspace,
-                    prompt_store,
                    thread_store,
                    window,
                    cx,
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -1,10 +1,8 @@
-use crate::assistant_model_selector::{AssistantModelSelector, ModelType};
+use crate::assistant_model_selector::AssistantModelSelector;
 use crate::buffer_codegen::BufferCodegen;
-use crate::context::ContextCreasesAddon;
-use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
+use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::ThreadStore;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
@@ -12,18 +10,17 @@ use crate::{RemoveAllContext, ToggleContextPicker};
 use client::ErrorExt;
 use collections::VecDeque;
 use editor::{
-    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle,
-    GutterDimensions, MultiBuffer,
+    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, GutterDimensions, MultiBuffer,
    actions::{MoveDown, MoveUp},
 };
-use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
+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,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use language_model_selector::ToggleModelSelector;
+use language_model_selector::{ModelType, ToggleModelSelector};
 use parking_lot::Mutex;
 use settings::Settings;
 use std::cmp;
@@ -135,7 +132,7 @@ impl<T: 'static> Render for PromptEditor<T> {

                                let error_message = SharedString::from(error.to_string());
                                if error.error_code() == proto::ErrorCode::RateLimitExceeded
-                                    && cx.has_flag::<ZedProFeatureFlag>()
+                                    && cx.has_flag::<ZedPro>()
                                {
                                    el.child(
                                        v_flex()
@@ -248,22 +245,13 @@ impl<T: 'static> PromptEditor<T> {

    pub fn unlink(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let prompt = self.prompt(cx);
-        let existing_creases = self.editor.update(cx, extract_message_creases);
-
        let focus = self.editor.focus_handle(cx).contains_focused(window, cx);
        self.editor = cx.new(|cx| {
            let mut editor = Editor::auto_height(Self::MAX_LINES as usize, window, cx);
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
+            editor.set_placeholder_text(Self::placeholder_text(&self.mode, window, cx), cx);
            editor.set_placeholder_text("Add a prompt…", cx);
            editor.set_text(prompt, window, cx);
-            insert_message_creases(
-                &mut editor,
-                &existing_creases,
-                &self.context_store,
-                window,
-                cx,
-            );
-
            if focus {
                window.focus(&editor.focus_handle(cx));
            }
@@ -850,7 +838,6 @@ impl PromptEditor<BufferCodegen> {
        cx: &mut Context<PromptEditor<BufferCodegen>>,
    ) -> PromptEditor<BufferCodegen> {
        let codegen_subscription = cx.observe(&codegen, Self::handle_codegen_changed);
-        let codegen_buffer = codegen.read(cx).buffer(cx).read(cx).as_singleton();
        let mode = PromptEditorMode::Buffer {
            id,
            codegen,
@@ -873,27 +860,8 @@ impl PromptEditor<BufferCodegen> {
            // typing in one will make what you typed appear in all of them.
            editor.set_show_cursor_when_unfocused(true, cx);
            editor.set_placeholder_text(Self::placeholder_text(&mode, window, cx), cx);
-            editor.register_addon(ContextCreasesAddon::new());
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: None,
-            });
-
            editor
        });
-
-        let prompt_editor_entity = prompt_editor.downgrade();
-        prompt_editor.update(cx, |editor, _| {
-            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
-                workspace.clone(),
-                context_store.downgrade(),
-                thread_store.clone(),
-                prompt_editor_entity,
-                codegen_buffer.as_ref().map(Entity::downgrade),
-            ))));
-        });
-
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let model_selector_menu_handle = PopoverMenuHandle::default();

@@ -963,7 +931,7 @@ impl PromptEditor<BufferCodegen> {
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Error(error) => {
-                if cx.has_flag::<ZedProFeatureFlag>()
+                if cx.has_flag::<ZedPro>()
                    && error.error_code() == proto::ErrorCode::RateLimitExceeded
                    && !dismissed_rate_limit_notice()
                {
@@ -1045,25 +1013,8 @@ impl PromptEditor<TerminalCodegen> {
            );
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
            editor.set_placeholder_text(Self::placeholder_text(&mode, window, cx), cx);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: None,
-            });
            editor
        });
-
-        let prompt_editor_entity = prompt_editor.downgrade();
-        prompt_editor.update(cx, |editor, _| {
-            editor.set_completion_provider(Some(Box::new(ContextPickerCompletionProvider::new(
-                workspace.clone(),
-                context_store.downgrade(),
-                thread_store.clone(),
-                prompt_editor_entity,
-                None,
-            ))));
-        });
-
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let model_selector_menu_handle = PopoverMenuHandle::default();

--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -1,23 +1,25 @@
 use std::sync::Arc;

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

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

 pub struct ProfileSelector {
-    profiles: GroupedAgentProfiles,
+    profiles: IndexMap<AgentProfileId, AgentProfile>,
    fs: Arc<dyn Fs>,
    thread_store: WeakEntity<ThreadStore>,
-    menu_handle: PopoverMenuHandle<ContextMenu>,
    focus_handle: FocusHandle,
+    menu_handle: PopoverMenuHandle<ContextMenu>,
    _subscriptions: Vec<Subscription>,
 }

@@ -32,14 +34,17 @@ impl ProfileSelector {
            this.refresh_profiles(cx);
        });

-        Self {
-            profiles: GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx)),
+        let mut this = Self {
+            profiles: IndexMap::default(),
            fs,
            thread_store,
-            menu_handle: PopoverMenuHandle::default(),
            focus_handle,
+            menu_handle: PopoverMenuHandle::default(),
            _subscriptions: vec![settings_subscription],
-        }
+        };
+        this.refresh_profiles(cx);
+
+        this
    }

    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
@@ -47,7 +52,9 @@ impl ProfileSelector {
    }

    fn refresh_profiles(&mut self, cx: &mut Context<Self>) {
-        self.profiles = GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx));
+        let settings = AssistantSettings::get_global(cx);
+
+        self.profiles = settings.profiles.clone();
    }

    fn build_context_menu(
@@ -57,21 +64,47 @@ impl ProfileSelector {
    ) -> Entity<ContextMenu> {
        ContextMenu::build(window, cx, |mut menu, _window, cx| {
            let settings = AssistantSettings::get_global(cx);
-            for (profile_id, profile) in self.profiles.builtin.iter() {
-                menu =
-                    menu.item(self.menu_entry_for_profile(profile_id.clone(), profile, settings));
+            let icon_position = IconPosition::End;
+
+            menu = menu.header("Profiles");
+            for (profile_id, profile) in self.profiles.clone() {
+                menu = menu.toggleable_entry(
+                    profile.name.clone(),
+                    profile_id == settings.default_profile,
+                    icon_position,
+                    None,
+                    {
+                        let fs = self.fs.clone();
+                        let thread_store = self.thread_store.clone();
+                        move |_window, cx| {
+                            update_settings_file::<AssistantSettings>(fs.clone(), cx, {
+                                let profile_id = profile_id.clone();
+                                move |settings, _cx| {
+                                    settings.set_profile(profile_id.clone());
+                                }
+                            });
+
+                            thread_store
+                                .update(cx, |this, cx| {
+                                    this.load_profile_by_id(profile_id.clone(), cx);
+                                })
+                                .log_err();
+                        }
+                    },
+                );
            }

-            if !self.profiles.custom.is_empty() {
-                menu = menu.separator().header("Custom Profiles");
-                for (profile_id, profile) in self.profiles.custom.iter() {
-                    menu = menu.item(self.menu_entry_for_profile(
-                        profile_id.clone(),
-                        profile,
-                        settings,
-                    ));
+            menu = menu.separator();
+            menu = menu.header("Customize Current Profile");
+            menu = menu.item(ContextMenuEntry::new("Tools…").handler({
+                let profile_id = settings.default_profile.clone();
+                move |window, cx| {
+                    window.dispatch_action(
+                        ManageProfiles::customize_tools(profile_id.clone()).boxed_clone(),
+                        cx,
+                    );
                }
-            }
+            }));

            menu = menu.separator();
            menu = menu.item(ContextMenuEntry::new("Configure Profiles…").handler(
@@ -83,53 +116,10 @@ impl ProfileSelector {
            menu
        })
    }
-
-    fn menu_entry_for_profile(
-        &self,
-        profile_id: AgentProfileId,
-        profile: &AgentProfile,
-        settings: &AssistantSettings,
-    ) -> ContextMenuEntry {
-        let documentation = match profile.name.to_lowercase().as_str() {
-            builtin_profiles::WRITE => Some("Get help to write anything."),
-            builtin_profiles::ASK => Some("Chat about your codebase."),
-            builtin_profiles::MANUAL => Some("Chat about anything with no tools."),
-            _ => None,
-        };
-
-        let entry = ContextMenuEntry::new(profile.name.clone())
-            .toggleable(IconPosition::End, profile_id == settings.default_profile);
-
-        let entry = if let Some(doc_text) = documentation {
-            entry.documentation_aside(move |_| Label::new(doc_text).into_any_element())
-        } else {
-            entry
-        };
-
-        entry.handler({
-            let fs = self.fs.clone();
-            let thread_store = self.thread_store.clone();
-            let profile_id = profile_id.clone();
-            move |_window, cx| {
-                update_settings_file::<AssistantSettings>(fs.clone(), cx, {
-                    let profile_id = profile_id.clone();
-                    move |settings, _cx| {
-                        settings.set_profile(profile_id.clone());
-                    }
-                });
-
-                thread_store
-                    .update(cx, |this, cx| {
-                        this.load_profile_by_id(profile_id.clone(), cx);
-                    })
-                    .log_err();
-            }
-        })
-    }
 }

 impl Render for ProfileSelector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AssistantSettings::get_global(cx);
        let profile_id = &settings.default_profile;
        let profile = settings.profiles.get(profile_id);
@@ -143,42 +133,57 @@ impl Render for ProfileSelector {
            .default_model()
            .map_or(false, |default| default.model.supports_tools());

-        let this = cx.entity().clone();
-        let focus_handle = self.focus_handle.clone();
-
-        let trigger_button = if supports_tools {
-            Button::new("profile-selector-model", selected_profile)
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .icon(IconName::ChevronDown)
-                .icon_size(IconSize::XSmall)
-                .icon_position(IconPosition::End)
-                .icon_color(Color::Muted)
-        } else {
-            Button::new("tools-not-supported-button", "No Tools")
-                .disabled(true)
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .tooltip(Tooltip::text("The current model does not support tools."))
+        let icon = match profile_id.as_str() {
+            "write" => IconName::Pencil,
+            "ask" => IconName::MessageBubbles,
+            _ => IconName::UserRoundPen,
        };

+        let this = cx.entity().clone();
+        let focus_handle = self.focus_handle.clone();
        PopoverMenu::new("profile-selector")
-            .trigger_with_tooltip(trigger_button, {
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    Tooltip::for_action_in(
-                        "Toggle Profile Menu",
-                        &ToggleProfileSelector,
-                        &focus_handle,
-                        window,
-                        cx,
-                    )
-                }
-            })
-            .anchor(gpui::Corner::BottomRight)
-            .with_handle(self.menu_handle.clone())
            .menu(move |window, cx| {
                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
            })
+            .trigger(if supports_tools {
+                ButtonLike::new("profile-selector-button").child(
+                    h_flex()
+                        .gap_1()
+                        .child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted))
+                        .child(
+                            Label::new(selected_profile)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .size(IconSize::XSmall)
+                                .color(Color::Muted),
+                        )
+                        .child(div().opacity(0.5).children({
+                            let focus_handle = focus_handle.clone();
+                            KeyBinding::for_action_in(
+                                &ToggleProfileSelector,
+                                &focus_handle,
+                                window,
+                                cx,
+                            )
+                            .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/agent/src/terminal_codegen.rs
+++ b/crates/agent/src/terminal_codegen.rs
@@ -32,7 +32,7 @@ impl TerminalCodegen {
        }
    }

-    pub fn start(&mut self, prompt_task: Task<LanguageModelRequest>, cx: &mut Context<Self>) {
+    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut Context<Self>) {
        let Some(ConfiguredModel { model, .. }) =
            LanguageModelRegistry::read_global(cx).inline_assistant_model()
        else {
@@ -45,7 +45,6 @@ impl TerminalCodegen {
        self.status = CodegenStatus::Pending;
        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
        self.generation = cx.spawn(async move |this, cx| {
-            let prompt = prompt_task.await;
            let model_telemetry_id = model.telemetry_id();
            let model_provider_id = model.provider_id();
            let response = model.stream_completion_text(prompt, &cx).await;
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -1,4 +1,4 @@
-use crate::context::load_context;
+use crate::context::attach_context_to_message;
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{
    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
@@ -10,14 +10,14 @@ use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{MultiBuffer, actions::SelectAll};
 use fs::Fs;
-use gpui::{App, Entity, Focusable, Global, Subscription, Task, UpdateGlobal, WeakEntity};
+use gpui::{App, Entity, Focusable, Global, Subscription, UpdateGlobal, WeakEntity};
 use language::Buffer;
 use language_model::{
    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    Role, report_assistant_event,
 };
 use project::Project;
-use prompt_store::{PromptBuilder, PromptStore};
+use prompt_store::PromptBuilder;
 use std::sync::Arc;
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::TerminalView;
@@ -69,7 +69,6 @@ impl TerminalInlineAssistant {
        terminal_view: &Entity<TerminalView>,
        workspace: WeakEntity<Workspace>,
        project: WeakEntity<Project>,
-        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
        window: &mut Window,
        cx: &mut App,
@@ -110,7 +109,6 @@ impl TerminalInlineAssistant {
            prompt_editor,
            workspace.clone(),
            context_store,
-            prompt_store,
            window,
            cx,
        );
@@ -198,11 +196,11 @@ impl TerminalInlineAssistant {
            .log_err();

        let codegen = assist.codegen.clone();
-        let Some(request_task) = self.request_for_inline_assist(assist_id, cx).log_err() else {
+        let Some(request) = self.request_for_inline_assist(assist_id, cx).log_err() else {
            return;
        };

-        codegen.update(cx, |codegen, cx| codegen.start(request_task, cx));
+        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
    }

    fn stop_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
@@ -219,7 +217,7 @@ impl TerminalInlineAssistant {
        &self,
        assist_id: TerminalInlineAssistId,
        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
+    ) -> Result<LanguageModelRequest> {
        let assist = self.assists.get(&assist_id).context("invalid assist")?;

        let shell = std::env::var("SHELL").ok();
@@ -248,41 +246,28 @@ impl TerminalInlineAssistant {
            &latest_output,
        )?;

-        let contexts = assist
-            .context_store
-            .read(cx)
-            .context()
-            .cloned()
-            .collect::<Vec<_>>();
-        let context_load_task = assist.workspace.update(cx, |workspace, cx| {
-            let project = workspace.project();
-            load_context(contexts, project, &assist.prompt_store, cx)
-        })?;
+        let mut request_message = LanguageModelRequestMessage {
+            role: Role::User,
+            content: vec![],
+            cache: false,
+        };

-        Ok(cx.background_spawn(async move {
-            let mut request_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![],
-                cache: false,
-            };
+        attach_context_to_message(
+            &mut request_message,
+            assist.context_store.read(cx).context().iter(),
+            cx,
+        );

-            context_load_task
-                .await
-                .loaded_context
-                .add_to_request_message(&mut request_message);
+        request_message.content.push(prompt.into());

-            request_message.content.push(prompt.into());
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                mode: None,
-                messages: vec![request_message],
-                tools: Vec::new(),
-                stop: Vec::new(),
-                temperature: None,
-            }
-        }))
+        Ok(LanguageModelRequest {
+            thread_id: None,
+            prompt_id: None,
+            messages: vec![request_message],
+            tools: Vec::new(),
+            stop: Vec::new(),
+            temperature: None,
+        })
    }

    fn finish_assist(
@@ -395,7 +380,6 @@ struct TerminalInlineAssist {
    codegen: Entity<TerminalCodegen>,
    workspace: WeakEntity<Workspace>,
    context_store: Entity<ContextStore>,
-    prompt_store: Option<Entity<PromptStore>>,
    _subscriptions: Vec<Subscription>,
 }

@@ -406,7 +390,6 @@ impl TerminalInlineAssist {
        prompt_editor: Entity<PromptEditor<TerminalCodegen>>,
        workspace: WeakEntity<Workspace>,
        context_store: Entity<ContextStore>,
-        prompt_store: Option<Entity<PromptStore>>,
        window: &mut Window,
        cx: &mut App,
    ) -> Self {
@@ -417,7 +400,6 @@ impl TerminalInlineAssist {
            codegen: codegen.clone(),
            workspace: workspace.clone(),
            context_store,
-            prompt_store,
            _subscriptions: vec![
                window.subscribe(&prompt_editor, cx, |prompt_editor, event, window, cx| {
                    TerminalInlineAssistant::update_global(cx, |this, cx| {
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -270,9 +270,9 @@ 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_by_id(&thread.id, window, cx)
-                }),
+                HistoryEntry::Thread(thread) => self
+                    .assistant_panel
+                    .update(cx, move |this, cx| this.open_thread(&thread.id, window, cx)),
                HistoryEntry::Context(context) => {
                    self.assistant_panel.update(cx, move |this, cx| {
                        this.open_saved_prompt_editor(context.path.clone(), window, cx)
@@ -525,8 +525,7 @@ impl RenderOnce for PastThread {
                move |_event, window, cx| {
                    assistant_panel
                        .update(cx, |this, cx| {
-                            this.open_thread_by_id(&id, window, cx)
-                                .detach_and_log_err(cx);
+                            this.open_thread(&id, window, cx).detach_and_log_err(cx);
                        })
                        .ok();
                }
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -9,8 +9,9 @@ use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
 use assistant_tool::{ToolId, ToolSource, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
-use context_server::manager::{ContextServerManager, ContextServerStatus};
-use context_server::{ContextServerDescriptorRegistry, ContextServerTool};
+use context_server::manager::ContextServerManager;
+use context_server::{ContextServerFactoryRegistry, ContextServerTool};
+use fs::Fs;
 use futures::channel::{mpsc, oneshot};
 use futures::future::{self, BoxFuture, Shared};
 use futures::{FutureExt as _, StreamExt as _};
@@ -21,10 +22,10 @@ use gpui::{
 use heed::Database;
 use heed::types::SerdeBincode;
 use language_model::{LanguageModelToolUseId, Role, TokenUsage};
-use project::{Project, ProjectItem, ProjectPath, Worktree};
+use project::{Project, Worktree};
 use prompt_store::{
-    ProjectContext, PromptBuilder, PromptId, PromptStore, PromptsUpdatedEvent, RulesFileContext,
-    UserRulesContext, WorktreeContext,
+    ProjectContext, PromptBuilder, PromptId, PromptMetadata, PromptStore, PromptsUpdatedEvent,
+    RulesFileContext, UserPromptId, UserRulesContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
 use settings::{Settings as _, SettingsStore};
@@ -81,11 +82,12 @@ impl ThreadStore {
    pub fn load(
        project: Entity<Project>,
        tools: Entity<ToolWorkingSet>,
-        prompt_store: Option<Entity<PromptStore>>,
        prompt_builder: Arc<PromptBuilder>,
        cx: &mut App,
    ) -> Task<Result<Entity<Self>>> {
+        let prompt_store = PromptStore::global(cx);
        cx.spawn(async move |cx| {
+            let prompt_store = prompt_store.await.ok();
            let (thread_store, ready_rx) = cx.update(|cx| {
                let mut option_ready_rx = None;
                let thread_store = cx.new(|cx| {
@@ -108,7 +110,7 @@ impl ThreadStore {
        prompt_store: Option<Entity<PromptStore>>,
        cx: &mut Context<Self>,
    ) -> (Self, oneshot::Receiver<()>) {
-        let context_server_factory_registry = ContextServerDescriptorRegistry::default_global(cx);
+        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)
        });
@@ -206,15 +208,15 @@ impl ThreadStore {
        prompt_store: Option<Entity<PromptStore>>,
        cx: &mut Context<Self>,
    ) -> Task<()> {
-        let worktrees = self
-            .project
-            .read(cx)
+        let project = self.project.read(cx);
+        let worktree_tasks = project
            .visible_worktrees(cx)
-            .collect::<Vec<_>>();
-        let worktree_tasks = worktrees
-            .into_iter()
            .map(|worktree| {
-                Self::load_worktree_info_for_system_prompt(worktree, self.project.clone(), cx)
+                Self::load_worktree_info_for_system_prompt(
+                    project.fs().clone(),
+                    worktree.read(cx),
+                    cx,
+                )
            })
            .collect::<Vec<_>>();
        let default_user_rules_task = match prompt_store {
@@ -275,13 +277,13 @@ impl ThreadStore {
    }

    fn load_worktree_info_for_system_prompt(
-        worktree: Entity<Worktree>,
-        project: Entity<Project>,
-        cx: &mut App,
+        fs: Arc<dyn Fs>,
+        worktree: &Worktree,
+        cx: &App,
    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
-        let root_name = worktree.read(cx).root_name().into();
+        let root_name = worktree.root_name().into();

-        let rules_task = Self::load_worktree_rules_file(worktree, project, cx);
+        let rules_task = Self::load_worktree_rules_file(fs, worktree, cx);
        let Some(rules_task) = rules_task else {
            return Task::ready((
                WorktreeContext {
@@ -311,44 +313,33 @@ impl ThreadStore {
    }

    fn load_worktree_rules_file(
-        worktree: Entity<Worktree>,
-        project: Entity<Project>,
-        cx: &mut App,
+        fs: Arc<dyn Fs>,
+        worktree: &Worktree,
+        cx: &App,
    ) -> Option<Task<Result<RulesFileContext>>> {
-        let worktree_ref = worktree.read(cx);
-        let worktree_id = worktree_ref.id();
        let selected_rules_file = RULES_FILE_NAMES
            .into_iter()
            .filter_map(|name| {
-                worktree_ref
+                worktree
                    .entry_for_path(name)
                    .filter(|entry| entry.is_file())
-                    .map(|entry| entry.path.clone())
+                    .map(|entry| (entry.path.clone(), worktree.absolutize(&entry.path)))
            })
            .next();

        // Note that Cline supports `.clinerules` being a directory, but that is not currently
        // supported. This doesn't seem to occur often in GitHub repositories.
-        selected_rules_file.map(|path_in_worktree| {
-            let project_path = ProjectPath {
-                worktree_id,
-                path: path_in_worktree.clone(),
-            };
-            let buffer_task =
-                project.update(cx, |project, cx| project.open_buffer(project_path, cx));
-            let rope_task = cx.spawn(async move |cx| {
-                buffer_task.await?.read_with(cx, |buffer, cx| {
-                    let project_entry_id = buffer.entry_id(cx).context("buffer has no file")?;
-                    anyhow::Ok((project_entry_id, buffer.as_rope().clone()))
-                })?
-            });
-            // Build a string from the rope on a background thread.
+        selected_rules_file.map(|(path_in_worktree, abs_path)| {
+            let fs = fs.clone();
            cx.background_spawn(async move {
-                let (project_entry_id, rope) = rope_task.await?;
+                let abs_path = abs_path?;
+                let text = fs.load(&abs_path).await.with_context(|| {
+                    format!("Failed to load assistant rules file {:?}", abs_path)
+                })?;
                anyhow::Ok(RulesFileContext {
                    path_in_worktree,
-                    text: rope.to_string().trim().to_string(),
-                    project_entry_id: project_entry_id.to_usize(),
+                    abs_path: abs_path.into(),
+                    text: text.trim().to_string(),
                })
            })
        })
@@ -358,8 +349,25 @@ impl ThreadStore {
        self.context_server_manager.clone()
    }

-    pub fn prompt_store(&self) -> &Option<Entity<PromptStore>> {
-        &self.prompt_store
+    pub fn prompt_store(&self) -> Option<Entity<PromptStore>> {
+        self.prompt_store.clone()
+    }
+
+    pub fn load_rules(
+        &self,
+        prompt_id: UserPromptId,
+        cx: &App,
+    ) -> Task<Result<(PromptMetadata, String)>> {
+        let prompt_id = PromptId::User { uuid: prompt_id };
+        let Some(prompt_store) = self.prompt_store.as_ref() else {
+            return Task::ready(Err(anyhow!("Prompt store unexpectedly missing.")));
+        };
+        let prompt_store = prompt_store.read(cx);
+        let Some(metadata) = prompt_store.metadata(prompt_id) else {
+            return Task::ready(Err(anyhow!("User rules not found in library.")));
+        };
+        let text_task = prompt_store.load(prompt_id, cx);
+        cx.background_spawn(async move { Ok((metadata, text_task.await?)) })
    }

    pub fn tools(&self) -> Entity<ToolWorkingSet> {
@@ -371,12 +379,16 @@ impl ThreadStore {
        self.threads.len()
    }

-    pub fn reverse_chronological_threads(&self) -> Vec<SerializedThreadMetadata> {
+    pub fn threads(&self) -> Vec<SerializedThreadMetadata> {
        let mut threads = self.threads.iter().cloned().collect::<Vec<_>>();
        threads.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.updated_at));
        threads
    }

+    pub fn recent_threads(&self, limit: usize) -> Vec<SerializedThreadMetadata> {
+        self.threads().into_iter().take(limit).collect()
+    }
+
    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
        cx.new(|cx| {
            Thread::new(
@@ -504,22 +516,6 @@ impl ThreadStore {
                    );
                });
            }
-            // Enable all the tools from all context servers, but disable the ones that are explicitly disabled
-            for (context_server_id, preset) in &profile.context_servers {
-                self.tools.update(cx, |tools, cx| {
-                    tools.disable(
-                        ToolSource::ContextServer {
-                            id: context_server_id.clone().into(),
-                        },
-                        &preset
-                            .tools
-                            .iter()
-                            .filter_map(|(tool, enabled)| (!enabled).then(|| tool.clone()))
-                            .collect::<Vec<_>>(),
-                        cx,
-                    )
-                })
-            }
        } else {
            for (context_server_id, preset) in &profile.context_servers {
                self.tools.update(cx, |tools, cx| {
@@ -555,68 +551,62 @@ impl ThreadStore {
    ) {
        let tool_working_set = self.tools.clone();
        match event {
-            context_server::manager::Event::ServerStatusChanged { server_id, status } => {
-                match status {
-                    Some(ContextServerStatus::Running) => {
-                        if let Some(server) = context_server_manager.read(cx).get_server(server_id)
-                        {
-                            let context_server_manager = context_server_manager.clone();
-                            cx.spawn({
-                                let server = server.clone();
-                                let server_id = server_id.clone();
-                                async move |this, cx| {
-                                    let Some(protocol) = server.client() else {
-                                        return;
-                                    };
+            context_server::manager::Event::ServerStarted { server_id } => {
+                if let Some(server) = context_server_manager.read(cx).get_server(server_id) {
+                    let context_server_manager = context_server_manager.clone();
+                    cx.spawn({
+                        let server = server.clone();
+                        let server_id = server_id.clone();
+                        async move |this, cx| {
+                            let Some(protocol) = server.client() else {
+                                return;
+                            };

-                                    if protocol.capable(context_server::protocol::ServerCapability::Tools) {
-                                        if let Some(tools) = protocol.list_tools().await.log_err() {
-                                            let tool_ids = tool_working_set
-                                                .update(cx, |tool_working_set, _| {
-                                                    tools
-                                                        .tools
-                                                        .into_iter()
-                                                        .map(|tool| {
-                                                            log::info!(
-                                                                "registering context server tool: {:?}",
-                                                                tool.name
-                                                            );
-                                                            tool_working_set.insert(Arc::new(
-                                                                ContextServerTool::new(
-                                                                    context_server_manager.clone(),
-                                                                    server.id(),
-                                                                    tool,
-                                                                ),
-                                                            ))
-                                                        })
-                                                        .collect::<Vec<_>>()
+                            if protocol.capable(context_server::protocol::ServerCapability::Tools) {
+                                if let Some(tools) = protocol.list_tools().await.log_err() {
+                                    let tool_ids = tool_working_set
+                                        .update(cx, |tool_working_set, _| {
+                                            tools
+                                                .tools
+                                                .into_iter()
+                                                .map(|tool| {
+                                                    log::info!(
+                                                        "registering context server tool: {:?}",
+                                                        tool.name
+                                                    );
+                                                    tool_working_set.insert(Arc::new(
+                                                        ContextServerTool::new(
+                                                            context_server_manager.clone(),
+                                                            server.id(),
+                                                            tool,
+                                                        ),
+                                                    ))
                                                })
-                                                .log_err();
+                                                .collect::<Vec<_>>()
+                                        })
+                                        .log_err();

-                                            if let Some(tool_ids) = tool_ids {
-                                                this.update(cx, |this, cx| {
-                                                    this.context_server_tool_ids
-                                                        .insert(server_id, tool_ids);
-                                                    this.load_default_profile(cx);
-                                                })
-                                                .log_err();
-                                            }
-                                        }
+                                    if let Some(tool_ids) = tool_ids {
+                                        this.update(cx, |this, cx| {
+                                            this.context_server_tool_ids
+                                                .insert(server_id, tool_ids);
+                                            this.load_default_profile(cx);
+                                        })
+                                        .log_err();
                                    }
                                }
-                            })
-                            .detach();
+                            }
                        }
-                    }
-                    None => {
-                        if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
-                            tool_working_set.update(cx, |tool_working_set, _| {
-                                tool_working_set.remove(&tool_ids);
-                            });
-                            self.load_default_profile(cx);
-                        }
-                    }
-                    _ => {}
+                    })
+                    .detach();
+                }
+            }
+            context_server::manager::Event::ServerStopped { server_id } => {
+                if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
+                    tool_working_set.update(cx, |tool_working_set, _| {
+                        tool_working_set.remove(&tool_ids);
+                    });
+                    self.load_default_profile(cx);
                }
            }
        }
@@ -646,28 +636,15 @@ pub struct SerializedThread {
    pub detailed_summary_state: DetailedSummaryState,
    #[serde(default)]
    pub exceeded_window_error: Option<ExceededWindowError>,
-    #[serde(default)]
-    pub model: Option<SerializedLanguageModel>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct SerializedLanguageModel {
-    pub provider: String,
-    pub model: String,
 }

 impl SerializedThread {
-    pub const VERSION: &'static str = "0.2.0";
+    pub const VERSION: &'static str = "0.1.0";

    pub fn from_json(json: &[u8]) -> Result<Self> {
        let saved_thread_json = serde_json::from_slice::<serde_json::Value>(json)?;
        match saved_thread_json.get("version") {
            Some(serde_json::Value::String(version)) => match version.as_str() {
-                SerializedThreadV0_1_0::VERSION => {
-                    let saved_thread =
-                        serde_json::from_value::<SerializedThreadV0_1_0>(saved_thread_json)?;
-                    Ok(saved_thread.upgrade())
-                }
                SerializedThread::VERSION => Ok(serde_json::from_value::<SerializedThread>(
                    saved_thread_json,
                )?),
@@ -689,38 +666,6 @@ impl SerializedThread {
    }
 }

-#[derive(Serialize, Deserialize, Debug)]
-pub struct SerializedThreadV0_1_0(
-    // The structure did not change, so we are reusing the latest SerializedThread.
-    // When making the next version, make sure this points to SerializedThreadV0_2_0
-    SerializedThread,
-);
-
-impl SerializedThreadV0_1_0 {
-    pub const VERSION: &'static str = "0.1.0";
-
-    pub fn upgrade(self) -> SerializedThread {
-        debug_assert_eq!(SerializedThread::VERSION, "0.2.0");
-
-        let mut messages: Vec<SerializedMessage> = Vec::with_capacity(self.0.messages.len());
-
-        for message in self.0.messages {
-            if message.role == Role::User && !message.tool_results.is_empty() {
-                if let Some(last_message) = messages.last_mut() {
-                    debug_assert!(last_message.role == Role::Assistant);
-
-                    last_message.tool_results = message.tool_results;
-                    continue;
-                }
-            }
-
-            messages.push(message);
-        }
-
-        SerializedThread { messages, ..self.0 }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct SerializedMessage {
    pub id: MessageId,
@@ -733,8 +678,6 @@ pub struct SerializedMessage {
    pub tool_results: Vec<SerializedToolResult>,
    #[serde(default)]
    pub context: String,
-    #[serde(default)]
-    pub creases: Vec<SerializedCrease>,
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -790,7 +733,6 @@ impl LegacySerializedThread {
            request_token_usage: Vec::new(),
            detailed_summary_state: DetailedSummaryState::default(),
            exceeded_window_error: None,
-            model: None,
        }
    }
 }
@@ -815,19 +757,10 @@ impl LegacySerializedMessage {
            tool_uses: self.tool_uses,
            tool_results: self.tool_results,
            context: String::new(),
-            creases: Vec::new(),
        }
    }
 }

-#[derive(Debug, Serialize, Deserialize)]
-pub struct SerializedCrease {
-    pub start: usize,
-    pub end: usize,
-    pub icon_path: SharedString,
-    pub label: SharedString,
-}
-
 struct GlobalThreadsDatabase(
    Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>,
 );
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -7,7 +7,7 @@ use futures::FutureExt as _;
 use futures::future::Shared;
 use gpui::{App, Entity, SharedString, Task};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelRequestMessage, LanguageModelToolResult,
+    LanguageModel, LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolResult,
    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
 };
 use ui::IconName;
@@ -30,6 +30,7 @@ pub struct ToolUse {
 pub struct ToolUseState {
    tools: Entity<ToolWorkingSet>,
    tool_uses_by_assistant_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
+    tool_uses_by_user_message: HashMap<MessageId, Vec<LanguageModelToolUseId>>,
    tool_results: HashMap<LanguageModelToolUseId, LanguageModelToolResult>,
    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
    tool_result_cards: HashMap<LanguageModelToolUseId, AnyToolCard>,
@@ -41,6 +42,7 @@ impl ToolUseState {
        Self {
            tools,
            tool_uses_by_assistant_message: HashMap::default(),
+            tool_uses_by_user_message: HashMap::default(),
            tool_results: HashMap::default(),
            pending_tool_uses_by_id: HashMap::default(),
            tool_result_cards: HashMap::default(),
@@ -54,6 +56,7 @@ impl ToolUseState {
    pub fn from_serialized_messages(
        tools: Entity<ToolWorkingSet>,
        messages: &[SerializedMessage],
+        mut filter_by_tool_name: impl FnMut(&str) -> bool,
    ) -> Self {
        let mut this = Self::new(tools);
        let mut tool_names_by_id = HashMap::default();
@@ -65,10 +68,10 @@ impl ToolUseState {
                        let tool_uses = message
                            .tool_uses
                            .iter()
+                            .filter(|tool_use| (filter_by_tool_name)(tool_use.name.as_ref()))
                            .map(|tool_use| LanguageModelToolUse {
                                id: tool_use.id.clone(),
                                name: tool_use.name.clone().into(),
-                                raw_input: tool_use.input.to_string(),
                                input: tool_use.input.clone(),
                                is_input_complete: true,
                            })
@@ -82,6 +85,14 @@ impl ToolUseState {

                        this.tool_uses_by_assistant_message
                            .insert(message.id, tool_uses);
+                    }
+                }
+                Role::User => {
+                    if !message.tool_results.is_empty() {
+                        let tool_uses_by_user_message = this
+                            .tool_uses_by_user_message
+                            .entry(message.id)
+                            .or_default();

                        for tool_result in &message.tool_results {
                            let tool_use_id = tool_result.tool_use_id.clone();
@@ -90,6 +101,11 @@ impl ToolUseState {
                                continue;
                            };

+                            if !(filter_by_tool_name)(tool_use.as_ref()) {
+                                continue;
+                            }
+
+                            tool_uses_by_user_message.push(tool_use_id.clone());
                            this.tool_results.insert(
                                tool_use_id.clone(),
                                LanguageModelToolResult {
@@ -102,7 +118,7 @@ impl ToolUseState {
                        }
                    }
                }
-                Role::System | Role::User => {}
+                Role::System => {}
            }
        }

@@ -212,26 +228,20 @@ impl ToolUseState {
        }
    }

-    pub fn tool_results_for_message(
-        &self,
-        assistant_message_id: MessageId,
-    ) -> Vec<&LanguageModelToolResult> {
-        let Some(tool_uses) = self
-            .tool_uses_by_assistant_message
-            .get(&assistant_message_id)
-        else {
-            return Vec::new();
-        };
+    pub fn tool_results_for_message(&self, message_id: MessageId) -> Vec<&LanguageModelToolResult> {
+        let empty = Vec::new();

-        tool_uses
+        self.tool_uses_by_user_message
+            .get(&message_id)
+            .unwrap_or(&empty)
            .iter()
-            .filter_map(|tool_use| self.tool_results.get(&tool_use.id))
+            .filter_map(|tool_use_id| self.tool_results.get(&tool_use_id))
            .collect()
    }

-    pub fn message_has_tool_results(&self, assistant_message_id: MessageId) -> bool {
-        self.tool_uses_by_assistant_message
-            .get(&assistant_message_id)
+    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
+        self.tool_uses_by_user_message
+            .get(&message_id)
            .map_or(false, |results| !results.is_empty())
    }

@@ -283,6 +293,14 @@ impl ToolUseState {
            self.tool_use_metadata_by_id
                .insert(tool_use.id.clone(), metadata);

+            // The tool use is being requested by the Assistant, so we want to
+            // attach the tool results to the next user message.
+            let next_user_message_id = MessageId(assistant_message_id.0 + 1);
+            self.tool_uses_by_user_message
+                .entry(next_user_message_id)
+                .or_default()
+                .push(tool_use.id.clone());
+
            PendingToolUseStatus::Idle
        } else {
            PendingToolUseStatus::InputStillStreaming
@@ -353,7 +371,7 @@ impl ToolUseState {
        tool_use_id: LanguageModelToolUseId,
        tool_name: Arc<str>,
        output: Result<String>,
-        configured_model: Option<&ConfiguredModel>,
+        cx: &App,
    ) -> Option<PendingToolUse> {
        let metadata = self.tool_use_metadata_by_id.remove(&tool_use_id);

@@ -373,10 +391,13 @@ impl ToolUseState {

        match output {
            Ok(tool_result) => {
+                let model_registry = LanguageModelRegistry::read_global(cx);
+
                const BYTES_PER_TOKEN_ESTIMATE: usize = 3;

                // Protect from clearly large output
-                let tool_output_limit = configured_model
+                let tool_output_limit = model_registry
+                    .default_model()
                    .map(|model| model.model.max_token_count() * BYTES_PER_TOKEN_ESTIMATE)
                    .unwrap_or(usize::MAX);

@@ -445,49 +466,31 @@ impl ToolUseState {
        }
    }

-    pub fn has_tool_results(&self, assistant_message_id: MessageId) -> bool {
-        self.tool_uses_by_assistant_message
-            .contains_key(&assistant_message_id)
-    }
-
-    pub fn tool_results_message(
+    pub fn attach_tool_results(
        &self,
-        assistant_message_id: MessageId,
-    ) -> Option<LanguageModelRequestMessage> {
-        let tool_uses = self
-            .tool_uses_by_assistant_message
-            .get(&assistant_message_id)?;
-
-        if tool_uses.is_empty() {
-            return None;
-        }
-
-        let mut request_message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![],
-            cache: false,
-        };
-
-        for tool_use in tool_uses {
-            if let Some(tool_result) = self.tool_results.get(&tool_use.id) {
-                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.
-                            // It thinks we are sending a tool use without a tool result.
-                            "<Tool returned an empty string>".into()
-                        } else {
-                            tool_result.content.clone()
+        message_id: MessageId,
+        request_message: &mut LanguageModelRequestMessage,
+    ) {
+        if let Some(tool_uses) = self.tool_uses_by_user_message.get(&message_id) {
+            for tool_use_id in tool_uses {
+                if let Some(tool_result) = self.tool_results.get(tool_use_id) {
+                    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.
+                                // It thinks we are sending a tool use without a tool result.
+                                "<Tool returned an empty string>".into()
+                            } else {
+                                tool_result.content.clone()
+                            },
                        },
-                    }));
+                    ));
+                }
            }
        }
-
-        Some(request_message)
    }
 }

--- a/crates/agent/src/ui.rs
+++ b/crates/agent/src/ui.rs
@@ -1,11 +1,9 @@
 mod agent_notification;
 mod animated_label;
 mod context_pill;
-mod max_mode_tooltip;
-pub mod preview;
-mod upsell;
+mod usage_banner;

 pub use agent_notification::*;
 pub use animated_label::*;
 pub use context_pill::*;
-pub use max_mode_tooltip::*;
+pub use usage_banner::*;
--- a/crates/agent/src/ui/animated_label.rs
+++ b/crates/agent/src/ui/animated_label.rs
@@ -73,11 +73,6 @@ impl LabelCommon for AnimatedLabel {
        self.base = self.base.buffer_font(cx);
        self
    }
-
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self.base.inline_code(cx);
-        self
-    }
 }

 impl RenderOnce for AnimatedLabel {
--- a/crates/agent/src/ui/context_pill.rs
+++ b/crates/agent/src/ui/context_pill.rs
@@ -1,23 +1,14 @@
-use std::{ops::Range, path::Path, rc::Rc, sync::Arc, time::Duration};
+use std::sync::Arc;
+use std::{rc::Rc, time::Duration};

 use file_icons::FileIcons;
-use futures::FutureExt as _;
-use gpui::{
-    Animation, AnimationExt as _, AnyView, ClickEvent, Entity, Image, MouseButton, Task,
-    pulsating_between,
-};
+use futures::FutureExt;
+use gpui::{Animation, AnimationExt as _, Image, MouseButton, pulsating_between};
+use gpui::{ClickEvent, Task};
 use language_model::LanguageModelImage;
-use project::Project;
-use prompt_store::PromptStore;
-use rope::Point;
 use ui::{IconButtonShape, Tooltip, prelude::*, tooltip_container};

-use crate::context::{
-    AgentContext, AgentContextHandle, ContextId, ContextKind, DirectoryContext,
-    DirectoryContextHandle, FetchedUrlContext, FileContext, FileContextHandle, ImageContext,
-    ImageStatus, RulesContext, RulesContextHandle, SelectionContext, SelectionContextHandle,
-    SymbolContext, SymbolContextHandle, ThreadContext, ThreadContextHandle,
-};
+use crate::context::{AssistantContext, ContextId, ContextKind, ImageContext};

 #[derive(IntoElement)]
 pub enum ContextPill {
@@ -82,7 +73,9 @@ impl ContextPill {

    pub fn id(&self) -> ElementId {
        match self {
-            Self::Added { context, .. } => context.handle.element_id("context-pill".into()),
+            Self::Added { context, .. } => {
+                ElementId::NamedInteger("context-pill".into(), context.id.0)
+            }
            Self::Suggested { .. } => "suggested-context-pill".into(),
        }
    }
@@ -175,11 +168,16 @@ impl RenderOnce for ContextPill {
                            .map(|element| match &context.status {
                                ContextStatus::Ready => element
                                    .when_some(
-                                        context.render_hover.as_ref(),
-                                        |element, render_hover| {
-                                            let render_hover = render_hover.clone();
-                                            element.hoverable_tooltip(move |window, cx| {
-                                                render_hover(window, cx)
+                                        context.render_preview.as_ref(),
+                                        |element, render_preview| {
+                                            element.hoverable_tooltip({
+                                                let render_preview = render_preview.clone();
+                                                move |_, cx| {
+                                                    cx.new(|_| ContextPillPreview {
+                                                        render_preview: render_preview.clone(),
+                                                    })
+                                                    .into()
+                                                }
                                            })
                                        },
                                    )
@@ -201,25 +199,21 @@ impl RenderOnce for ContextPill {
                    )
                    .when_some(on_remove.as_ref(), |element, on_remove| {
                        element.child(
-                            IconButton::new(
-                                context.handle.element_id("remove".into()),
-                                IconName::Close,
-                            )
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::XSmall)
-                            .tooltip(Tooltip::text("Remove Context"))
-                            .on_click({
-                                let on_remove = on_remove.clone();
-                                move |event, window, cx| on_remove(event, window, cx)
-                            }),
+                            IconButton::new(("remove", context.id.0), IconName::Close)
+                                .shape(IconButtonShape::Square)
+                                .icon_size(IconSize::XSmall)
+                                .tooltip(Tooltip::text("Remove Context"))
+                                .on_click({
+                                    let on_remove = on_remove.clone();
+                                    move |event, window, cx| on_remove(event, window, cx)
+                                }),
                        )
                    })
                    .when_some(on_click.as_ref(), |element, on_click| {
                        let on_click = on_click.clone();
-                        element.cursor_pointer().on_click(move |event, window, cx| {
-                            on_click(event, window, cx);
-                            cx.stop_propagation();
-                        })
+                        element
+                            .cursor_pointer()
+                            .on_click(move |event, window, cx| on_click(event, window, cx))
                    })
                    .into_any_element()
            }
@@ -255,10 +249,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);
-                        cx.stop_propagation();
-                    })
+                    element.on_click(move |event, window, cx| on_click(event, window, cx))
                })
                .into_any(),
        }
@@ -273,441 +264,216 @@ pub enum ContextStatus {

 #[derive(RegisterComponent)]
 pub struct AddedContext {
-    pub handle: AgentContextHandle,
+    pub id: ContextId,
    pub kind: ContextKind,
    pub name: SharedString,
    pub parent: Option<SharedString>,
    pub tooltip: Option<SharedString>,
    pub icon_path: Option<SharedString>,
    pub status: ContextStatus,
-    pub render_hover: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
+    pub render_preview: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyElement + 'static>>,
 }

 impl AddedContext {
-    /// Creates an `AddedContext` by retrieving relevant details of `AgentContext`. This returns a
-    /// `None` if `DirectoryContext` or `RulesContext` no longer exist.
-    ///
-    /// TODO: `None` cases are unremovable from `ContextStore` and so are a very minor memory leak.
-    pub fn new_pending(
-        handle: AgentContextHandle,
-        prompt_store: Option<&Entity<PromptStore>>,
-        project: &Project,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        match handle {
-            AgentContextHandle::File(handle) => Self::pending_file(handle, cx),
-            AgentContextHandle::Directory(handle) => Self::pending_directory(handle, project, cx),
-            AgentContextHandle::Symbol(handle) => Self::pending_symbol(handle, cx),
-            AgentContextHandle::Selection(handle) => Self::pending_selection(handle, cx),
-            AgentContextHandle::FetchedUrl(handle) => Some(Self::fetched_url(handle)),
-            AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
-            AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
-            AgentContextHandle::Image(handle) => Some(Self::image(handle)),
-        }
-    }
-
-    pub fn new_attached(context: &AgentContext, cx: &App) -> AddedContext {
+    pub fn new(context: &AssistantContext, cx: &App) -> AddedContext {
        match context {
-            AgentContext::File(context) => Self::attached_file(context, cx),
-            AgentContext::Directory(context) => Self::attached_directory(context),
-            AgentContext::Symbol(context) => Self::attached_symbol(context, cx),
-            AgentContext::Selection(context) => Self::attached_selection(context, cx),
-            AgentContext::FetchedUrl(context) => Self::fetched_url(context.clone()),
-            AgentContext::Thread(context) => Self::attached_thread(context),
-            AgentContext::Rules(context) => Self::attached_rules(context),
-            AgentContext::Image(context) => Self::image(context.clone()),
-        }
-    }
-
-    fn pending_file(handle: FileContextHandle, cx: &App) -> Option<AddedContext> {
-        let full_path = handle.buffer.read(cx).file()?.full_path(cx);
-        Some(Self::file(handle, &full_path, cx))
-    }
-
-    fn attached_file(context: &FileContext, cx: &App) -> AddedContext {
-        Self::file(context.handle.clone(), &context.full_path, cx)
-    }
-
-    fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
-        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let name = full_path
-            .file_name()
-            .map(|n| n.to_string_lossy().into_owned().into())
-            .unwrap_or_else(|| full_path_string.clone());
-        let parent = full_path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|n| n.to_string_lossy().into_owned().into());
-        AddedContext {
-            kind: ContextKind::File,
-            name,
-            parent,
-            tooltip: Some(full_path_string),
-            icon_path: FileIcons::get_icon(&full_path, cx),
-            status: ContextStatus::Ready,
-            render_hover: None,
-            handle: AgentContextHandle::File(handle),
-        }
-    }
-
-    fn pending_directory(
-        handle: DirectoryContextHandle,
-        project: &Project,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        let worktree = project.worktree_for_entry(handle.entry_id, cx)?.read(cx);
-        let entry = worktree.entry_for_id(handle.entry_id)?;
-        let full_path = worktree.full_path(&entry.path);
-        Some(Self::directory(handle, &full_path))
-    }
-
-    fn attached_directory(context: &DirectoryContext) -> AddedContext {
-        Self::directory(context.handle.clone(), &context.full_path)
-    }
-
-    fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
-        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 {
-            kind: ContextKind::Directory,
-            name,
-            parent,
-            tooltip: Some(full_path_string),
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: None,
-            handle: AgentContextHandle::Directory(handle),
-        }
-    }
-
-    fn pending_symbol(handle: SymbolContextHandle, cx: &App) -> Option<AddedContext> {
-        let excerpt =
-            ContextFileExcerpt::new(&handle.full_path(cx)?, handle.enclosing_line_range(cx), cx);
-        Some(AddedContext {
-            kind: ContextKind::Symbol,
-            name: handle.symbol.clone(),
-            parent: Some(excerpt.file_name_and_range.clone()),
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let handle = handle.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(handle.text(cx), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Symbol(handle),
-        })
-    }
-
-    fn attached_symbol(context: &SymbolContext, cx: &App) -> AddedContext {
-        let excerpt = ContextFileExcerpt::new(&context.full_path, context.line_range.clone(), cx);
-        AddedContext {
-            kind: ContextKind::Symbol,
-            name: context.handle.symbol.clone(),
-            parent: Some(excerpt.file_name_and_range.clone()),
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Symbol(context.handle.clone()),
-        }
-    }
-
-    fn pending_selection(handle: SelectionContextHandle, cx: &App) -> Option<AddedContext> {
-        let excerpt = ContextFileExcerpt::new(&handle.full_path(cx)?, handle.line_range(cx), cx);
-        Some(AddedContext {
-            kind: ContextKind::Selection,
-            name: excerpt.file_name_and_range.clone(),
-            parent: excerpt.parent_name.clone(),
-            tooltip: None,
-            icon_path: excerpt.icon_path.clone(),
-            status: ContextStatus::Ready,
-            render_hover: {
-                let handle = handle.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(handle.text(cx), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Selection(handle),
-        })
-    }
-
-    fn attached_selection(context: &SelectionContext, cx: &App) -> AddedContext {
-        let excerpt = ContextFileExcerpt::new(&context.full_path, context.line_range.clone(), cx);
-        AddedContext {
-            kind: ContextKind::Selection,
-            name: excerpt.file_name_and_range.clone(),
-            parent: excerpt.parent_name.clone(),
-            tooltip: None,
-            icon_path: excerpt.icon_path.clone(),
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    excerpt.hover_view(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Selection(context.handle.clone()),
-        }
-    }
-
-    fn fetched_url(context: FetchedUrlContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::FetchedUrl,
-            name: context.url.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: None,
-            handle: AgentContextHandle::FetchedUrl(context),
-        }
-    }
-
-    fn pending_thread(handle: ThreadContextHandle, cx: &App) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::Thread,
-            name: handle.title(cx),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: if handle.thread.read(cx).is_generating_detailed_summary() {
-                ContextStatus::Loading {
-                    message: "Summarizing…".into(),
+            AssistantContext::File(file_context) => {
+                let full_path = file_context.context_buffer.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),
+                    status: ContextStatus::Ready,
+                    render_preview: None,
                }
-            } else {
-                ContextStatus::Ready
-            },
-            render_hover: {
-                let thread = handle.thread.clone();
-                Some(Rc::new(move |_, cx| {
-                    let text = thread.read(cx).latest_detailed_summary_or_text();
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::Thread(handle),
-        }
-    }
+            }

-    fn attached_thread(context: &ThreadContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::Thread,
-            name: context.title.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
+            AssistantContext::Directory(directory_context) => {
+                let worktree = directory_context.worktree.read(cx);
+                // If the directory no longer exists, use its last known path.
+                let full_path = worktree
+                    .entry_for_id(directory_context.entry_id)
+                    .map_or_else(
+                        || directory_context.last_path.clone(),
+                        |entry| worktree.full_path(&entry.path).into(),
+                    );
+                let full_path_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,
+                    status: ContextStatus::Ready,
+                    render_preview: None,
+                }
+            }
+
+            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,
+                status: ContextStatus::Ready,
+                render_preview: None,
            },
-            handle: AgentContextHandle::Thread(context.handle.clone()),
-        }
-    }

-    fn pending_rules(
-        handle: RulesContextHandle,
-        prompt_store: Option<&Entity<PromptStore>>,
-        cx: &App,
-    ) -> Option<AddedContext> {
-        let title = prompt_store
-            .as_ref()?
-            .read(cx)
-            .metadata(handle.prompt_id.into())?
-            .title
-            .unwrap_or_else(|| "Unnamed Rule".into());
-        Some(AddedContext {
-            kind: ContextKind::Rules,
-            name: title.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: None,
-            handle: AgentContextHandle::Rules(handle),
-        })
-    }
+            AssistantContext::Selection(selection_context) => {
+                let full_path = selection_context.context_buffer.full_path(cx);
+                let mut full_path_string = full_path.to_string_lossy().into_owned();
+                let mut name = full_path
+                    .file_name()
+                    .map(|n| n.to_string_lossy().into_owned())
+                    .unwrap_or_else(|| full_path_string.clone());

-    fn attached_rules(context: &RulesContext) -> AddedContext {
-        let title = context
-            .title
-            .clone()
-            .unwrap_or_else(|| "Unnamed Rule".into());
-        AddedContext {
-            kind: ContextKind::Rules,
-            name: title,
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
+                let line_range_text = format!(
+                    " ({}-{})",
+                    selection_context.line_range.start.row + 1,
+                    selection_context.line_range.end.row + 1
+                );
+
+                full_path_string.push_str(&line_range_text);
+                name.push_str(&line_range_text);
+
+                let parent = full_path
+                    .parent()
+                    .and_then(|p| p.file_name())
+                    .map(|n| n.to_string_lossy().into_owned().into());
+
+                AddedContext {
+                    id: selection_context.id,
+                    kind: ContextKind::Selection,
+                    name: name.into(),
+                    parent,
+                    tooltip: None,
+                    icon_path: FileIcons::get_icon(&full_path, cx),
+                    status: ContextStatus::Ready,
+                    render_preview: Some(Rc::new({
+                        let content = selection_context.context_buffer.text.clone();
+                        move |_, cx| {
+                            div()
+                                .id("context-pill-selection-preview")
+                                .overflow_scroll()
+                                .max_w_128()
+                                .max_h_96()
+                                .child(Label::new(content.clone()).buffer_font(cx))
+                                .into_any_element()
+                        }
+                    })),
+                }
+            }
+
+            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,
+                status: ContextStatus::Ready,
+                render_preview: None,
            },
-            handle: AgentContextHandle::Rules(context.handle.clone()),
-        }
-    }

-    fn image(context: ImageContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::Image,
-            name: "Image".into(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: match context.status() {
-                ImageStatus::Loading => ContextStatus::Loading {
-                    message: "Loading…".into(),
+            AssistantContext::Thread(thread_context) => AddedContext {
+                id: thread_context.id,
+                kind: ContextKind::Thread,
+                name: thread_context.summary(cx),
+                parent: None,
+                tooltip: None,
+                icon_path: None,
+                status: if thread_context
+                    .thread
+                    .read(cx)
+                    .is_generating_detailed_summary()
+                {
+                    ContextStatus::Loading {
+                        message: "Summarizing…".into(),
+                    }
+                } else {
+                    ContextStatus::Ready
                },
-                ImageStatus::Error => ContextStatus::Error {
-                    message: "Failed to load image".into(),
-                },
-                ImageStatus::Ready => ContextStatus::Ready,
+                render_preview: None,
            },
-            render_hover: Some(Rc::new({
-                let image = context.original_image.clone();
-                move |_, cx| {
-                    let image = image.clone();
-                    ContextPillHover::new(cx, move |_, _| {
+
+            AssistantContext::Rules(user_rules_context) => AddedContext {
+                id: user_rules_context.id,
+                kind: ContextKind::Rules,
+                name: user_rules_context.title.clone(),
+                parent: None,
+                tooltip: None,
+                icon_path: None,
+                status: ContextStatus::Ready,
+                render_preview: None,
+            },
+
+            AssistantContext::Image(image_context) => AddedContext {
+                id: image_context.id,
+                kind: ContextKind::Image,
+                name: "Image".into(),
+                parent: None,
+                tooltip: None,
+                icon_path: None,
+                status: if image_context.is_loading() {
+                    ContextStatus::Loading {
+                        message: "Loading…".into(),
+                    }
+                } else if image_context.is_error() {
+                    ContextStatus::Error {
+                        message: "Failed to load image".into(),
+                    }
+                } else {
+                    ContextStatus::Ready
+                },
+                render_preview: Some(Rc::new({
+                    let image = image_context.original_image.clone();
+                    move |_, _| {
                        gpui::img(image.clone())
                            .max_w_96()
                            .max_h_96()
                            .into_any_element()
-                    })
-                    .into()
-                }
-            })),
-            handle: AgentContextHandle::Image(context),
+                    }
+                })),
+            },
        }
    }
 }

-#[derive(Debug, Clone)]
-struct ContextFileExcerpt {
-    pub file_name_and_range: SharedString,
-    pub full_path_and_range: SharedString,
-    pub parent_name: Option<SharedString>,
-    pub icon_path: Option<SharedString>,
+struct ContextPillPreview {
+    render_preview: Rc<dyn Fn(&mut Window, &mut App) -> AnyElement>,
 }

-impl ContextFileExcerpt {
-    pub fn new(full_path: &Path, line_range: Range<Point>, cx: &App) -> Self {
-        let full_path_string = full_path.to_string_lossy().into_owned();
-        let file_name = full_path
-            .file_name()
-            .map(|n| n.to_string_lossy().into_owned())
-            .unwrap_or_else(|| full_path_string.clone());
-
-        let line_range_text = format!(" ({}-{})", line_range.start.row + 1, line_range.end.row + 1);
-        let mut full_path_and_range = full_path_string;
-        full_path_and_range.push_str(&line_range_text);
-        let mut file_name_and_range = file_name;
-        file_name_and_range.push_str(&line_range_text);
-
-        let parent_name = full_path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|n| n.to_string_lossy().into_owned().into());
-
-        let icon_path = FileIcons::get_icon(&full_path, cx);
-
-        ContextFileExcerpt {
-            file_name_and_range: file_name_and_range.into(),
-            full_path_and_range: full_path_and_range.into(),
-            parent_name,
-            icon_path,
-        }
-    }
-
-    fn hover_view(&self, text: SharedString, cx: &mut App) -> Entity<ContextPillHover> {
-        let icon_path = self.icon_path.clone();
-        let full_path_and_range = self.full_path_and_range.clone();
-        ContextPillHover::new(cx, move |_, cx| {
-            v_flex()
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .w_full()
-                        .max_w_full()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border.opacity(0.6))
-                        .children(
-                            icon_path
-                                .clone()
-                                .map(Icon::from_path)
-                                .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
-                        )
-                        .child(
-                            // TODO: make this truncate on the left.
-                            Label::new(full_path_and_range.clone())
-                                .size(LabelSize::Small)
-                                .ml_1(),
-                        ),
-                )
-                .child(
-                    div()
-                        .id("context-pill-hover-contents")
-                        .overflow_scroll()
-                        .max_w_128()
-                        .max_h_96()
-                        .child(Label::new(text.clone()).buffer_font(cx)),
-                )
-                .into_any_element()
-        })
-    }
-}
-
-struct ContextPillHover {
-    render_hover: Box<dyn Fn(&mut Window, &mut App) -> AnyElement>,
-}
-
-impl ContextPillHover {
-    fn new(
-        cx: &mut App,
-        render_hover: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-    ) -> Entity<Self> {
-        cx.new(|_| Self {
-            render_hover: Box::new(render_hover),
-        })
-    }
-
-    fn new_text(content: SharedString, cx: &mut App) -> Entity<Self> {
-        Self::new(cx, move |_, _| {
-            div()
-                .id("context-pill-hover-contents")
-                .overflow_scroll()
-                .max_w_128()
-                .max_h_96()
-                .child(content.clone())
-                .into_any_element()
-        })
-    }
-}
-
-impl Render for ContextPillHover {
+impl Render for ContextPillPreview {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        tooltip_container(window, cx, move |this, window, cx| {
            this.occlude()
                .on_mouse_move(|_, _, cx| cx.stop_propagation())
                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .child((self.render_hover)(window, cx))
+                .child((self.render_preview)(window, cx))
        })
    }
 }
@@ -722,40 +488,45 @@ impl Component for AddedContext {
    }

    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let mut next_context_id = ContextId::zero();
        let image_ready = (
            "Ready",
-            AddedContext::image(ImageContext {
-                context_id: next_context_id.post_inc(),
-                project_path: None,
-                original_image: Arc::new(Image::empty()),
-                image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-            }),
+            AddedContext::new(
+                &AssistantContext::Image(ImageContext {
+                    id: ContextId(0),
+                    original_image: Arc::new(Image::empty()),
+                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
+                }),
+                cx,
+            ),
        );

        let image_loading = (
            "Loading",
-            AddedContext::image(ImageContext {
-                context_id: next_context_id.post_inc(),
-                project_path: None,
-                original_image: Arc::new(Image::empty()),
-                image_task: cx
-                    .background_spawn(async move {
-                        smol::Timer::after(Duration::from_secs(60 * 5)).await;
-                        Some(LanguageModelImage::empty())
-                    })
-                    .shared(),
-            }),
+            AddedContext::new(
+                &AssistantContext::Image(ImageContext {
+                    id: ContextId(1),
+                    original_image: Arc::new(Image::empty()),
+                    image_task: cx
+                        .background_spawn(async move {
+                            smol::Timer::after(Duration::from_secs(60 * 5)).await;
+                            Some(LanguageModelImage::empty())
+                        })
+                        .shared(),
+                }),
+                cx,
+            ),
        );

        let image_error = (
            "Error",
-            AddedContext::image(ImageContext {
-                context_id: next_context_id.post_inc(),
-                project_path: None,
-                original_image: Arc::new(Image::empty()),
-                image_task: Task::ready(None).shared(),
-            }),
+            AddedContext::new(
+                &AssistantContext::Image(ImageContext {
+                    id: ContextId(2),
+                    original_image: Arc::new(Image::empty()),
+                    image_task: Task::ready(None).shared(),
+                }),
+                cx,
+            ),
        );

        Some(
--- a/crates/agent/src/ui/max_mode_tooltip.rs
+++ b/crates/agent/src/ui/max_mode_tooltip.rs
@@ -1,33 +0,0 @@
-use gpui::{Context, IntoElement, Render, Window};
-use ui::{prelude::*, tooltip_container};
-
-pub struct MaxModeTooltip;
-
-impl MaxModeTooltip {
-    pub fn new(_cx: &mut Context<Self>) -> Self {
-        Self
-    }
-}
-
-impl Render for MaxModeTooltip {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(_window, cx, |this, _, _| {
-            this.gap_1()
-                .child(
-                    h_flex()
-                        .gap_1p5()
-                        .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small))
-                        .child(Label::new("Zed's Max Mode"))
-                )
-                .child(
-                    div()
-                        .max_w_72()
-                        .child(
-                            Label::new("This mode enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning, offering an unfettered agentic experience.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                        )
-                )
-        })
-    }
-}
--- a/crates/agent/src/ui/preview.rs
+++ b/crates/agent/src/ui/preview.rs
@@ -1,5 +0,0 @@
-mod agent_preview;
-mod usage_callouts;
-
-pub use agent_preview::*;
-pub use usage_callouts::*;
--- a/crates/agent/src/ui/preview/agent_preview.rs
+++ b/crates/agent/src/ui/preview/agent_preview.rs
@@ -1,92 +0,0 @@
-use collections::HashMap;
-use component::ComponentId;
-use gpui::{App, Entity, WeakEntity};
-use linkme::distributed_slice;
-use std::sync::OnceLock;
-use ui::{AnyElement, Component, ComponentScope, Window};
-use workspace::Workspace;
-
-use crate::{ActiveThread, ThreadStore};
-
-/// Function type for creating agent component previews
-pub type PreviewFn = fn(
-    WeakEntity<Workspace>,
-    Entity<ActiveThread>,
-    WeakEntity<ThreadStore>,
-    &mut Window,
-    &mut App,
-) -> Option<AnyElement>;
-
-/// Distributed slice for preview registration functions
-#[distributed_slice]
-pub static __ALL_AGENT_PREVIEWS: [fn() -> (ComponentId, PreviewFn)] = [..];
-
-/// Trait that must be implemented by components that provide agent previews.
-pub trait AgentPreview: Component + Sized {
-    #[allow(unused)] // We can't know this is used due to the distributed slice
-    fn scope(&self) -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    /// Static method to create a preview for this component type
-    fn agent_preview(
-        workspace: WeakEntity<Workspace>,
-        active_thread: Entity<ActiveThread>,
-        thread_store: WeakEntity<ThreadStore>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement>;
-}
-
-/// Register an agent preview for the given component type
-#[macro_export]
-macro_rules! register_agent_preview {
-    ($type:ty) => {
-        #[linkme::distributed_slice($crate::ui::preview::__ALL_AGENT_PREVIEWS)]
-        static __REGISTER_AGENT_PREVIEW: fn() -> (
-            component::ComponentId,
-            $crate::ui::preview::PreviewFn,
-        ) = || {
-            (
-                <$type as component::Component>::id(),
-                <$type as $crate::ui::preview::AgentPreview>::agent_preview,
-            )
-        };
-    };
-}
-
-/// Lazy initialized registry of preview functions
-static AGENT_PREVIEW_REGISTRY: OnceLock<HashMap<ComponentId, PreviewFn>> = OnceLock::new();
-
-/// Initialize the agent preview registry if needed
-fn get_or_init_registry() -> &'static HashMap<ComponentId, PreviewFn> {
-    AGENT_PREVIEW_REGISTRY.get_or_init(|| {
-        let mut map = HashMap::default();
-        for register_fn in __ALL_AGENT_PREVIEWS.iter() {
-            let (id, preview_fn) = register_fn();
-            map.insert(id, preview_fn);
-        }
-        map
-    })
-}
-
-/// Get a specific agent preview by component ID.
-pub fn get_agent_preview(
-    id: &ComponentId,
-    workspace: WeakEntity<Workspace>,
-    active_thread: Entity<ActiveThread>,
-    thread_store: WeakEntity<ThreadStore>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<AnyElement> {
-    let registry = get_or_init_registry();
-    registry
-        .get(id)
-        .and_then(|preview_fn| preview_fn(workspace, active_thread, thread_store, window, cx))
-}
-
-/// Get all registered agent previews.
-pub fn all_agent_previews() -> Vec<ComponentId> {
-    let registry = get_or_init_registry();
-    registry.keys().cloned().collect()
-}
--- a/crates/agent/src/ui/preview/usage_callouts.rs
+++ b/crates/agent/src/ui/preview/usage_callouts.rs
@@ -1,203 +0,0 @@
-use client::zed_urls;
-use component::{empty_example, example_group_with_title, single_example};
-use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
-use language_model::RequestUsage;
-use ui::{Callout, Color, Icon, IconName, IconSize, prelude::*};
-use zed_llm_client::{Plan, UsageLimit};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct UsageCallout {
-    plan: Plan,
-    usage: RequestUsage,
-}
-
-impl UsageCallout {
-    pub fn new(plan: Plan, usage: RequestUsage) -> Self {
-        Self { plan, usage }
-    }
-}
-
-impl RenderOnce for UsageCallout {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let (is_limit_reached, is_approaching_limit, remaining) = match self.usage.limit {
-            UsageLimit::Limited(limit) => {
-                let percentage = self.usage.amount as f32 / limit as f32;
-                let is_limit_reached = percentage >= 1.0;
-                let is_near_limit = percentage >= 0.9 && percentage < 1.0;
-                (
-                    is_limit_reached,
-                    is_near_limit,
-                    limit.saturating_sub(self.usage.amount),
-                )
-            }
-            UsageLimit::Unlimited => (false, false, 0),
-        };
-
-        if !is_limit_reached && !is_approaching_limit {
-            return div().into_any_element();
-        }
-
-        let (title, message, button_text, url) = if is_limit_reached {
-            match self.plan {
-                Plan::Free => (
-                    "Out of free prompts",
-                    "Upgrade to continue, wait for the next reset, or switch to API key."
-                        .to_string(),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::ZedProTrial => (
-                    "Out of trial prompts",
-                    "Upgrade to Zed Pro to continue, or switch to API key.".to_string(),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::ZedPro => (
-                    "Out of included prompts",
-                    "Enable usage-based billing to continue.".to_string(),
-                    "Manage",
-                    zed_urls::account_url(cx),
-                ),
-            }
-        } else {
-            match self.plan {
-                Plan::Free => (
-                    "Reaching free plan limit soon",
-                    format!(
-                        "{remaining} remaining - Upgrade to increase limit, or switch providers",
-                    ),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::ZedProTrial => (
-                    "Reaching trial limit soon",
-                    format!(
-                        "{remaining} remaining - Upgrade to increase limit, or switch providers",
-                    ),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                _ => return div().into_any_element(),
-            }
-        };
-
-        let icon = if is_limit_reached {
-            Icon::new(IconName::X)
-                .color(Color::Error)
-                .size(IconSize::XSmall)
-        } else {
-            Icon::new(IconName::Warning)
-                .color(Color::Warning)
-                .size(IconSize::XSmall)
-        };
-
-        Callout::multi_line(
-            title,
-            message,
-            icon,
-            button_text,
-            Box::new(move |_, _, cx| {
-                cx.open_url(&url);
-            }),
-        )
-        .into_any_element()
-    }
-}
-
-impl Component for UsageCallout {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn sort_name() -> &'static str {
-        "AgentUsageCallout"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let free_examples = example_group_with_title(
-            "Free Plan",
-            vec![
-                single_example(
-                    "Approaching limit (90%)",
-                    UsageCallout::new(
-                        Plan::Free,
-                        RequestUsage {
-                            limit: UsageLimit::Limited(50),
-                            amount: 45, // 90% of limit
-                        },
-                    )
-                    .into_any_element(),
-                ),
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::Free,
-                        RequestUsage {
-                            limit: UsageLimit::Limited(50),
-                            amount: 50, // 100% of limit
-                        },
-                    )
-                    .into_any_element(),
-                ),
-            ],
-        );
-
-        let trial_examples = example_group_with_title(
-            "Zed Pro Trial",
-            vec![
-                single_example(
-                    "Approaching limit (90%)",
-                    UsageCallout::new(
-                        Plan::ZedProTrial,
-                        RequestUsage {
-                            limit: UsageLimit::Limited(150),
-                            amount: 135, // 90% of limit
-                        },
-                    )
-                    .into_any_element(),
-                ),
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::ZedProTrial,
-                        RequestUsage {
-                            limit: UsageLimit::Limited(150),
-                            amount: 150, // 100% of limit
-                        },
-                    )
-                    .into_any_element(),
-                ),
-            ],
-        );
-
-        let pro_examples = example_group_with_title(
-            "Zed Pro",
-            vec![
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::ZedPro,
-                        RequestUsage {
-                            limit: UsageLimit::Limited(500),
-                            amount: 500, // 100% of limit
-                        },
-                    )
-                    .into_any_element(),
-                ),
-                empty_example("Unlimited plan (no callout shown)"),
-            ],
-        );
-
-        Some(
-            div()
-                .p_4()
-                .flex()
-                .flex_col()
-                .gap_4()
-                .child(free_examples)
-                .child(trial_examples)
-                .child(pro_examples)
-                .into_any_element(),
-        )
-    }
-}
--- a/crates/agent/src/ui/upsell.rs
+++ b/crates/agent/src/ui/upsell.rs
@@ -1,163 +0,0 @@
-use component::{Component, ComponentScope, single_example};
-use gpui::{
-    AnyElement, App, ClickEvent, IntoElement, ParentElement, RenderOnce, SharedString, Styled,
-    Window,
-};
-use theme::ActiveTheme;
-use ui::{
-    Button, ButtonCommon, ButtonStyle, Checkbox, Clickable, Color, Label, LabelCommon,
-    RegisterComponent, ToggleState, h_flex, v_flex,
-};
-
-/// A component that displays an upsell message with a call-to-action button
-///
-/// # Example
-/// ```
-/// let upsell = Upsell::new(
-///     "Upgrade to Zed Pro",
-///     "Get unlimited access to AI features and more",
-///     "Upgrade Now",
-///     Box::new(|_, _window, cx| {
-///         cx.open_url("https://zed.dev/pricing");
-///     }),
-///     Box::new(|_, _window, cx| {
-///         // Handle dismiss
-///     }),
-///     Box::new(|checked, window, cx| {
-///         // Handle don't show again
-///     }),
-/// );
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct Upsell {
-    title: SharedString,
-    message: SharedString,
-    cta_text: SharedString,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
-    on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
-    on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App)>,
-}
-
-impl Upsell {
-    /// Create a new upsell component
-    pub fn new(
-        title: impl Into<SharedString>,
-        message: impl Into<SharedString>,
-        cta_text: impl Into<SharedString>,
-        on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
-        on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
-        on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App)>,
-    ) -> Self {
-        Self {
-            title: title.into(),
-            message: message.into(),
-            cta_text: cta_text.into(),
-            on_click,
-            on_dismiss,
-            on_dont_show_again,
-        }
-    }
-}
-
-impl RenderOnce for Upsell {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .w_full()
-            .p_4()
-            .gap_3()
-            .bg(cx.theme().colors().surface_background)
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        Label::new(self.title)
-                            .size(ui::LabelSize::Large)
-                            .weight(gpui::FontWeight::BOLD),
-                    )
-                    .child(Label::new(self.message).color(Color::Muted)),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .items_center()
-                    .child(
-                        h_flex()
-                            .items_center()
-                            .gap_1()
-                            .child(
-                                Checkbox::new("dont-show-again", ToggleState::Unselected).on_click(
-                                    move |_, window, cx| {
-                                        (self.on_dont_show_again)(true, window, cx);
-                                    },
-                                ),
-                            )
-                            .child(
-                                Label::new("Don't show again")
-                                    .color(Color::Muted)
-                                    .size(ui::LabelSize::Small),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Button::new("dismiss-button", "Dismiss")
-                                    .style(ButtonStyle::Subtle)
-                                    .on_click(self.on_dismiss),
-                            )
-                            .child(
-                                Button::new("cta-button", self.cta_text)
-                                    .style(ButtonStyle::Filled)
-                                    .on_click(self.on_click),
-                            ),
-                    ),
-            )
-    }
-}
-
-impl Component for Upsell {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn name() -> &'static str {
-        "Upsell"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A promotional component that displays a message with a call-to-action.")
-    }
-
-    fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let examples = vec![
-            single_example(
-                "Default",
-                Upsell::new(
-                    "Upgrade to Zed Pro",
-                    "Get unlimited access to AI features and more with Zed Pro. Unlock advanced AI capabilities and other premium features.",
-                    "Upgrade Now",
-                    Box::new(|_, _, _| {}),
-                    Box::new(|_, _, _| {}),
-                    Box::new(|_, _, _| {}),
-                ).render(window, cx).into_any_element(),
-            ),
-            single_example(
-                "Short Message",
-                Upsell::new(
-                    "Try Zed Pro for free",
-                    "Start your 7-day trial today.",
-                    "Start Trial",
-                    Box::new(|_, _, _| {}),
-                    Box::new(|_, _, _| {}),
-                    Box::new(|_, _, _| {}),
-                ).render(window, cx).into_any_element(),
-            ),
-        ];
-
-        Some(v_flex().gap_4().children(examples).into_any_element())
-    }
-}
--- a/crates/agent/src/ui/usage_banner.rs
+++ b/crates/agent/src/ui/usage_banner.rs
@@ -0,0 +1,258 @@
+use client::zed_urls;
+use language_model::RequestUsage;
+use ui::{Banner, ProgressBar, Severity, prelude::*};
+use zed_llm_client::{Plan, UsageLimit};
+
+#[derive(IntoElement, RegisterComponent)]
+pub struct UsageBanner {
+    plan: Plan,
+    usage: RequestUsage,
+}
+
+impl UsageBanner {
+    pub fn new(plan: Plan, usage: RequestUsage) -> Self {
+        Self { plan, usage }
+    }
+}
+
+impl RenderOnce for UsageBanner {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let used_percentage = match self.usage.limit {
+            UsageLimit::Limited(limit) => Some((self.usage.amount as f32 / limit as f32) * 100.),
+            UsageLimit::Unlimited => None,
+        };
+
+        let (severity, message) = match self.usage.limit {
+            UsageLimit::Limited(limit) => {
+                if self.usage.amount >= limit {
+                    let message = match self.plan {
+                        Plan::ZedPro => "Monthly request limit reached",
+                        Plan::ZedProTrial => "Trial request limit reached",
+                        Plan::Free => "Free tier request limit reached",
+                    };
+
+                    (Severity::Error, message)
+                } else if (self.usage.amount as f32 / limit as f32) >= 0.9 {
+                    (Severity::Warning, "Approaching request limit")
+                } else {
+                    let message = match self.plan {
+                        Plan::ZedPro => "Zed Pro",
+                        Plan::ZedProTrial => "Zed Pro (Trial)",
+                        Plan::Free => "Zed Free",
+                    };
+
+                    (Severity::Info, message)
+                }
+            }
+            UsageLimit::Unlimited => {
+                let message = match self.plan {
+                    Plan::ZedPro => "Zed Pro",
+                    Plan::ZedProTrial => "Zed Pro (Trial)",
+                    Plan::Free => "Zed Free",
+                };
+
+                (Severity::Info, message)
+            }
+        };
+
+        let action = match self.plan {
+            Plan::ZedProTrial | Plan::Free => {
+                Button::new("upgrade", "Upgrade").on_click(|_, _window, cx| {
+                    cx.open_url(&zed_urls::account_url(cx));
+                })
+            }
+            Plan::ZedPro => Button::new("manage", "Manage").on_click(|_, _window, cx| {
+                cx.open_url(&zed_urls::account_url(cx));
+            }),
+        };
+
+        Banner::new().severity(severity).children(
+            h_flex().flex_1().gap_1().child(Label::new(message)).child(
+                h_flex()
+                    .flex_1()
+                    .justify_end()
+                    .gap_1p5()
+                    .children(used_percentage.map(|percent| {
+                        h_flex()
+                            .items_center()
+                            .w_full()
+                            .max_w(px(180.))
+                            .child(ProgressBar::new("usage", percent, 100., cx))
+                    }))
+                    .child(
+                        Label::new(match self.usage.limit {
+                            UsageLimit::Limited(limit) => {
+                                format!("{} / {limit}", self.usage.amount)
+                            }
+                            UsageLimit::Unlimited => format!("{} / ∞", self.usage.amount),
+                        })
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
+                    )
+                    // Note: This should go in the banner's `action_slot`, but doing that messes with the size of the
+                    // progress bar.
+                    .child(action),
+            ),
+        )
+    }
+}
+
+impl Component for UsageBanner {
+    fn sort_name() -> &'static str {
+        "AgentUsageBanner"
+    }
+
+    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
+        let trial_limit = Plan::ZedProTrial.model_requests_limit();
+        let trial_examples = vec![
+            single_example(
+                "Zed Pro Trial - New User",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedProTrial,
+                        RequestUsage {
+                            limit: trial_limit,
+                            amount: 10,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Zed Pro Trial - Approaching Limit",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedProTrial,
+                        RequestUsage {
+                            limit: trial_limit,
+                            amount: 135,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Zed Pro Trial - Request Limit Reached",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedProTrial,
+                        RequestUsage {
+                            limit: trial_limit,
+                            amount: 150,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+        ];
+
+        let free_limit = Plan::Free.model_requests_limit();
+        let free_examples = vec![
+            single_example(
+                "Free - Normal Usage",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::Free,
+                        RequestUsage {
+                            limit: free_limit,
+                            amount: 25,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Free - Approaching Limit",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::Free,
+                        RequestUsage {
+                            limit: free_limit,
+                            amount: 45,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Free - Request Limit Reached",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::Free,
+                        RequestUsage {
+                            limit: free_limit,
+                            amount: 50,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+        ];
+
+        let zed_pro_limit = Plan::ZedPro.model_requests_limit();
+        let zed_pro_examples = vec![
+            single_example(
+                "Zed Pro - Normal Usage",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedPro,
+                        RequestUsage {
+                            limit: zed_pro_limit,
+                            amount: 250,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Zed Pro - Approaching Limit",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedPro,
+                        RequestUsage {
+                            limit: zed_pro_limit,
+                            amount: 450,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+            single_example(
+                "Zed Pro - Request Limit Reached",
+                div()
+                    .size_full()
+                    .child(UsageBanner::new(
+                        Plan::ZedPro,
+                        RequestUsage {
+                            limit: zed_pro_limit,
+                            amount: 500,
+                        },
+                    ))
+                    .into_any_element(),
+            ),
+        ];
+
+        Some(
+            v_flex()
+                .gap_6()
+                .p_4()
+                .children(vec![
+                    Label::new("Trial Plan")
+                        .size(LabelSize::Large)
+                        .into_any_element(),
+                    example_group(trial_examples).vertical().into_any_element(),
+                    Label::new("Free Plan")
+                        .size(LabelSize::Large)
+                        .into_any_element(),
+                    example_group(free_examples).vertical().into_any_element(),
+                    Label::new("Pro Plan")
+                        .size(LabelSize::Large)
+                        .into_any_element(),
+                    example_group(zed_pro_examples)
+                        .vertical()
+                        .into_any_element(),
+                ])
+                .into_any_element(),
+        )
+    }
+}
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,3 +1,5 @@
+mod supported_countries;
+
 use std::str::FromStr;

 use anyhow::{Context as _, Result, anyhow};
@@ -9,6 +11,8 @@ use serde::{Deserialize, Serialize};
 use strum::{EnumIter, EnumString};
 use thiserror::Error;

+pub use supported_countries::*;
+
 pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";

 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
--- a/crates/anthropic/src/supported_countries.rs
+++ b/crates/anthropic/src/supported_countries.rs
@@ -0,0 +1,225 @@
+use std::collections::HashSet;
+use std::sync::LazyLock;
+
+/// Returns whether the given country code is supported by Anthropic.
+///
+/// <https://www.anthropic.com/supported-countries>
+pub fn is_supported_country(country_code: &str) -> bool {
+    SUPPORTED_COUNTRIES.contains(&country_code)
+}
+
+/// The list of country codes supported by Anthropic.
+///
+/// https://www.anthropic.com/supported-countries
+static SUPPORTED_COUNTRIES: LazyLock<HashSet<&'static str>> = LazyLock::new(|| {
+    vec![
+        "AL", // Albania
+        "DZ", // Algeria
+        "AS", // American Samoa (US)
+        "AD", // Andorra
+        "AO", // Angola
+        "AI", // Anguilla (UK)
+        "AG", // Antigua and Barbuda
+        "AR", // Argentina
+        "AM", // Armenia
+        "AU", // Australia
+        "AT", // Austria
+        "AZ", // Azerbaijan
+        "BS", // Bahamas
+        "BH", // Bahrain
+        "BD", // Bangladesh
+        "BB", // Barbados
+        "BE", // Belgium
+        "BZ", // Belize
+        "BJ", // Benin
+        "BM", // Bermuda (UK)
+        "BT", // Bhutan
+        "BO", // Bolivia
+        "BA", // Bosnia and Herzegovina
+        "BW", // Botswana
+        "BR", // Brazil
+        "IO", // British Indian Ocean Territory (UK)
+        "BN", // Brunei
+        "BG", // Bulgaria
+        "BF", // Burkina Faso
+        "BI", // Burundi
+        "CV", // Cabo Verde
+        "KH", // Cambodia
+        "CM", // Cameroon
+        "CA", // Canada
+        "KY", // Cayman Islands (UK)
+        "TD", // Chad
+        "CL", // Chile
+        "CX", // Christmas Island (AU)
+        "CC", // Cocos (Keeling) Islands (AU)
+        "CO", // Colombia
+        "KM", // Comoros
+        "CG", // Congo (Brazzaville)
+        "CK", // Cook Islands (NZ)
+        "CR", // Costa Rica
+        "CI", // Côte d'Ivoire
+        "HR", // Croatia
+        "CY", // Cyprus
+        "CZ", // Czechia (Czech Republic)
+        "DK", // Denmark
+        "DJ", // Djibouti
+        "DM", // Dominica
+        "DO", // Dominican Republic
+        "EC", // Ecuador
+        "EG", // Egypt
+        "SV", // El Salvador
+        "GQ", // Equatorial Guinea
+        "EE", // Estonia
+        "SZ", // Eswatini
+        "FK", // Falkland Islands (UK)
+        "FJ", // Fiji
+        "FI", // Finland
+        "FR", // France
+        "GF", // French Guiana (FR)
+        "PF", // French Polynesia (FR)
+        "TF", // French Southern Territories
+        "GA", // Gabon
+        "GM", // Gambia
+        "GE", // Georgia
+        "DE", // Germany
+        "GH", // Ghana
+        "GI", // Gibraltar (UK)
+        "GR", // Greece
+        "GD", // Grenada
+        "GT", // Guatemala
+        "GU", // Guam (US)
+        "GN", // Guinea
+        "GW", // Guinea-Bissau
+        "GY", // Guyana
+        "HT", // Haiti
+        "HM", // Heard Island and McDonald Islands (AU)
+        "HN", // Honduras
+        "HU", // Hungary
+        "IS", // Iceland
+        "IN", // India
+        "ID", // Indonesia
+        "IQ", // Iraq
+        "IE", // Ireland
+        "IL", // Israel
+        "IT", // Italy
+        "JM", // Jamaica
+        "JP", // Japan
+        "JO", // Jordan
+        "KZ", // Kazakhstan
+        "KE", // Kenya
+        "KI", // Kiribati
+        "KW", // Kuwait
+        "KG", // Kyrgyzstan
+        "LA", // Laos
+        "LV", // Latvia
+        "LB", // Lebanon
+        "LS", // Lesotho
+        "LR", // Liberia
+        "LI", // Liechtenstein
+        "LT", // Lithuania
+        "LU", // Luxembourg
+        "MG", // Madagascar
+        "MW", // Malawi
+        "MY", // Malaysia
+        "MV", // Maldives
+        "MT", // Malta
+        "MH", // Marshall Islands
+        "MR", // Mauritania
+        "MU", // Mauritius
+        "MX", // Mexico
+        "FM", // Micronesia
+        "MD", // Moldova
+        "MC", // Monaco
+        "MN", // Mongolia
+        "MS", // Montserrat (UK)
+        "ME", // Montenegro
+        "MA", // Morocco
+        "MZ", // Mozambique
+        "NA", // Namibia
+        "NR", // Nauru
+        "NP", // Nepal
+        "NL", // Netherlands
+        "NZ", // New Zealand
+        "NE", // Niger
+        "NG", // Nigeria
+        "NF", // Norfolk Island (AU)
+        "MK", // North Macedonia
+        "MI", // Northern Mariana Islands (UK)
+        "NO", // Norway
+        "NU", // Niue (NZ)
+        "OM", // Oman
+        "PK", // Pakistan
+        "PW", // Palau
+        "PS", // Palestine
+        "PA", // Panama
+        "PG", // Papua New Guinea
+        "PY", // Paraguay
+        "PE", // Peru
+        "PH", // Philippines
+        "PN", // Pitcairn (UK)
+        "PL", // Poland
+        "PT", // Portugal
+        "PR", // Puerto Rico (US)
+        "QA", // Qatar
+        "RO", // Romania
+        "RW", // Rwanda
+        "BL", // Saint Barthélemy (FR)
+        "KN", // Saint Kitts and Nevis
+        "LC", // Saint Lucia
+        "MF", // Saint Martin (FR)
+        "PM", // Saint Pierre and Miquelon (FR)
+        "VC", // Saint Vincent and the Grenadines
+        "WS", // Samoa
+        "SM", // San Marino
+        "ST", // São Tomé and Príncipe
+        "SA", // Saudi Arabia
+        "SN", // Senegal
+        "RS", // Serbia
+        "SC", // Seychelles
+        "SH", // Saint Helena, Ascension and Tristan da Cunha (UK)
+        "SL", // Sierra Leone
+        "SG", // Singapore
+        "SK", // Slovakia
+        "SI", // Slovenia
+        "SB", // Solomon Islands
+        "ZA", // South Africa
+        "KR", // South Korea
+        "ES", // Spain
+        "LK", // Sri Lanka
+        "SR", // Suriname
+        "SE", // Sweden
+        "CH", // Switzerland
+        "TW", // Taiwan
+        "TJ", // Tajikistan
+        "TZ", // Tanzania
+        "TH", // Thailand
+        "TL", // Timor-Leste
+        "TG", // Togo
+        "TK", // Tokelau (NZ)
+        "TO", // Tonga
+        "TT", // Trinidad and Tobago
+        "TN", // Tunisia
+        "TR", // Türkiye (Turkey)
+        "TM", // Turkmenistan
+        "TC", // Turks and Caicos Islands (UK)
+        "TV", // Tuvalu
+        "UG", // Uganda
+        "UA", // Ukraine (except Crimea, Donetsk, and Luhansk regions)
+        "AE", // United Arab Emirates
+        "GB", // United Kingdom
+        "UM", // United States Minor Outlying Islands (US)
+        "US", // United States of America
+        "UY", // Uruguay
+        "UZ", // Uzbekistan
+        "VU", // Vanuatu
+        "VA", // Vatican City
+        "VN", // Vietnam
+        "VI", // Virgin Islands (US)
+        "VG", // Virgin Islands (UK)
+        "WF", // Wallis and Futuna (FR)
+        "ZM", // Zambia
+        "ZW", // Zimbabwe
+    ]
+    .into_iter()
+    .collect()
+});
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -15,7 +15,6 @@ path = "src/askpass.rs"
 anyhow.workspace = true
 futures.workspace = true
 gpui.workspace = true
-shlex.workspace = true
 smol.workspace = true
 tempfile.workspace = true
 util.workspace = true
--- a/crates/reqwest_client/LICENSE-APACHE
+++ b/crates/reqwest_client/LICENSE-APACHE
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -72,7 +72,8 @@ impl AskPassSession {
        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
        let listener =
            UnixListener::bind(&askpass_socket).context("failed to create askpass socket")?;
-        let zed_path = get_shell_safe_zed_path()?;
+        let zed_path = std::env::current_exe()
+            .context("Failed to figure out current executable path for use in askpass")?;

        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
        let mut kill_tx = Some(askpass_kill_master_tx);
@@ -114,7 +115,7 @@ impl AskPassSession {
        // Create an askpass script that communicates back to this process.
        let askpass_script = format!(
            "{shebang}\n{print_args} | {zed_exe} --askpass={askpass_socket} 2> /dev/null \n",
-            zed_exe = zed_path,
+            zed_exe = zed_path.display(),
            askpass_socket = askpass_socket.display(),
            print_args = "printf '%s\\0' \"$@\"",
            shebang = "#!/bin/sh",
@@ -160,32 +161,6 @@ impl AskPassSession {
    }
 }

-#[cfg(unix)]
-fn get_shell_safe_zed_path() -> anyhow::Result<String> {
-    let zed_path = std::env::current_exe()
-        .context("Failed to figure out current executable path for use in askpass")?
-        .to_string_lossy()
-        .to_string();
-
-    // sanity check on unix systems that the path exists and is executable
-    // todo(windows): implement this check for windows (or just use `is-executable` crate)
-    use std::os::unix::fs::MetadataExt;
-    let metadata = std::fs::metadata(&zed_path)
-        .context("Failed to check metadata of Zed executable path for use in askpass")?;
-    let is_executable = metadata.is_file() && metadata.mode() & 0o111 != 0;
-    anyhow::ensure!(
-        is_executable,
-        "Failed to verify Zed executable path for use in askpass"
-    );
-    // As of writing, this can only be fail if the path contains a null byte, which shouldn't be possible
-    // but shlex has annotated the error as #[non_exhaustive] so we can't make it a compile error if other
-    // errors are introduced in the future :(
-    let zed_path_escaped = shlex::try_quote(&zed_path)
-        .context("Failed to shell-escape Zed executable path for use in askpass")?;
-
-    return Ok(zed_path_escaped.to_string());
-}
-
 /// The main function for when Zed is running in netcat mode for use in askpass.
 /// Called from both the remote server binary and the zed binary in their respective main functions.
 #[cfg(unix)]
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -49,7 +49,7 @@ menu.workspace = true
 multi_buffer.workspace = true
 parking_lot.workspace = true
 project.workspace = true
-rules_library.workspace = true
+prompt_library.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
 rope.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -101,7 +101,7 @@ pub fn init(
    SlashCommandSettings::register(cx);

    assistant_context_editor::init(client.clone(), cx);
-    rules_library::init(cx);
+    prompt_library::init(cx);
    init_language_model_settings(cx);
    assistant_slash_command::init(cx);
    assistant_tool::init(cx);
--- a/crates/assistant/src/assistant_configuration.rs
+++ b/crates/assistant/src/assistant_configuration.rs
@@ -193,7 +193,7 @@ impl Focusable for ConfigurationView {
 impl Item for ConfigurationView {
    type Event = ConfigurationViewEvent;

-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Configuration".into()
+    fn tab_content_text(&self, _window: &Window, _cx: &App) -> Option<SharedString> {
+        Some("Configuration".into())
    }
 }
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -25,15 +25,14 @@ use language_model::{
    AuthenticateError, ConfiguredModel, LanguageModelProviderId, LanguageModelRegistry,
 };
 use project::Project;
-use prompt_store::{PromptBuilder, UserPromptId};
-use rules_library::{RulesLibrary, open_rules_library};
+use prompt_library::{PromptLibrary, open_prompt_library};
+use prompt_store::{PromptBuilder, PromptId, UserPromptId};

 use search::{BufferSearchBar, buffer_search::DivRegistrar};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;

 use std::ops::Range;
-use std::path::Path;
 use std::{ops::ControlFlow, path::PathBuf, sync::Arc};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
@@ -44,7 +43,7 @@ use workspace::{
    dock::{DockPosition, Panel, PanelEvent},
    pane,
 };
-use zed_actions::assistant::{InlineAssist, OpenRulesLibrary, ShowConfiguration, ToggleFocus};
+use zed_actions::assistant::{InlineAssist, OpenPromptLibrary, ShowConfiguration, ToggleFocus};

 pub fn init(cx: &mut App) {
    workspace::FollowableViewRegistry::register::<ContextEditor>(cx);
@@ -58,11 +57,11 @@ pub fn init(cx: &mut App) {
                .register_action(AssistantPanel::show_configuration)
                .register_action(AssistantPanel::create_new_context)
                .register_action(AssistantPanel::restart_context_servers)
-                .register_action(|workspace, action: &OpenRulesLibrary, window, cx| {
+                .register_action(|workspace, action: &OpenPromptLibrary, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.deploy_rules_library(action, window, cx)
+                            panel.deploy_prompt_library(action, window, cx)
                        });
                    }
                });
@@ -273,8 +272,8 @@ impl AssistantPanel {
                                        .action("New Chat", Box::new(NewChat))
                                        .action("History", Box::new(DeployHistory))
                                        .action(
-                                            "Rules Library",
-                                            Box::new(OpenRulesLibrary::default()),
+                                            "Prompt Library",
+                                            Box::new(OpenPromptLibrary::default()),
                                        )
                                        .action("Configure", Box::new(ShowConfiguration))
                                        .action(zoom_label, Box::new(ToggleZoom))
@@ -477,7 +476,7 @@ impl AssistantPanel {
                        {
                            return;
                        }
-                        context.set_custom_summary(new_summary, cx)
+                        context.custom_summary(new_summary, cx)
                    });
                });
            }
@@ -1044,13 +1043,13 @@ impl AssistantPanel {
        }
    }

-    fn deploy_rules_library(
+    fn deploy_prompt_library(
        &mut self,
-        action: &OpenRulesLibrary,
+        action: &OpenPromptLibrary,
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        open_rules_library(
+        open_prompt_library(
            self.languages.clone(),
            Box::new(PromptLibraryInlineAssist),
            Arc::new(|| {
@@ -1060,9 +1059,9 @@ impl AssistantPanel {
                    None,
                ))
            }),
-            action
-                .prompt_to_select
-                .map(|uuid| UserPromptId(uuid).into()),
+            action.prompt_to_select.map(|uuid| PromptId::User {
+                uuid: UserPromptId(uuid),
+            }),
            cx,
        )
        .detach_and_log_err(cx);
@@ -1081,7 +1080,7 @@ impl AssistantPanel {

    pub fn open_saved_context(
        &mut self,
-        path: Arc<Path>,
+        path: PathBuf,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
@@ -1236,7 +1235,7 @@ impl Render for AssistantPanel {
                this.show_configuration_tab(window, cx)
            }))
            .on_action(cx.listener(AssistantPanel::deploy_history))
-            .on_action(cx.listener(AssistantPanel::deploy_rules_library))
+            .on_action(cx.listener(AssistantPanel::deploy_prompt_library))
            .child(registrar.size_full().child(self.pane.clone()))
            .into_any_element()
    }
@@ -1351,13 +1350,13 @@ impl Focusable for AssistantPanel {

 struct PromptLibraryInlineAssist;

-impl rules_library::InlineAssistDelegate for PromptLibraryInlineAssist {
+impl prompt_library::InlineAssistDelegate for PromptLibraryInlineAssist {
    fn assist(
        &self,
        prompt_editor: &Entity<Editor>,
        initial_prompt: Option<String>,
        window: &mut Window,
-        cx: &mut Context<RulesLibrary>,
+        cx: &mut Context<PromptLibrary>,
    ) {
        InlineAssistant::update_global(cx, |assistant, cx| {
            assistant.assist(&prompt_editor, None, None, initial_prompt, window, cx)
@@ -1392,7 +1391,7 @@ impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
    fn open_saved_context(
        &self,
        workspace: &mut Workspace,
-        path: Arc<Path>,
+        path: PathBuf,
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> Task<Result<()>> {
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -18,11 +18,11 @@ use editor::{
    },
 };
 use feature_flags::{
-    Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedProFeatureFlag,
+    Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedPro,
 };
 use fs::Fs;
 use futures::{
-    SinkExt, Stream, StreamExt, TryStreamExt as _,
+    SinkExt, Stream, StreamExt,
    channel::mpsc,
    future::{BoxFuture, LocalBoxFuture},
    join,
@@ -37,7 +37,7 @@ use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelTextStream, Role, report_assistant_event,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, LspAction, ProjectTransaction};
@@ -1652,7 +1652,7 @@ impl Render for PromptEditor {

                        let error_message = SharedString::from(error.to_string());
                        if error.error_code() == proto::ErrorCode::RateLimitExceeded
-                            && cx.has_flag::<ZedProFeatureFlag>()
+                            && cx.has_flag::<ZedPro>()
                        {
                            el.child(
                                v_flex()
@@ -1759,7 +1759,6 @@ impl PromptEditor {
            language_model_selector: cx.new(|cx| {
                let fs = fs.clone();
                LanguageModelSelector::new(
-                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
@@ -1767,6 +1766,7 @@ impl PromptEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
+                    ModelType::Default,
                    window,
                    cx,
                )
@@ -1815,6 +1815,10 @@ impl PromptEditor {
        self.editor = cx.new(|cx| {
            let mut editor = Editor::auto_height(Self::MAX_LINES as usize, window, cx);
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
+            editor.set_placeholder_text(
+                Self::placeholder_text(self.codegen.read(cx), window, cx),
+                cx,
+            );
            editor.set_placeholder_text("Add a prompt…", cx);
            editor.set_text(prompt, window, cx);
            if focus {
@@ -1962,7 +1966,7 @@ impl PromptEditor {
                    .update(cx, |editor, _| editor.set_read_only(false));
            }
            CodegenStatus::Error(error) => {
-                if cx.has_flag::<ZedProFeatureFlag>()
+                if cx.has_flag::<ZedPro>()
                    && error.error_code() == proto::ErrorCode::RateLimitExceeded
                    && !dismissed_rate_limit_notice()
                {
@@ -2977,7 +2981,6 @@ impl CodegenAlternative {
        Ok(LanguageModelRequest {
            thread_id: None,
            prompt_id: None,
-            mode: None,
            messages,
            tools: Vec::new(),
            stop: Vec::new(),
@@ -3020,7 +3023,7 @@ impl CodegenAlternative {
            }
        }

-        let http_client = cx.http_client();
+        let http_client = cx.http_client().clone();
        let telemetry = self.telemetry.clone();
        let language_name = {
            let multibuffer = self.buffer.read(cx);
@@ -3053,8 +3056,7 @@ impl CodegenAlternative {
                        let mut response_latency = None;
                        let request_start = Instant::now();
                        let diff = async {
-                            let chunks =
-                                StripInvalidSpans::new(stream?.stream.map_err(|e| e.into()));
+                            let chunks = StripInvalidSpans::new(stream?.stream);
                            futures::pin_mut!(chunks);
                            let mut diff = StreamingDiff::new(selected_text.to_string());
                            let mut line_diff = LineDiff::default();
--- a/crates/assistant/src/slash_command_settings.rs
+++ b/crates/assistant/src/slash_command_settings.rs
@@ -44,6 +44,4 @@ impl Settings for SlashCommandSettings {
                .chain(sources.server),
        )
    }
-
-    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -5,7 +5,7 @@ use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{
-    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
+    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
    actions::{MoveDown, MoveUp, SelectAll},
 };
 use fs::Fs;
@@ -19,7 +19,7 @@ use language_model::{
    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    Role, report_assistant_event,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType};
 use prompt_store::PromptBuilder;
 use settings::{Settings, update_settings_file};
 use std::{
@@ -294,7 +294,6 @@ impl TerminalInlineAssistant {
        Ok(LanguageModelRequest {
            thread_id: None,
            prompt_id: None,
-            mode: None,
            messages,
            tools: Vec::new(),
            stop: Vec::new(),
@@ -730,11 +729,6 @@ impl PromptEditor {
            );
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
            editor.set_placeholder_text(Self::placeholder_text(window, cx), cx);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: None,
-            });
            editor
        });

@@ -754,7 +748,6 @@ impl PromptEditor {
            language_model_selector: cx.new(|cx| {
                let fs = fs.clone();
                LanguageModelSelector::new(
-                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
@@ -762,6 +755,7 @@ impl PromptEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
+                    ModelType::Default,
                    window,
                    cx,
                )
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -35,7 +35,7 @@ use std::{
    fmt::Debug,
    iter, mem,
    ops::Range,
-    path::Path,
+    path::{Path, PathBuf},
    str::FromStr as _,
    sync::Arc,
    time::{Duration, Instant},
@@ -46,7 +46,7 @@ use ui::IconName;
 use util::{ResultExt, TryFutureExt, post_inc};
 use uuid::Uuid;

-#[derive(Clone, Debug, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Clone, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct ContextId(String);

 impl ContextId {
@@ -459,7 +459,6 @@ pub enum ContextEvent {
    ShowMaxMonthlySpendReachedError,
    MessagesEdited,
    SummaryChanged,
-    SummaryGenerated,
    StreamedCompletion,
    StartedThoughtProcess(Range<language::Anchor>),
    EndedThoughtProcess(language::Anchor),
@@ -483,7 +482,7 @@ pub enum ContextEvent {
 #[derive(Clone, Default, Debug)]
 pub struct ContextSummary {
    pub text: String,
-    pub done: bool,
+    done: bool,
    timestamp: clock::Lamport,
 }

@@ -641,14 +640,14 @@ pub struct AssistantContext {
    contents: Vec<Content>,
    messages_metadata: HashMap<MessageId, MessageMetadata>,
    summary: Option<ContextSummary>,
-    summary_task: Task<Option<()>>,
+    pending_summary: Task<Option<()>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
    token_count: Option<usize>,
    pending_token_count: Task<Option<()>>,
    pending_save: Task<Result<()>>,
    pending_cache_warming_task: Task<Option<()>>,
-    path: Option<Arc<Path>>,
+    path: Option<PathBuf>,
    _subscriptions: Vec<Subscription>,
    telemetry: Option<Arc<Telemetry>>,
    language_registry: Arc<LanguageRegistry>,
@@ -742,7 +741,7 @@ impl AssistantContext {
            thought_process_output_sections: Vec::new(),
            edits_since_last_parse: edits_since_last_slash_command_parse,
            summary: None,
-            summary_task: Task::ready(None),
+            pending_summary: Task::ready(None),
            completion_count: Default::default(),
            pending_completions: Default::default(),
            token_count: None,
@@ -839,7 +838,7 @@ impl AssistantContext {

    pub fn deserialize(
        saved_context: SavedContext,
-        path: Arc<Path>,
+        path: PathBuf,
        language_registry: Arc<LanguageRegistry>,
        prompt_builder: Arc<PromptBuilder>,
        slash_commands: Arc<SlashCommandWorkingSet>,
@@ -952,7 +951,7 @@ impl AssistantContext {

    fn flush_ops(&mut self, cx: &mut Context<AssistantContext>) {
        let mut changed_messages = HashSet::default();
-        let mut summary_generated = false;
+        let mut summary_changed = false;

        self.pending_ops.sort_unstable_by_key(|op| op.timestamp());
        for op in mem::take(&mut self.pending_ops) {
@@ -994,7 +993,7 @@ impl AssistantContext {
                        .map_or(true, |summary| new_summary.timestamp > summary.timestamp)
                    {
                        self.summary = Some(new_summary);
-                        summary_generated = true;
+                        summary_changed = true;
                    }
                }
                ContextOperation::SlashCommandStarted {
@@ -1073,9 +1072,8 @@ impl AssistantContext {
            cx.notify();
        }

-        if summary_generated {
+        if summary_changed {
            cx.emit(ContextEvent::SummaryChanged);
-            cx.emit(ContextEvent::SummaryGenerated);
            cx.notify();
        }
    }
@@ -1147,8 +1145,8 @@ impl AssistantContext {
        self.prompt_builder.clone()
    }

-    pub fn path(&self) -> Option<&Arc<Path>> {
-        self.path.as_ref()
+    pub fn path(&self) -> Option<&Path> {
+        self.path.as_deref()
    }

    pub fn summary(&self) -> Option<&ContextSummary> {
@@ -2371,7 +2369,6 @@ impl AssistantContext {
                                    });

                                match event {
-                                    LanguageModelCompletionEvent::StatusUpdate { .. } => {}
                                    LanguageModelCompletionEvent::StartMessage { .. } => {}
                                    LanguageModelCompletionEvent::Stop(reason) => {
                                        stop_reason = reason;
@@ -2429,8 +2426,8 @@ impl AssistantContext {
                                            cx,
                                        );
                                    }
-                                    LanguageModelCompletionEvent::ToolUse(_) |
-                                    LanguageModelCompletionEvent::UsageUpdate(_)  => {}
+                                    LanguageModelCompletionEvent::ToolUse(_) => {}
+                                    LanguageModelCompletionEvent::UsageUpdate(_) => {}
                                }
                            });

@@ -2560,7 +2557,6 @@ impl AssistantContext {
        let mut completion_request = LanguageModelRequest {
            thread_id: None,
            prompt_id: None,
-            mode: None,
            messages: Vec::new(),
            tools: Vec::new(),
            stop: Vec::new(),
@@ -2615,9 +2611,7 @@ impl AssistantContext {
                    .map(MessageContent::Text),
            );

-            if !request_message.contents_empty() {
-                completion_request.messages.push(request_message);
-            }
+            completion_request.messages.push(request_message);
        }

        if let RequestType::SuggestEdits = request_type {
@@ -2951,7 +2945,7 @@ impl AssistantContext {
        self.message_anchors.insert(insertion_ix, new_anchor);
    }

-    pub fn summarize(&mut self, mut replace_old: bool, cx: &mut Context<Self>) {
+    pub fn summarize(&mut self, replace_old: bool, cx: &mut Context<Self>) {
        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
            return;
        };
@@ -2971,18 +2965,7 @@ impl AssistantContext {
                cache: false,
            });

-            // If there is no summary, it is set with `done: false` so that "Loading Summary…" can
-            // be displayed.
-            if self.summary.is_none() {
-                self.summary = Some(ContextSummary {
-                    text: "".to_string(),
-                    done: false,
-                    timestamp: clock::Lamport::default(),
-                });
-                replace_old = true;
-            }
-
-            self.summary_task = cx.spawn(async move |this, cx| {
+            self.pending_summary = cx.spawn(async move |this, cx| {
                async move {
                    let stream = model.model.stream_completion_text(request, &cx);
                    let mut messages = stream.await?;
@@ -3007,7 +2990,6 @@ impl AssistantContext {
                            };
                            this.push_op(operation, cx);
                            cx.emit(ContextEvent::SummaryChanged);
-                            cx.emit(ContextEvent::SummaryGenerated);
                        })?;

                        // Stop if the LLM generated multiple lines.
@@ -3028,7 +3010,6 @@ impl AssistantContext {
                            };
                            this.push_op(operation, cx);
                            cx.emit(ContextEvent::SummaryChanged);
-                            cx.emit(ContextEvent::SummaryGenerated);
                        }
                    })?;

@@ -3182,7 +3163,7 @@ impl AssistantContext {
                fs.atomic_write(new_path.clone(), serde_json::to_string(&context).unwrap())
                    .await?;
                if let Some(old_path) = old_path {
-                    if new_path.as_path() != old_path.as_ref() {
+                    if new_path != old_path {
                        fs.remove_file(
                            &old_path,
                            RemoveOptions {
@@ -3194,14 +3175,14 @@ impl AssistantContext {
                    }
                }

-                this.update(cx, |this, _| this.path = Some(new_path.into()))?;
+                this.update(cx, |this, _| this.path = Some(new_path))?;
            }

            Ok(())
        });
    }

-    pub fn set_custom_summary(&mut self, custom_summary: String, cx: &mut Context<Self>) {
+    pub fn custom_summary(&mut self, custom_summary: String, cx: &mut Context<Self>) {
        let timestamp = self.next_timestamp();
        let summary = self.summary.get_or_insert(ContextSummary::default());
        summary.timestamp = timestamp;
@@ -3209,15 +3190,6 @@ impl AssistantContext {
        summary.text = custom_summary;
        cx.emit(ContextEvent::SummaryChanged);
    }
-
-    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Text Thread");
-
-    pub fn summary_or_default(&self) -> SharedString {
-        self.summary
-            .as_ref()
-            .map(|summary| summary.text.clone().into())
-            .unwrap_or(Self::DEFAULT_SUMMARY)
-    }
 }

 fn trimmed_text_in_range(buffer: &BufferSnapshot, range: Range<text::Anchor>) -> String {
@@ -3590,6 +3562,6 @@ impl SavedContextV0_1_0 {
 #[derive(Debug, Clone)]
 pub struct SavedContextMetadata {
    pub title: String,
-    pub path: Arc<Path>,
+    pub path: PathBuf,
    pub mtime: chrono::DateTime<chrono::Local>,
 }
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -959,7 +959,7 @@ async fn test_workflow_step_parsing(cx: &mut TestAppContext) {
    let deserialized_context = cx.new(|cx| {
        AssistantContext::deserialize(
            serialized_context,
-            Path::new("").into(),
+            Default::default(),
            registry.clone(),
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
@@ -1120,7 +1120,7 @@ async fn test_serialization(cx: &mut TestAppContext) {
    let deserialized_context = cx.new(|cx| {
        AssistantContext::deserialize(
            serialized_context,
-            Path::new("").into(),
+            Default::default(),
            registry.clone(),
            prompt_builder.clone(),
            Arc::new(SlashCommandWorkingSet::default()),
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -39,7 +39,7 @@ use language_model::{
    Role,
 };
 use language_model_selector::{
-    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ModelType, ToggleModelSelector,
 };
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
@@ -48,24 +48,14 @@ use project::{Project, Worktree};
 use rope::Point;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore, update_settings_file};
-use std::{
-    any::TypeId,
-    cmp,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
+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::*,
 };
 use util::{ResultExt, maybe};
-use workspace::{
-    CollaboratorId,
-    searchable::{Direction, SearchableItemHandle},
-};
+use workspace::searchable::{Direction, SearchableItemHandle};
 use workspace::{
    Save, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
    item::{self, FollowableItem, Item, ItemHandle},
@@ -149,7 +139,7 @@ pub trait AssistantPanelDelegate {
    fn open_saved_context(
        &self,
        workspace: &mut Workspace,
-        path: Arc<Path>,
+        path: PathBuf,
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> Task<Result<()>>;
@@ -301,7 +291,6 @@ impl ContextEditor {
            dragged_file_worktrees: Vec::new(),
            language_model_selector: cx.new(|cx| {
                LanguageModelSelector::new(
-                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
@@ -309,6 +298,7 @@ impl ContextEditor {
                            move |settings, _| settings.set_model(model.clone()),
                        );
                    },
+                    ModelType::Default,
                    window,
                    cx,
                )
@@ -628,7 +618,6 @@ impl ContextEditor {
                    context.save(Some(Duration::from_millis(500)), self.fs.clone(), cx);
                });
            }
-            ContextEvent::SummaryGenerated => {}
            ContextEvent::StartedThoughtProcess(range) => {
                let creases = self.insert_thought_process_output_sections(
                    [(
@@ -1057,7 +1046,7 @@ impl ContextEditor {
                        |_, _, _, _| Empty.into_any_element(),
                    )
                    .with_metadata(CreaseMetadata {
-                        icon_path: SharedString::from(IconName::Ai.path()),
+                        icon: IconName::Ai,
                        label: "Thinking Process".into(),
                    }),
                );
@@ -1100,7 +1089,7 @@ impl ContextEditor {
                        FoldPlaceholder {
                            render: render_fold_icon_button(
                                cx.entity().downgrade(),
-                                section.icon.path().into(),
+                                section.icon,
                                section.label.clone(),
                            ),
                            merge_adjacent: false,
@@ -1110,7 +1099,7 @@ impl ContextEditor {
                        |_, _, _, _| Empty.into_any_element(),
                    )
                    .with_metadata(CreaseMetadata {
-                        icon_path: section.icon.path().into(),
+                        icon: section.icon,
                        label: section.label,
                    }),
                );
@@ -2058,7 +2047,7 @@ impl ContextEditor {
                                FoldPlaceholder {
                                    render: render_fold_icon_button(
                                        weak_editor.clone(),
-                                        metadata.crease.icon_path.clone(),
+                                        metadata.crease.icon,
                                        metadata.crease.label.clone(),
                                    ),
                                    ..Default::default()
@@ -2190,8 +2179,13 @@ impl ContextEditor {
        });
    }

-    pub fn title(&self, cx: &App) -> SharedString {
-        self.context.read(cx).summary_or_default()
+    pub fn title(&self, cx: &App) -> Cow<str> {
+        self.context
+            .read(cx)
+            .summary()
+            .map(|summary| summary.text.clone())
+            .map(Cow::Owned)
+            .unwrap_or_else(|| Cow::Borrowed(DEFAULT_TAB_TITLE))
    }

    fn render_patch_block(
@@ -2854,7 +2848,7 @@ fn render_thought_process_fold_icon_button(

 fn render_fold_icon_button(
    editor: WeakEntity<Editor>,
-    icon_path: SharedString,
+    icon: IconName,
    label: SharedString,
 ) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
    Arc::new(move |fold_id, fold_range, _cx| {
@@ -2862,7 +2856,7 @@ fn render_fold_icon_button(
        ButtonLike::new(fold_id)
            .style(ButtonStyle::Filled)
            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::from_path(icon_path.clone()))
+            .child(Icon::new(icon))
            .child(Label::new(label.clone()).single_line())
            .on_click(move |_, window, cx| {
                editor
@@ -3166,8 +3160,8 @@ impl Focusable for ContextEditor {
 impl Item for ContextEditor {
    type Event = editor::EditorEvent;

-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        util::truncate_and_trailoff(&self.title(cx), MAX_TAB_TITLE_LEN).into()
+    fn tab_content_text(&self, _window: &Window, cx: &App) -> Option<SharedString> {
+        Some(util::truncate_and_trailoff(&self.title(cx), MAX_TAB_TITLE_LEN).into())
    }

    fn to_item_events(event: &Self::Event, mut f: impl FnMut(item::ItemEvent)) {
@@ -3420,14 +3414,15 @@ impl FollowableItem for ContextEditor {
        true
    }

-    fn set_leader_id(
+    fn set_leader_peer_id(
        &mut self,
-        leader_id: Option<CollaboratorId>,
+        leader_peer_id: Option<proto::PeerId>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        self.editor
-            .update(cx, |editor, cx| editor.set_leader_id(leader_id, window, cx))
+        self.editor.update(cx, |editor, cx| {
+            editor.set_leader_peer_id(leader_peer_id, window, cx)
+        })
    }

    fn dedup(&self, existing: &Self, _window: &Window, cx: &App) -> Option<item::Dedup> {
@@ -3773,7 +3768,7 @@ pub fn make_lsp_adapter_delegate(
        let Some(worktree) = project.worktrees(cx).next() else {
            return Ok(None::<Arc<dyn LspAdapterDelegate>>);
        };
-        let http_client = project.client().http_client();
+        let http_client = project.client().http_client().clone();
        project.lsp_store().update(cx, |_, cx| {
            Ok(Some(LocalLspAdapterDelegate::new(
                project.languages().clone(),
--- a/crates/assistant_context_editor/src/context_history.rs
+++ b/crates/assistant_context_editor/src/context_history.rs
@@ -108,8 +108,8 @@ impl EventEmitter<()> for ContextHistory {}
 impl Item for ContextHistory {
    type Event = ();

-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "History".into()
+    fn tab_content_text(&self, _window: &Window, _cx: &App) -> Option<SharedString> {
+        Some("History".into())
    }
 }

--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -7,8 +7,8 @@ use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
 use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::HashMap;
-use context_server::ContextServerDescriptorRegistry;
-use context_server::manager::{ContextServerManager, ContextServerStatus};
+use context_server::ContextServerFactoryRegistry;
+use context_server::manager::ContextServerManager;
 use fs::{Fs, RemoveOptions};
 use futures::StreamExt;
 use fuzzy::StringMatchCandidate;
@@ -20,7 +20,14 @@ use prompt_store::PromptBuilder;
 use regex::Regex;
 use rpc::AnyProtoClient;
 use std::sync::LazyLock;
-use std::{cmp::Reverse, ffi::OsStr, mem, path::Path, sync::Arc, time::Duration};
+use std::{
+    cmp::Reverse,
+    ffi::OsStr,
+    mem,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::Duration,
+};
 use util::{ResultExt, TryFutureExt};

 pub(crate) fn init(client: &AnyProtoClient) {
@@ -99,7 +106,7 @@ impl ContextStore {

            let this = cx.new(|cx: &mut Context<Self>| {
                let context_server_factory_registry =
-                    ContextServerDescriptorRegistry::default_global(cx);
+                    ContextServerFactoryRegistry::default_global(cx);
                let context_server_manager = cx.new(|cx| {
                    ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
                });
@@ -423,7 +430,7 @@ impl ContextStore {

    pub fn open_local_context(
        &mut self,
-        path: Arc<Path>,
+        path: PathBuf,
        cx: &Context<Self>,
    ) -> Task<Result<Entity<AssistantContext>>> {
        if let Some(existing_context) = self.loaded_context_for_path(&path, cx) {
@@ -471,7 +478,7 @@ impl ContextStore {

    pub fn delete_local_context(
        &mut self,
-        path: Arc<Path>,
+        path: PathBuf,
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        let fs = self.fs.clone();
@@ -494,7 +501,7 @@ impl ContextStore {
                        != Some(&path)
                });
                this.contexts_metadata
-                    .retain(|context| context.path.as_ref() != path.as_ref());
+                    .retain(|context| context.path != path);
            })?;

            Ok(())
@@ -504,7 +511,7 @@ impl ContextStore {
    fn loaded_context_for_path(&self, path: &Path, cx: &App) -> Option<Entity<AssistantContext>> {
        self.contexts.iter().find_map(|context| {
            let context = context.upgrade()?;
-            if context.read(cx).path().map(Arc::as_ref) == Some(path) {
+            if context.read(cx).path() == Some(path) {
                Some(context)
            } else {
                None
@@ -787,7 +794,7 @@ impl ContextStore {
                    {
                        contexts.push(SavedContextMetadata {
                            title: title.to_string(),
-                            path: path.into(),
+                            path,
                            mtime: metadata.mtime.timestamp_for_user().into(),
                        });
                    }
@@ -831,60 +838,54 @@ impl ContextStore {
    ) {
        let slash_command_working_set = self.slash_commands.clone();
        match event {
-            context_server::manager::Event::ServerStatusChanged { server_id, status } => {
-                match status {
-                    Some(ContextServerStatus::Running) => {
-                        if let Some(server) = context_server_manager.read(cx).get_server(server_id)
-                        {
-                            let context_server_manager = context_server_manager.clone();
-                            cx.spawn({
-                                let server = server.clone();
-                                let server_id = server_id.clone();
-                                async move |this, cx| {
-                                    let Some(protocol) = server.client() else {
-                                        return;
-                                    };
+            context_server::manager::Event::ServerStarted { server_id } => {
+                if let Some(server) = context_server_manager.read(cx).get_server(server_id) {
+                    let context_server_manager = context_server_manager.clone();
+                    cx.spawn({
+                        let server = server.clone();
+                        let server_id = server_id.clone();
+                        async move |this, cx| {
+                            let Some(protocol) = server.client() else {
+                                return;
+                            };

-                                    if protocol.capable(context_server::protocol::ServerCapability::Prompts) {
-                                        if let Some(prompts) = protocol.list_prompts().await.log_err() {
-                                            let slash_command_ids = prompts
-                                                .into_iter()
-                                                .filter(assistant_slash_commands::acceptable_prompt)
-                                                .map(|prompt| {
-                                                    log::info!(
-                                                        "registering context server command: {:?}",
-                                                        prompt.name
-                                                    );
-                                                    slash_command_working_set.insert(Arc::new(
-                                                        assistant_slash_commands::ContextServerSlashCommand::new(
-                                                            context_server_manager.clone(),
-                                                            &server,
-                                                            prompt,
-                                                        ),
-                                                    ))
-                                                })
-                                                .collect::<Vec<_>>();
+                            if protocol.capable(context_server::protocol::ServerCapability::Prompts) {
+                                if let Some(prompts) = protocol.list_prompts().await.log_err() {
+                                    let slash_command_ids = prompts
+                                        .into_iter()
+                                        .filter(assistant_slash_commands::acceptable_prompt)
+                                        .map(|prompt| {
+                                            log::info!(
+                                                "registering context server command: {:?}",
+                                                prompt.name
+                                            );
+                                            slash_command_working_set.insert(Arc::new(
+                                                assistant_slash_commands::ContextServerSlashCommand::new(
+                                                    context_server_manager.clone(),
+                                                    &server,
+                                                    prompt,
+                                                ),
+                                            ))
+                                        })
+                                        .collect::<Vec<_>>();

-                                            this.update( cx, |this, _cx| {
-                                                this.context_server_slash_command_ids
-                                                    .insert(server_id.clone(), slash_command_ids);
-                                            })
-                                            .log_err();
-                                        }
-                                    }
+                                    this.update( cx, |this, _cx| {
+                                        this.context_server_slash_command_ids
+                                            .insert(server_id.clone(), slash_command_ids);
+                                    })
+                                    .log_err();
                                }
-                            })
-                            .detach();
+                            }
                        }
-                    }
-                    None => {
-                        if let Some(slash_command_ids) =
-                            self.context_server_slash_command_ids.remove(server_id)
-                        {
-                            slash_command_working_set.remove(&slash_command_ids);
-                        }
-                    }
-                    _ => {}
+                    })
+                    .detach();
+                }
+            }
+            context_server::manager::Event::ServerStopped { server_id } => {
+                if let Some(slash_command_ids) =
+                    self.context_server_slash_command_ids.remove(server_id)
+                {
+                    slash_command_working_set.remove(&slash_command_ids);
                }
            }
        }
--- a/crates/assistant_settings/src/agent_profile.rs
+++ b/crates/assistant_settings/src/agent_profile.rs
@@ -5,41 +5,6 @@ use indexmap::IndexMap;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

-pub mod builtin_profiles {
-    use super::AgentProfileId;
-
-    pub const WRITE: &str = "write";
-    pub const ASK: &str = "ask";
-    pub const MANUAL: &str = "manual";
-
-    pub fn is_builtin(profile_id: &AgentProfileId) -> bool {
-        profile_id.as_str() == WRITE || profile_id.as_str() == ASK || profile_id.as_str() == MANUAL
-    }
-}
-
-#[derive(Default)]
-pub struct GroupedAgentProfiles {
-    pub builtin: IndexMap<AgentProfileId, AgentProfile>,
-    pub custom: IndexMap<AgentProfileId, AgentProfile>,
-}
-
-impl GroupedAgentProfiles {
-    pub fn from_settings(settings: &crate::AssistantSettings) -> Self {
-        let mut builtin = IndexMap::default();
-        let mut custom = IndexMap::default();
-
-        for (profile_id, profile) in settings.profiles.clone() {
-            if builtin_profiles::is_builtin(&profile_id) {
-                builtin.insert(profile_id, profile);
-            } else {
-                custom.insert(profile_id, profile);
-            }
-        }
-
-        Self { builtin, custom }
-    }
-}
-
 #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct AgentProfileId(pub Arc<str>);

--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -69,7 +69,7 @@ pub enum AssistantProviderContentV1 {
    },
 }

-#[derive(Default, Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct AssistantSettings {
    pub enabled: bool,
    pub button: bool,
@@ -87,8 +87,6 @@ pub struct AssistantSettings {
    pub profiles: IndexMap<AgentProfileId, AgentProfile>,
    pub always_allow_tool_actions: bool,
    pub notify_when_agent_waiting: NotifyWhenAgentWaiting,
-    pub stream_edits: bool,
-    pub single_file_review: bool,
 }

 impl AssistantSettings {
@@ -114,27 +112,13 @@ impl AssistantSettings {
 }

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

-impl AssistantSettingsContentInner {
-    fn for_v2(content: AssistantSettingsContentV2) -> Self {
-        AssistantSettingsContentInner::Versioned(Box::new(VersionedAssistantSettingsContent::V2(
-            content,
-        )))
-    }
-}
-
 impl JsonSchema for AssistantSettingsContent {
    fn schema_name() -> String {
        VersionedAssistantSettingsContent::schema_name()
@@ -149,21 +133,26 @@ impl JsonSchema for AssistantSettingsContent {
    }
 }

+impl Default for AssistantSettingsContent {
+    fn default() -> Self {
+        Self::Versioned(Box::new(VersionedAssistantSettingsContent::default()))
+    }
+}
+
 impl AssistantSettingsContent {
    pub fn is_version_outdated(&self) -> bool {
-        match &self.inner {
-            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match **settings {
                VersionedAssistantSettingsContent::V1(_) => true,
                VersionedAssistantSettingsContent::V2(_) => false,
            },
-            Some(AssistantSettingsContentInner::Legacy(_)) => true,
-            None => false,
+            AssistantSettingsContent::Legacy(_) => true,
        }
    }

    fn upgrade(&self) -> AssistantSettingsContentV2 {
-        match &self.inner {
-            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match **settings {
                VersionedAssistantSettingsContent::V1(ref settings) => AssistantSettingsContentV2 {
                    enabled: settings.enabled,
                    button: settings.button,
@@ -220,12 +209,10 @@ impl AssistantSettingsContent {
                    profiles: None,
                    always_allow_tool_actions: None,
                    notify_when_agent_waiting: None,
-                    stream_edits: None,
-                    single_file_review: None,
                },
                VersionedAssistantSettingsContent::V2(ref settings) => settings.clone(),
            },
-            Some(AssistantSettingsContentInner::Legacy(settings)) => AssistantSettingsContentV2 {
+            AssistantSettingsContent::Legacy(settings) => AssistantSettingsContentV2 {
                enabled: None,
                button: settings.button,
                dock: settings.dock,
@@ -249,16 +236,13 @@ impl AssistantSettingsContent {
                profiles: None,
                always_allow_tool_actions: None,
                notify_when_agent_waiting: None,
-                stream_edits: None,
-                single_file_review: None,
            },
-            None => AssistantSettingsContentV2::default(),
        }
    }

    pub fn set_dock(&mut self, dock: AssistantDockPosition) {
-        match &mut self.inner {
-            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match **settings {
                VersionedAssistantSettingsContent::V1(ref mut settings) => {
                    settings.dock = Some(dock);
                }
@@ -266,17 +250,9 @@ impl AssistantSettingsContent {
                    settings.dock = Some(dock);
                }
            },
-            Some(AssistantSettingsContentInner::Legacy(settings)) => {
+            AssistantSettingsContent::Legacy(settings) => {
                settings.dock = Some(dock);
            }
-            None => {
-                self.inner = Some(AssistantSettingsContentInner::for_v2(
-                    AssistantSettingsContentV2 {
-                        dock: Some(dock),
-                        ..Default::default()
-                    },
-                ))
-            }
        }
    }

@@ -284,8 +260,8 @@ impl AssistantSettingsContent {
        let model = language_model.id().0.to_string();
        let provider = language_model.provider_id().0.to_string();

-        match &mut self.inner {
-            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match **settings {
                VersionedAssistantSettingsContent::V1(ref mut settings) => {
                    match provider.as_ref() {
                        "zed.dev" => {
@@ -361,88 +337,56 @@ impl AssistantSettingsContent {
                    settings.default_model = Some(LanguageModelSelection { provider, model });
                }
            },
-            Some(AssistantSettingsContentInner::Legacy(settings)) => {
+            AssistantSettingsContent::Legacy(settings) => {
                if let Ok(model) = OpenAiModel::from_id(&language_model.id().0) {
                    settings.default_open_ai_model = Some(model);
                }
            }
-            None => {
-                self.inner = Some(AssistantSettingsContentInner::for_v2(
-                    AssistantSettingsContentV2 {
-                        default_model: Some(LanguageModelSelection { provider, model }),
-                        ..Default::default()
-                    },
-                ));
-            }
        }
    }

    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        self.v2_setting(|setting| {
-            setting.inline_assistant_model = Some(LanguageModelSelection { provider, model });
-            Ok(())
-        })
-        .ok();
+        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_commit_message_model(&mut self, provider: String, model: String) {
-        self.v2_setting(|setting| {
-            setting.commit_message_model = Some(LanguageModelSelection { provider, model });
-            Ok(())
-        })
-        .ok();
-    }
-
-    pub fn v2_setting(
-        &mut self,
-        f: impl FnOnce(&mut AssistantSettingsContentV2) -> anyhow::Result<()>,
-    ) -> anyhow::Result<()> {
-        match self.inner.get_or_insert_with(|| {
-            AssistantSettingsContentInner::for_v2(AssistantSettingsContentV2 {
-                ..Default::default()
-            })
-        }) {
-            AssistantSettingsContentInner::Versioned(boxed) => {
-                if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
-                    f(settings)
-                } else {
-                    Ok(())
-                }
+        if let AssistantSettingsContent::Versioned(boxed) = self {
+            if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
+                settings.commit_message_model = Some(LanguageModelSelection { provider, model });
            }
-            _ => Ok(()),
        }
    }

    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        self.v2_setting(|setting| {
-            setting.thread_summary_model = Some(LanguageModelSelection { provider, model });
-            Ok(())
-        })
-        .ok();
+        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) {
-        self.v2_setting(|setting| {
-            setting.always_allow_tool_actions = Some(allow);
-            Ok(())
-        })
-        .ok();
-    }
+        let AssistantSettingsContent::Versioned(boxed) = self else {
+            return;
+        };

-    pub fn set_single_file_review(&mut self, allow: bool) {
-        self.v2_setting(|setting| {
-            setting.single_file_review = Some(allow);
-            Ok(())
-        })
-        .ok();
+        if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
+            settings.always_allow_tool_actions = Some(allow);
+        }
    }

    pub fn set_profile(&mut self, profile_id: AgentProfileId) {
-        self.v2_setting(|setting| {
-            setting.default_profile = Some(profile_id);
-            Ok(())
-        })
-        .ok();
+        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(
@@ -450,7 +394,11 @@ impl AssistantSettingsContent {
        profile_id: AgentProfileId,
        profile: AgentProfile,
    ) -> Result<()> {
-        self.v2_setting(|settings| {
+        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");
@@ -476,9 +424,9 @@ impl AssistantSettingsContent {
                        .collect(),
                },
            );
+        }

-            Ok(())
-        })
+        Ok(())
    }
 }

@@ -509,13 +457,11 @@ impl Default for VersionedAssistantSettingsContent {
            profiles: None,
            always_allow_tool_actions: None,
            notify_when_agent_waiting: None,
-            stream_edits: None,
-            single_file_review: None,
        })
    }
 }

-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default)]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
 pub struct AssistantSettingsContentV2 {
    /// Whether the Assistant is enabled.
    ///
@@ -566,14 +512,6 @@ pub struct AssistantSettingsContentV2 {
    ///
    /// Default: "primary_screen"
    notify_when_agent_waiting: Option<NotifyWhenAgentWaiting>,
-    /// Whether to stream edits from the agent as they are received.
-    ///
-    /// Default: false
-    stream_edits: Option<bool>,
-    /// Whether to display agent edits in single-file editors in addition to the review multibuffer pane.
-    ///
-    /// Default: true
-    single_file_review: Option<bool>,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
@@ -736,8 +674,6 @@ impl Settings for AssistantSettings {
                &mut settings.notify_when_agent_waiting,
                value.notify_when_agent_waiting,
            );
-            merge(&mut settings.stream_edits, value.stream_edits);
-            merge(&mut settings.single_file_review, value.single_file_review);
            merge(&mut settings.default_profile, value.default_profile);

            if let Some(profiles) = value.profiles {
@@ -772,39 +708,6 @@ impl Settings for AssistantSettings {

        Ok(settings)
    }
-
-    fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut Self::FileContent) {
-        if let Some(b) = vscode
-            .read_value("chat.agent.enabled")
-            .and_then(|b| b.as_bool())
-        {
-            match &mut current.inner {
-                Some(AssistantSettingsContentInner::Versioned(versioned)) => {
-                    match versioned.as_mut() {
-                        VersionedAssistantSettingsContent::V1(setting) => {
-                            setting.enabled = Some(b);
-                            setting.button = Some(b);
-                        }
-
-                        VersionedAssistantSettingsContent::V2(setting) => {
-                            setting.enabled = Some(b);
-                            setting.button = Some(b);
-                        }
-                    }
-                }
-                Some(AssistantSettingsContentInner::Legacy(setting)) => setting.button = Some(b),
-                None => {
-                    current.inner = Some(AssistantSettingsContentInner::for_v2(
-                        AssistantSettingsContentV2 {
-                            enabled: Some(b),
-                            button: Some(b),
-                            ..Default::default()
-                        },
-                    ));
-                }
-            }
-        }
-    }
 }

 fn merge<T>(target: &mut T, value: Option<T>) {
@@ -848,32 +751,28 @@ mod tests {
            settings::SettingsStore::global(cx).update_settings_file::<AssistantSettings>(
                fs.clone(),
                |settings, _| {
-                    *settings = AssistantSettingsContent {
-                        inner: Some(AssistantSettingsContentInner::for_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,
-                                inline_alternatives: None,
-                                enabled: None,
-                                button: None,
-                                dock: None,
-                                default_width: None,
-                                default_height: None,
-                                enable_experimental_live_diffs: None,
-                                default_profile: None,
-                                profiles: None,
-                                always_allow_tool_actions: None,
-                                notify_when_agent_waiting: None,
-                                stream_edits: None,
-                                single_file_review: None,
-                            },
-                        )),
-                    }
+                    *settings = AssistantSettingsContent::Versioned(Box::new(
+                        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,
+                            inline_alternatives: None,
+                            enabled: None,
+                            button: None,
+                            dock: None,
+                            default_width: None,
+                            default_height: None,
+                            enable_experimental_live_diffs: None,
+                            default_profile: None,
+                            profiles: None,
+                            always_allow_tool_actions: None,
+                            notify_when_agent_waiting: None,
+                        }),
+                    ))
                },
            );
        });
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ b/crates/assistant_slash_commands/src/docs_command.rs
@@ -83,7 +83,7 @@ impl DocsSlashCommand {
                    .upgrade()
                    .ok_or_else(|| anyhow!("workspace was dropped"))?;
                let project = workspace.read(cx).project().clone();
-                anyhow::Ok(project.read(cx).client().http_client())
+                anyhow::Ok(project.read(cx).client().http_client().clone())
            });

            if let Some(http_client) = http_client.log_err() {
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -24,7 +24,6 @@ language.workspace = true
 language_model.workspace = true
 parking_lot.workspace = true
 project.workspace = true
-regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 text.workspace = true
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -29,10 +29,6 @@ impl ActionLog {
        }
    }

-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
    /// Notifies a diagnostics check
    pub fn checked_project_diagnostics(&mut self) {
        self.edited_since_project_diagnostics_check = false;
@@ -46,7 +42,6 @@ impl ActionLog {
    fn track_buffer_internal(
        &mut self,
        buffer: Entity<Buffer>,
-        is_created: bool,
        cx: &mut Context<Self>,
    ) -> &mut TrackedBuffer {
        let tracked_buffer = self
@@ -63,7 +58,11 @@ impl ActionLog {
                let base_text;
                let status;
                let unreviewed_changes;
-                if is_created {
+                if buffer
+                    .read(cx)
+                    .file()
+                    .map_or(true, |file| !file.disk_state().exists())
+                {
                    base_text = Rope::default();
                    status = TrackedBufferStatus::Created;
                    unreviewed_changes = Patch::new(vec![Edit {
@@ -150,7 +149,7 @@ impl ActionLog {
                    // resurrected externally, we want to clear the changes we
                    // were tracking and reset the buffer's state.
                    self.tracked_buffers.remove(&buffer);
-                    self.track_buffer_internal(buffer, false, cx);
+                    self.track_buffer_internal(buffer, cx);
                }
                cx.notify();
            }
@@ -264,22 +263,15 @@ impl ActionLog {
    }

    /// Track a buffer as read, so we can notify the model about user edits.
-    pub fn buffer_read(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.track_buffer_internal(buffer, false, cx);
-    }
-
-    /// Mark a buffer as edited, so we can refresh it in the context
-    pub fn buffer_created(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.edited_since_project_diagnostics_check = true;
-        self.tracked_buffers.remove(&buffer);
-        self.track_buffer_internal(buffer.clone(), true, cx);
+    pub fn track_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
+        self.track_buffer_internal(buffer, cx);
    }

    /// Mark a buffer as edited, so we can refresh it in the context
    pub fn buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
        self.edited_since_project_diagnostics_check = true;

-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
+        let tracked_buffer = self.track_buffer_internal(buffer.clone(), cx);
        if let TrackedBufferStatus::Deleted = tracked_buffer.status {
            tracked_buffer.status = TrackedBufferStatus::Modified;
        }
@@ -287,7 +279,7 @@ impl ActionLog {
    }

    pub fn will_delete_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
+        let tracked_buffer = self.track_buffer_internal(buffer.clone(), cx);
        match tracked_buffer.status {
            TrackedBufferStatus::Created => {
                self.tracked_buffers.remove(&buffer);
@@ -397,7 +389,7 @@ impl ActionLog {

                // Clear all tracked changes for this buffer and start over as if we just read it.
                self.tracked_buffers.remove(&buffer);
-                self.buffer_read(buffer.clone(), cx);
+                self.track_buffer_internal(buffer.clone(), cx);
                cx.notify();
                save
            }
@@ -708,7 +700,7 @@ mod tests {
            .unwrap();

        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| {
                buffer
                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E")], None, cx)
@@ -789,7 +781,7 @@ mod tests {
            .unwrap();

        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| {
                buffer
                    .edit([(Point::new(1, 0)..Point::new(2, 0), "")], None, cx)
@@ -871,7 +863,7 @@ mod tests {
            .unwrap();

        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| {
                buffer
                    .edit([(Point::new(1, 2)..Point::new(2, 3), "F\nGHI")], None, cx)
@@ -967,7 +959,7 @@ mod tests {
            .await
            .unwrap();
        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| buffer.set_text("lorem", cx));
            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
        });
@@ -1090,7 +1082,7 @@ mod tests {
            .update(cx, |project, cx| project.open_buffer(file2_path, cx))
            .await
            .unwrap();
-        action_log.update(cx, |log, cx| log.buffer_read(buffer2.clone(), cx));
+        action_log.update(cx, |log, cx| log.track_buffer(buffer2.clone(), cx));
        buffer2.update(cx, |buffer, cx| buffer.set_text("IPSUM", cx));
        action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
        project
@@ -1137,7 +1129,7 @@ mod tests {
            .unwrap();

        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| {
                buffer
                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
@@ -1272,7 +1264,7 @@ mod tests {
            .unwrap();

        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| {
                buffer
                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
@@ -1405,7 +1397,7 @@ mod tests {
            .await
            .unwrap();
        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
+            action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));
            buffer.update(cx, |buffer, cx| buffer.set_text("content", cx));
            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
        });
@@ -1463,7 +1455,7 @@ mod tests {
            .await
            .unwrap();

-        action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+        action_log.update(cx, |log, cx| log.track_buffer(buffer.clone(), cx));

        for _ in 0..operations {
            match rng.gen_range(0..100) {
@@ -1515,7 +1507,7 @@ mod tests {
            log::info!("quiescing...");
            cx.run_until_parked();
            action_log.update(cx, |log, cx| {
-                let tracked_buffer = log.tracked_buffers.get(&buffer).unwrap();
+                let tracked_buffer = log.track_buffer_internal(buffer.clone(), cx);
                let mut old_text = tracked_buffer.base_text.clone();
                let new_text = buffer.read(cx).as_rope();
                for edit in tracked_buffer.unreviewed_changes.edits() {
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -1,5 +1,4 @@
 mod action_log;
-pub mod outline;
 mod tool_registry;
 mod tool_schema;
 mod tool_working_set;
@@ -52,13 +51,6 @@ impl ToolUseStatus {
            ToolUseStatus::Error(out) => out.clone(),
        }
    }
-
-    pub fn error(&self) -> Option<SharedString> {
-        match self {
-            ToolUseStatus::Error(out) => Some(out.clone()),
-            _ => None,
-        }
-    }
 }

 /// The result of running a tool, containing both the asynchronous output
--- a/crates/assistant_tool/src/outline.rs
+++ b/crates/assistant_tool/src/outline.rs
@@ -1,132 +0,0 @@
-use crate::ActionLog;
-use anyhow::{Result, anyhow};
-use gpui::{AsyncApp, Entity};
-use language::{OutlineItem, ParseStatus};
-use project::Project;
-use regex::Regex;
-use std::fmt::Write;
-use text::Point;
-
-/// For files over this size, instead of reading them (or including them in context),
-/// we automatically provide the file's symbol outline instead, with line numbers.
-pub const AUTO_OUTLINE_SIZE: usize = 16384;
-
-pub async fn file_outline(
-    project: Entity<Project>,
-    path: String,
-    action_log: Entity<ActionLog>,
-    regex: Option<Regex>,
-    cx: &mut AsyncApp,
-) -> anyhow::Result<String> {
-    let buffer = {
-        let project_path = project.read_with(cx, |project, cx| {
-            project
-                .find_project_path(&path, cx)
-                .ok_or_else(|| anyhow!("Path {path} not found in project"))
-        })??;
-
-        project
-            .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-            .await?
-    };
-
-    action_log.update(cx, |action_log, cx| {
-        action_log.buffer_read(buffer.clone(), cx);
-    })?;
-
-    // Wait until the buffer has been fully parsed, so that we can read its outline.
-    let mut parse_status = buffer.read_with(cx, |buffer, _| buffer.parse_status())?;
-    while *parse_status.borrow() != ParseStatus::Idle {
-        parse_status.changed().await?;
-    }
-
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let Some(outline) = snapshot.outline(None) else {
-        return Err(anyhow!("No outline information available for this file."));
-    };
-
-    render_outline(
-        outline
-            .items
-            .into_iter()
-            .map(|item| item.to_point(&snapshot)),
-        regex,
-        0,
-        usize::MAX,
-    )
-    .await
-}
-
-pub async fn render_outline(
-    items: impl IntoIterator<Item = OutlineItem<Point>>,
-    regex: Option<Regex>,
-    offset: usize,
-    results_per_page: usize,
-) -> Result<String> {
-    let mut items = items.into_iter().skip(offset);
-
-    let entries = items
-        .by_ref()
-        .filter(|item| {
-            regex
-                .as_ref()
-                .is_none_or(|regex| regex.is_match(&item.text))
-        })
-        .take(results_per_page)
-        .collect::<Vec<_>>();
-    let has_more = items.next().is_some();
-
-    let mut output = String::new();
-    let entries_rendered = render_entries(&mut output, entries);
-
-    // Calculate pagination information
-    let page_start = offset + 1;
-    let page_end = offset + entries_rendered;
-    let total_symbols = if has_more {
-        format!("more than {}", page_end)
-    } else {
-        page_end.to_string()
-    };
-
-    // Add pagination information
-    if has_more {
-        writeln!(&mut output, "\nShowing symbols {page_start}-{page_end} (there were more symbols found; use offset: {page_end} to see next page)",
-        )
-    } else {
-        writeln!(
-            &mut output,
-            "\nShowing symbols {page_start}-{page_end} (total symbols: {total_symbols})",
-        )
-    }
-    .ok();
-
-    Ok(output)
-}
-
-fn render_entries(
-    output: &mut String,
-    items: impl IntoIterator<Item = OutlineItem<Point>>,
-) -> usize {
-    let mut entries_rendered = 0;
-
-    for item in items {
-        // Indent based on depth ("" for level 0, "  " for level 1, etc.)
-        for _ in 0..item.depth {
-            output.push(' ');
-        }
-        output.push_str(&item.text);
-
-        // Add position information - convert to 1-based line numbers for display
-        let start_line = item.range.start.row + 1;
-        let end_line = item.range.end.row + 1;
-
-        if start_line == end_line {
-            writeln!(output, " [L{}]", start_line).ok();
-        } else {
-            writeln!(output, " [L{}-{}]", start_line, end_line).ok();
-        }
-        entries_rendered += 1;
-    }
-
-    entries_rendered
-}
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -10,11 +10,6 @@ pub fn adapt_schema_to_format(
    json: &mut Value,
    format: LanguageModelToolSchemaFormat,
 ) -> Result<()> {
-    if let Value::Object(obj) = json {
-        obj.remove("$schema");
-        obj.remove("title");
-    }
-
    match format {
        LanguageModelToolSchemaFormat::JsonSchema => Ok(()),
        LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
@@ -35,12 +30,7 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
            }
        }

-        const KEYS_TO_REMOVE: [&str; 4] = [
-            "format",
-            "additionalProperties",
-            "exclusiveMinimum",
-            "exclusiveMaximum",
-        ];
+        const KEYS_TO_REMOVE: [&str; 2] = ["format", "$schema"];
        for key in KEYS_TO_REMOVE {
            obj.remove(key);
        }
@@ -55,7 +45,7 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
        }

        // If a type is not specified for an input parameter, add a default type
-        if matches!(obj.get("description"), Some(Value::String(_)))
+        if obj.contains_key("description")
            && !obj.contains_key("type")
            && !(obj.contains_key("anyOf")
                || obj.contains_key("oneOf")
@@ -127,37 +117,14 @@ mod tests {
                "type": "string"
            })
        );
-
-        // Ensure that we do not add a type if it is an object
-        let mut json = json!({
-            "description": {
-                "value": "abc",
-                "type": "string"
-            }
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": {
-                    "value": "abc",
-                    "type": "string"
-                }
-            })
-        );
    }

    #[test]
-    fn test_transform_removes_unsupported_keys() {
+    fn test_transform_removes_format() {
        let mut json = json!({
            "description": "A test field",
            "type": "integer",
-            "format": "uint32",
-            "exclusiveMinimum": 0,
-            "exclusiveMaximum": 100,
-            "additionalProperties": false
+            "format": "uint32"
        });

        adapt_to_json_schema_subset(&mut json).unwrap();
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -11,24 +11,16 @@ workspace = true
 [lib]
 path = "src/assistant_tools.rs"

-[features]
-eval = []
-
 [dependencies]
-aho-corasick.workspace = true
 anyhow.workspace = true
 assistant_tool.workspace = true
-assistant_settings.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 collections.workspace = true
 component.workspace = true
 editor.workspace = true
-derive_more.workspace = true
-feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
-handlebars = { workspace = true, features = ["rust-embed"] }
 html_to_markdown.workspace = true
 http_client.workspace = true
 indoc.workspace = true
@@ -37,27 +29,17 @@ language.workspace = true
 language_model.workspace = true
 linkme.workspace = true
 open.workspace = true
-paths.workspace = true
-portable-pty.workspace = true
 project.workspace = true
 regex.workspace = true
-rust-embed.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-streaming_diff.workspace = true
-strsim.workspace = true
-task.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-theme.workspace = true
 ui.workspace = true
 util.workspace = true
 web_search.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
+workspace-hack.workspace = true
+worktree.workspace = true
 zed_llm_client.workspace = true

 [dev-dependencies]
@@ -65,20 +47,11 @@ client = { workspace = true, features = ["test-support"] }
 clock = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
-gpui_tokio.workspace = true
-fs = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-language_models.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
 pretty_assertions.workspace = true
-reqwest_client.workspace = true
 settings = { workspace = true, features = ["test-support"] }
-task = { workspace = true, features = ["test-support"]}
-tempfile.workspace = true
-theme.workspace = true
 tree-sitter-rust.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-zlog.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,19 +1,25 @@
+mod batch_tool;
+mod code_action_tool;
+mod code_symbols_tool;
+mod contents_tool;
 mod copy_path_tool;
 mod create_directory_tool;
+mod create_file_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
-mod edit_agent;
+mod edit_file_tool;
 mod fetch_tool;
-mod find_path_tool;
 mod grep_tool;
 mod list_directory_tool;
 mod move_path_tool;
 mod now_tool;
 mod open_tool;
+mod path_search_tool;
 mod read_file_tool;
+mod rename_tool;
+mod replace;
 mod schema;
-mod streaming_edit_file_tool;
-mod templates;
+mod symbol_info_tool;
 mod terminal_tool;
 mod thinking_tool;
 mod ui;
@@ -23,57 +29,78 @@ use std::sync::Arc;

 use assistant_tool::ToolRegistry;
 use copy_path_tool::CopyPathTool;
-use gpui::{App, Entity};
+use gpui::App;
 use http_client::HttpClientWithUrl;
 use language_model::LanguageModelRegistry;
 use move_path_tool::MovePathTool;
 use web_search_tool::WebSearchTool;

-pub(crate) use templates::*;
-
+use crate::batch_tool::BatchTool;
+use crate::code_action_tool::CodeActionTool;
+use crate::code_symbols_tool::CodeSymbolsTool;
+use crate::contents_tool::ContentsTool;
 use crate::create_directory_tool::CreateDirectoryTool;
+use crate::create_file_tool::CreateFileTool;
 use crate::delete_path_tool::DeletePathTool;
 use crate::diagnostics_tool::DiagnosticsTool;
+use crate::edit_file_tool::EditFileTool;
 use crate::fetch_tool::FetchTool;
-use crate::find_path_tool::FindPathTool;
 use crate::grep_tool::GrepTool;
 use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
+use crate::open_tool::OpenTool;
+use crate::path_search_tool::PathSearchTool;
 use crate::read_file_tool::ReadFileTool;
-use crate::streaming_edit_file_tool::StreamingEditFileTool;
+use crate::rename_tool::RenameTool;
+use crate::symbol_info_tool::SymbolInfoTool;
+use crate::terminal_tool::TerminalTool;
 use crate::thinking_tool::ThinkingTool;

-pub use find_path_tool::FindPathToolInput;
-pub use open_tool::OpenTool;
+pub use create_file_tool::CreateFileToolInput;
+pub use edit_file_tool::EditFileToolInput;
+pub use path_search_tool::PathSearchToolInput;
 pub use read_file_tool::ReadFileToolInput;
-pub use streaming_edit_file_tool::StreamingEditFileToolInput;
-pub use terminal_tool::TerminalTool;

 pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    assistant_tool::init(cx);

    let registry = ToolRegistry::global(cx);
-    registry.register_tool(StreamingEditFileTool);
    registry.register_tool(TerminalTool);
+    registry.register_tool(BatchTool);
    registry.register_tool(CreateDirectoryTool);
+    registry.register_tool(CreateFileTool);
    registry.register_tool(CopyPathTool);
    registry.register_tool(DeletePathTool);
+    registry.register_tool(EditFileTool);
+    registry.register_tool(SymbolInfoTool);
+    registry.register_tool(CodeActionTool);
    registry.register_tool(MovePathTool);
    registry.register_tool(DiagnosticsTool);
    registry.register_tool(ListDirectoryTool);
    registry.register_tool(NowTool);
    registry.register_tool(OpenTool);
-    registry.register_tool(FindPathTool);
+    registry.register_tool(CodeSymbolsTool);
+    registry.register_tool(ContentsTool);
+    registry.register_tool(PathSearchTool);
    registry.register_tool(ReadFileTool);
    registry.register_tool(GrepTool);
+    registry.register_tool(RenameTool);
    registry.register_tool(ThinkingTool);
    registry.register_tool(FetchTool::new(http_client));
-    register_web_search_tool(&LanguageModelRegistry::global(cx), cx);
+
    cx.subscribe(
        &LanguageModelRegistry::global(cx),
        move |registry, event, cx| match event {
            language_model::Event::DefaultModelChanged => {
-                register_web_search_tool(&registry, cx);
+                let using_zed_provider = registry
+                    .read(cx)
+                    .default_model()
+                    .map_or(false, |default| default.is_provided_by_zed());
+                if using_zed_provider {
+                    ToolRegistry::global(cx).register_tool(WebSearchTool);
+                } else {
+                    ToolRegistry::global(cx).unregister_tool(WebSearchTool);
+                }
            }
            _ => {}
        },
@@ -81,59 +108,17 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    .detach();
 }

-fn register_web_search_tool(registry: &Entity<LanguageModelRegistry>, cx: &mut App) {
-    let using_zed_provider = registry
-        .read(cx)
-        .default_model()
-        .map_or(false, |default| default.is_provided_by_zed());
-    if using_zed_provider {
-        ToolRegistry::global(cx).register_tool(WebSearchTool);
-    } else {
-        ToolRegistry::global(cx).unregister_tool(WebSearchTool);
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use assistant_settings::AssistantSettings;
    use client::Client;
    use clock::FakeSystemClock;
    use http_client::FakeHttpClient;
-    use schemars::JsonSchema;
-    use serde::Serialize;
-    use settings::Settings;

-    #[test]
-    fn test_json_schema() {
-        #[derive(Serialize, JsonSchema)]
-        struct GetWeatherTool {
-            location: String,
-        }
-
-        let schema = schema::json_schema_for::<GetWeatherTool>(
-            language_model::LanguageModelToolSchemaFormat::JsonSchema,
-        )
-        .unwrap();
-
-        assert_eq!(
-            schema,
-            serde_json::json!({
-                "type": "object",
-                "properties": {
-                    "location": {
-                        "type": "string"
-                    }
-                },
-                "required": ["location"],
-            })
-        );
-    }
+    use super::*;

    #[gpui::test]
    fn test_builtin_tool_schema_compatibility(cx: &mut App) {
        settings::init(cx);
-        AssistantSettings::register(cx);

        let client = Client::new(
            Arc::new(FakeSystemClock::new()),
--- a/crates/assistant_tools/src/batch_tool.rs
+++ b/crates/assistant_tools/src/batch_tool.rs
@@ -0,0 +1,314 @@
+use crate::schema::json_schema_for;
+use anyhow::{Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult, ToolWorkingSet};
+use futures::future::join_all;
+use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+use ui::IconName;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ToolInvocation {
+    /// The name of the tool to invoke
+    pub name: String,
+
+    /// The input to the tool in JSON format
+    pub input: serde_json::Value,
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct BatchToolInput {
+    /// The tool invocations to run as a batch. These tools will be run either sequentially
+    /// or concurrently depending on the `run_tools_concurrently` flag.
+    ///
+    /// <example>
+    /// Basic file operations (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "read_file",
+    ///       "input": {
+    ///         "path": "src/main.rs"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "list_directory",
+    ///       "input": {
+    ///         "path": "src/lib"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "grep",
+    ///       "input": {
+    ///         "regex": "fn run\\("
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Multiple find-replace operations on the same file (sequential)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/config.rs",
+    ///         "display_description": "Update default timeout value",
+    ///         "find": "pub const DEFAULT_TIMEOUT: u64 = 30;\n\npub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";",
+    ///         "replace": "pub const DEFAULT_TIMEOUT: u64 = 60;\n\npub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/config.rs",
+    ///         "display_description": "Update API endpoint URL",
+    ///         "find": "pub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.example.com\";\n\npub const API_VERSION: &str = \"v1\";",
+    ///         "replace": "pub const MAX_RETRIES: u32 = 3;\n\npub const SERVER_URL: &str = \"https://api.newdomain.com\";\n\npub const API_VERSION: &str = \"v1\";"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": false
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Searching and analyzing code (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "grep",
+    ///       "input": {
+    ///         "regex": "impl Database"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "path_search",
+    ///       "input": {
+    ///         "glob": "**/*test*.rs"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    ///
+    /// <example>
+    /// Multi-file refactoring (concurrent)
+    ///
+    /// ```json
+    /// {
+    ///   "invocations": [
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/models/user.rs",
+    ///         "display_description": "Add email field to User struct",
+    ///         "find": "pub struct User {\n    pub id: u64,\n    pub username: String,\n    pub created_at: DateTime<Utc>,\n}",
+    ///         "replace": "pub struct User {\n    pub id: u64,\n    pub username: String,\n    pub email: String,\n    pub created_at: DateTime<Utc>,\n}"
+    ///       }
+    ///     },
+    ///     {
+    ///       "name": "find_replace_file",
+    ///       "input": {
+    ///         "path": "src/db/queries.rs",
+    ///         "display_description": "Update user insertion query",
+    ///         "find": "pub async fn insert_user(conn: &mut Connection, user: &User) -> Result<(), DbError> {\n    conn.execute(\n        \"INSERT INTO users (id, username, created_at) VALUES ($1, $2, $3)\",\n        &[&user.id, &user.username, &user.created_at],\n    ).await?;\n    \n    Ok(())\n}",
+    ///         "replace": "pub async fn insert_user(conn: &mut Connection, user: &User) -> Result<(), DbError> {\n    conn.execute(\n        \"INSERT INTO users (id, username, email, created_at) VALUES ($1, $2, $3, $4)\",\n        &[&user.id, &user.username, &user.email, &user.created_at],\n    ).await?;\n    \n    Ok(())\n}"
+    ///       }
+    ///     }
+    ///   ],
+    ///   "run_tools_concurrently": true
+    /// }
+    /// ```
+    /// </example>
+    pub invocations: Vec<ToolInvocation>,
+
+    /// Whether to run the tools in this batch concurrently. If this is false (the default), the tools will run sequentially.
+    #[serde(default)]
+    pub run_tools_concurrently: bool,
+}
+
+pub struct BatchTool;
+
+impl Tool for BatchTool {
+    fn name(&self) -> String {
+        "batch_tool".into()
+    }
+
+    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool {
+        serde_json::from_value::<BatchToolInput>(input.clone())
+            .map(|input| {
+                let working_set = ToolWorkingSet::default();
+                input.invocations.iter().any(|invocation| {
+                    working_set
+                        .tool(&invocation.name, cx)
+                        .map_or(false, |tool| tool.needs_confirmation(&invocation.input, cx))
+                })
+            })
+            .unwrap_or(false)
+    }
+
+    fn description(&self) -> String {
+        include_str!("./batch_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Cog
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<BatchToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<BatchToolInput>(input.clone()) {
+            Ok(input) => {
+                let count = input.invocations.len();
+                let mode = if input.run_tools_concurrently {
+                    "concurrently"
+                } else {
+                    "sequentially"
+                };
+
+                let first_tool_name = input
+                    .invocations
+                    .first()
+                    .map(|inv| inv.name.clone())
+                    .unwrap_or_default();
+
+                let all_same = input
+                    .invocations
+                    .iter()
+                    .all(|invocation| invocation.name == first_tool_name);
+
+                if all_same {
+                    format!(
+                        "Run `{}` {} times {}",
+                        first_tool_name,
+                        input.invocations.len(),
+                        mode
+                    )
+                } else {
+                    format!("Run {} tools {}", count, mode)
+                }
+            }
+            Err(_) => "Batch tools".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<BatchToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        if input.invocations.is_empty() {
+            return Task::ready(Err(anyhow!("No tool invocations provided"))).into();
+        }
+
+        let run_tools_concurrently = input.run_tools_concurrently;
+
+        let foreground_task = {
+            let working_set = ToolWorkingSet::default();
+            let invocations = input.invocations;
+            let messages = messages.to_vec();
+
+            cx.spawn(async move |cx| {
+                let mut tasks = Vec::new();
+                let mut tool_names = Vec::new();
+
+                for invocation in invocations {
+                    let tool_name = invocation.name.clone();
+                    tool_names.push(tool_name.clone());
+
+                    let tool = cx
+                        .update(|cx| working_set.tool(&tool_name, cx))
+                        .map_err(|err| {
+                            anyhow!("Failed to look up tool '{}': {}", tool_name, err)
+                        })?;
+
+                    let Some(tool) = tool else {
+                        return Err(anyhow!("Tool '{}' not found", tool_name));
+                    };
+
+                    let project = project.clone();
+                    let action_log = action_log.clone();
+                    let messages = messages.clone();
+                    let tool_result = cx
+                        .update(|cx| {
+                            tool.run(invocation.input, &messages, project, action_log, window, cx)
+                        })
+                        .map_err(|err| anyhow!("Failed to start tool '{}': {}", tool_name, err))?;
+
+                    tasks.push(tool_result.output);
+                }
+
+                Ok((tasks, tool_names))
+            })
+        };
+
+        cx.background_spawn(async move {
+            let (tasks, tool_names) = foreground_task.await?;
+            let mut results = Vec::with_capacity(tasks.len());
+
+            if run_tools_concurrently {
+                results.extend(join_all(tasks).await)
+            } else {
+                for task in tasks {
+                    results.push(task.await);
+                }
+            };
+
+            let mut formatted_results = String::new();
+            let mut error_occurred = false;
+
+            for (i, result) in results.into_iter().enumerate() {
+                let tool_name = &tool_names[i];
+
+                match result {
+                    Ok(output) => {
+                        formatted_results
+                            .push_str(&format!("Tool '{}' result:\n{}\n\n", tool_name, output));
+                    }
+                    Err(err) => {
+                        error_occurred = true;
+                        formatted_results
+                            .push_str(&format!("Tool '{}' error: {}\n\n", tool_name, err));
+                    }
+                }
+            }
+
+            if error_occurred {
+                formatted_results
+                    .push_str("Note: Some tool invocations failed. See individual results above.");
+            }
+
+            Ok(formatted_results.trim().to_string())
+        })
+        .into()
+    }
+}
--- a/crates/assistant_tools/src/code_action_tool.rs
+++ b/crates/assistant_tools/src/code_action_tool.rs
@@ -0,0 +1,388 @@
+use anyhow::{Context as _, Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use gpui::{AnyWindowHandle, App, Entity, Task};
+use language::{self, Anchor, Buffer, ToPointUtf16};
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::{self, LspAction, Project};
+use regex::Regex;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::{ops::Range, sync::Arc};
+use ui::IconName;
+
+use crate::schema::json_schema_for;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct CodeActionToolInput {
+    /// The relative path to the file containing the text range.
+    ///
+    /// WARNING: you MUST start this path with one of the project's root directories.
+    pub path: String,
+
+    /// The specific code action to execute.
+    ///
+    /// If this field is provided, the tool will execute the specified action.
+    /// If omitted, the tool will list all available code actions for the text range.
+    ///
+    /// Here are some actions that are commonly supported (but may not be for this particular
+    /// text range; you can omit this field to list all the actions, if you want to know
+    /// what your options are, or you can just try an action and if it fails I'll tell you
+    /// what the available actions were instead):
+    /// - "quickfix.all" - applies all available quick fixes in the range
+    /// - "source.organizeImports" - sorts and cleans up import statements
+    /// - "source.fixAll" - applies all available auto fixes
+    /// - "refactor.extract" - extracts selected code into a new function or variable
+    /// - "refactor.inline" - inlines a variable by replacing references with its value
+    /// - "refactor.rewrite" - general code rewriting operations
+    /// - "source.addMissingImports" - adds imports for references that lack them
+    /// - "source.removeUnusedImports" - removes imports that aren't being used
+    /// - "source.implementInterface" - generates methods required by an interface/trait
+    /// - "source.generateAccessors" - creates getter/setter methods
+    /// - "source.convertToAsyncFunction" - converts callback-style code to async/await
+    ///
+    /// Also, there is a special case: if you specify exactly "textDocument/rename" as the action,
+    /// then this will rename the symbol to whatever string you specified for the `arguments` field.
+    pub action: Option<String>,
+
+    /// Optional arguments to pass to the code action.
+    ///
+    /// For rename operations (when action="textDocument/rename"), this should contain the new name.
+    /// For other code actions, these arguments may be passed to the language server.
+    pub arguments: Option<serde_json::Value>,
+
+    /// The text that comes immediately before the text range in the file.
+    pub context_before_range: String,
+
+    /// The text range. This text must appear in the file right between `context_before_range`
+    /// and `context_after_range`.
+    ///
+    /// The file must contain exactly one occurrence of `context_before_range` followed by
+    /// `text_range` followed by `context_after_range`. If the file contains zero occurrences,
+    /// or if it contains more than one occurrence, the tool will fail, so it is absolutely
+    /// critical that you verify ahead of time that the string is unique. You can search
+    /// the file's contents to verify this ahead of time.
+    ///
+    /// To make the string more likely to be unique, include a minimum of 1 line of context
+    /// before the text range, as well as a minimum of 1 line of context after the text range.
+    /// If these lines of context are not enough to obtain a string that appears only once
+    /// in the file, then double the number of context lines until the string becomes unique.
+    /// (Start with 1 line before and 1 line after though, because too much context is
+    /// needlessly costly.)
+    ///
+    /// Do not alter the context lines of code in any way, and make sure to preserve all
+    /// whitespace and indentation for all lines of code. The combined string must be exactly
+    /// as it appears in the file, or else this tool call will fail.
+    pub text_range: String,
+
+    /// The text that comes immediately after the text range in the file.
+    pub context_after_range: String,
+}
+
+pub struct CodeActionTool;
+
+impl Tool for CodeActionTool {
+    fn name(&self) -> String {
+        "code_actions".into()
+    }
+
+    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("./code_action_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Wand
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<CodeActionToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<CodeActionToolInput>(input.clone()) {
+            Ok(input) => {
+                if let Some(action) = &input.action {
+                    if action == "textDocument/rename" {
+                        let new_name = match &input.arguments {
+                            Some(serde_json::Value::String(new_name)) => new_name.clone(),
+                            Some(value) => {
+                                if let Ok(new_name) =
+                                    serde_json::from_value::<String>(value.clone())
+                                {
+                                    new_name
+                                } else {
+                                    "invalid name".to_string()
+                                }
+                            }
+                            None => "missing name".to_string(),
+                        };
+                        format!("Rename '{}' to '{}'", input.text_range, new_name)
+                    } else {
+                        format!(
+                            "Execute code action '{}' for '{}'",
+                            action, input.text_range
+                        )
+                    }
+                } else {
+                    format!("List available code actions for '{}'", input.text_range)
+                }
+            }
+            Err(_) => "Perform code action".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        _window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<CodeActionToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        cx.spawn(async move |cx| {
+            let buffer = {
+                let project_path = project.read_with(cx, |project, cx| {
+                    project
+                        .find_project_path(&input.path, cx)
+                        .context("Path not found in project")
+                })??;
+
+                project.update(cx, |project, cx| project.open_buffer(project_path, cx))?.await?
+            };
+
+            action_log.update(cx, |action_log, cx| {
+                action_log.track_buffer(buffer.clone(), cx);
+            })?;
+
+            let range = {
+                let Some(range) = buffer.read_with(cx, |buffer, _cx| {
+                    find_text_range(&buffer, &input.context_before_range, &input.text_range, &input.context_after_range)
+                })? else {
+                    return Err(anyhow!(
+                        "Failed to locate the text specified by context_before_range, text_range, and context_after_range. Make sure context_before_range and context_after_range each match exactly once in the file."
+                    ));
+                };
+
+                range
+            };
+
+            if let Some(action_type) = &input.action {
+                // Special-case the `rename` operation
+                let response = if action_type == "textDocument/rename" {
+                    let Some(new_name) = input.arguments.and_then(|args| serde_json::from_value::<String>(args).ok()) else {
+                        return Err(anyhow!("For rename operations, 'arguments' must be a string containing the new name"));
+                    };
+
+                    let position = buffer.read_with(cx, |buffer, _| {
+                        range.start.to_point_utf16(&buffer.snapshot())
+                    })?;
+
+                    project
+                        .update(cx, |project, cx| {
+                            project.perform_rename(buffer.clone(), position, new_name.clone(), cx)
+                        })?
+                        .await?;
+
+                    format!("Renamed '{}' to '{}'", input.text_range, new_name)
+                } else {
+                    // Get code actions for the range
+                    let actions = project
+                        .update(cx, |project, cx| {
+                            project.code_actions(&buffer, range.clone(), None, cx)
+                        })?
+                        .await?;
+
+                    if actions.is_empty() {
+                        return Err(anyhow!("No code actions available for this range"));
+                    }
+
+                    // Find all matching actions
+                    let regex = match Regex::new(action_type) {
+                        Ok(regex) => regex,
+                        Err(err) => return Err(anyhow!("Invalid regex pattern: {}", err)),
+                    };
+                    let mut matching_actions = actions
+                        .into_iter()
+                        .filter(|action| { regex.is_match(action.lsp_action.title()) });
+
+                    let Some(action) = matching_actions.next() else {
+                        return Err(anyhow!("No code actions match the pattern: {}", action_type));
+                    };
+
+                    // There should have been exactly one matching action.
+                    if let Some(second) = matching_actions.next() {
+                        let mut all_matches = vec![action, second];
+
+                        all_matches.extend(matching_actions);
+
+                        return Err(anyhow!(
+                            "Pattern '{}' matches multiple code actions: {}",
+                            action_type,
+                            all_matches.into_iter().map(|action| action.lsp_action.title().to_string()).collect::<Vec<_>>().join(", ")
+                        ));
+                    }
+
+                    let title = action.lsp_action.title().to_string();
+
+                    project
+                        .update(cx, |project, cx| {
+                            project.apply_code_action(buffer.clone(), action, true, cx)
+                        })?
+                        .await?;
+
+                    format!("Completed code action: {}", title)
+                };
+
+                project
+                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
+                    .await?;
+
+                action_log.update(cx, |log, cx| {
+                    log.buffer_edited(buffer.clone(), cx)
+                })?;
+
+                Ok(response)
+            } else {
+                // No action specified, so list the available ones.
+                let (position_start, position_end) = buffer.read_with(cx, |buffer, _| {
+                    let snapshot = buffer.snapshot();
+                    (
+                        range.start.to_point_utf16(&snapshot),
+                        range.end.to_point_utf16(&snapshot)
+                    )
+                })?;
+
+                // Convert position to display coordinates (1-based)
+                let position_start_display = language::Point {
+                    row: position_start.row + 1,
+                    column: position_start.column + 1,
+                };
+
+                let position_end_display = language::Point {
+                    row: position_end.row + 1,
+                    column: position_end.column + 1,
+                };
+
+                // Get code actions for the range
+                let actions = project
+                    .update(cx, |project, cx| {
+                        project.code_actions(&buffer, range.clone(), None, cx)
+                    })?
+                    .await?;
+
+                let mut response = format!(
+                    "Available code actions for text range '{}' at position {}:{} to {}:{} (UTF-16 coordinates):\n\n",
+                    input.text_range,
+                    position_start_display.row, position_start_display.column,
+                    position_end_display.row, position_end_display.column
+                );
+
+                if actions.is_empty() {
+                    response.push_str("No code actions available for this range.");
+                } else {
+                    for (i, action) in actions.iter().enumerate() {
+                        let title = match &action.lsp_action {
+                            LspAction::Action(code_action) => code_action.title.as_str(),
+                            LspAction::Command(command) => command.title.as_str(),
+                            LspAction::CodeLens(code_lens) => {
+                                if let Some(cmd) = &code_lens.command {
+                                    cmd.title.as_str()
+                                } else {
+                                    "Unknown code lens"
+                                }
+                            },
+                        };
+
+                        let kind = match &action.lsp_action {
+                            LspAction::Action(code_action) => {
+                                if let Some(kind) = &code_action.kind {
+                                    kind.as_str()
+                                } else {
+                                    "unknown"
+                                }
+                            },
+                            LspAction::Command(_) => "command",
+                            LspAction::CodeLens(_) => "code_lens",
+                        };
+
+                        response.push_str(&format!("{}. {title} ({kind})\n", i + 1));
+                    }
+                }
+
+                Ok(response)
+            }
+        }).into()
+    }
+}
+
+/// Finds the range of the text in the buffer, if it appears between context_before_range
+/// and context_after_range, and if that combined string has one unique result in the buffer.
+///
+/// If an exact match fails, it tries adding a newline to the end of context_before_range and
+/// to the beginning of context_after_range to accommodate line-based context matching.
+fn find_text_range(
+    buffer: &Buffer,
+    context_before_range: &str,
+    text_range: &str,
+    context_after_range: &str,
+) -> Option<Range<Anchor>> {
+    let snapshot = buffer.snapshot();
+    let text = snapshot.text();
+
+    // First try with exact match
+    let search_string = format!("{context_before_range}{text_range}{context_after_range}");
+    let mut positions = text.match_indices(&search_string);
+    let position_result = positions.next();
+
+    if let Some(position) = position_result {
+        // Check if the matched string is unique
+        if positions.next().is_none() {
+            let range_start = position.0 + context_before_range.len();
+            let range_end = range_start + text_range.len();
+            let range_start_anchor = snapshot.anchor_before(snapshot.offset_to_point(range_start));
+            let range_end_anchor = snapshot.anchor_before(snapshot.offset_to_point(range_end));
+
+            return Some(range_start_anchor..range_end_anchor);
+        }
+    }
+
+    // If exact match fails or is not unique, try with line-based context
+    // Add a newline to the end of before context and beginning of after context
+    let line_based_before = if context_before_range.ends_with('\n') {
+        context_before_range.to_string()
+    } else {
+        format!("{context_before_range}\n")
+    };
+
+    let line_based_after = if context_after_range.starts_with('\n') {
+        context_after_range.to_string()
+    } else {
+        format!("\n{context_after_range}")
+    };
+
+    let line_search_string = format!("{line_based_before}{text_range}{line_based_after}");
+    let mut line_positions = text.match_indices(&line_search_string);
+    let line_position = line_positions.next()?;
+
+    // The line-based search string must also appear exactly once
+    if line_positions.next().is_some() {
+        return None;
+    }
+
+    let line_range_start = line_position.0 + line_based_before.len();
+    let line_range_end = line_range_start + text_range.len();
+    let line_range_start_anchor =
+        snapshot.anchor_before(snapshot.offset_to_point(line_range_start));
+    let line_range_end_anchor = snapshot.anchor_before(snapshot.offset_to_point(line_range_end));
+
+    Some(line_range_start_anchor..line_range_end_anchor)
+}
--- a/crates/assistant_tools/src/code_symbols_tool.rs
+++ b/crates/assistant_tools/src/code_symbols_tool.rs
@@ -0,0 +1,367 @@
+use std::fmt::Write;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::schema::json_schema_for;
+use anyhow::{Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use collections::IndexMap;
+use gpui::{AnyWindowHandle, App, AsyncApp, Entity, Task};
+use language::{OutlineItem, ParseStatus, Point};
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::{Project, Symbol};
+use regex::{Regex, RegexBuilder};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use ui::IconName;
+use util::markdown::MarkdownString;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct CodeSymbolsInput {
+    /// The relative path of the source code file to read and get the symbols for.
+    /// This tool should only be used on source code files, never on any other type of file.
+    ///
+    /// This path should never be absolute, and the first component
+    /// of the path should always be a root directory in a project.
+    ///
+    /// If no path is specified, this tool returns a flat list of all symbols in the project
+    /// instead of a hierarchical outline of a specific file.
+    ///
+    /// <example>
+    /// If the project has the following root directories:
+    ///
+    /// - directory1
+    /// - directory2
+    ///
+    /// If you want to access `file.md` in `directory1`, you should use the path `directory1/file.md`.
+    /// If you want to access `file.md` in `directory2`, you should use the path `directory2/file.md`.
+    /// </example>
+    #[serde(default)]
+    pub path: Option<String>,
+
+    /// Optional regex pattern to filter symbols by name.
+    /// When provided, only symbols whose names match this pattern will be included in the results.
+    ///
+    /// <example>
+    /// To find only symbols that contain the word "test", use the regex pattern "test".
+    /// To find methods that start with "get_", use the regex pattern "^get_".
+    /// </example>
+    #[serde(default)]
+    pub regex: Option<String>,
+
+    /// Whether the regex is case-sensitive. Defaults to false (case-insensitive).
+    ///
+    /// <example>
+    /// Set to `true` to make regex matching case-sensitive.
+    /// </example>
+    #[serde(default)]
+    pub case_sensitive: bool,
+
+    /// Optional starting position for paginated results (0-based).
+    /// When not provided, starts from the beginning.
+    #[serde(default)]
+    pub offset: u32,
+}
+
+impl CodeSymbolsInput {
+    /// Which page of search results this is.
+    pub fn page(&self) -> u32 {
+        1 + (self.offset / RESULTS_PER_PAGE)
+    }
+}
+
+const RESULTS_PER_PAGE: u32 = 2000;
+
+pub struct CodeSymbolsTool;
+
+impl Tool for CodeSymbolsTool {
+    fn name(&self) -> String {
+        "code_symbols".into()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("./code_symbols_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Code
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<CodeSymbolsInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<CodeSymbolsInput>(input.clone()) {
+            Ok(input) => {
+                let page = input.page();
+
+                match &input.path {
+                    Some(path) => {
+                        let path = MarkdownString::inline_code(path);
+                        if page > 1 {
+                            format!("List page {page} of code symbols for {path}")
+                        } else {
+                            format!("List code symbols for {path}")
+                        }
+                    }
+                    None => {
+                        if page > 1 {
+                            format!("List page {page} of project symbols")
+                        } else {
+                            "List all project symbols".to_string()
+                        }
+                    }
+                }
+            }
+            Err(_) => "List code symbols".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        _window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<CodeSymbolsInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        let regex = match input.regex {
+            Some(regex_str) => match RegexBuilder::new(&regex_str)
+                .case_insensitive(!input.case_sensitive)
+                .build()
+            {
+                Ok(regex) => Some(regex),
+                Err(err) => return Task::ready(Err(anyhow!("Invalid regex: {err}"))).into(),
+            },
+            None => None,
+        };
+
+        cx.spawn(async move |cx| match input.path {
+            Some(path) => file_outline(project, path, action_log, regex, cx).await,
+            None => project_symbols(project, regex, input.offset, cx).await,
+        })
+        .into()
+    }
+}
+
+pub async fn file_outline(
+    project: Entity<Project>,
+    path: String,
+    action_log: Entity<ActionLog>,
+    regex: Option<Regex>,
+    cx: &mut AsyncApp,
+) -> anyhow::Result<String> {
+    let buffer = {
+        let project_path = project.read_with(cx, |project, cx| {
+            project
+                .find_project_path(&path, cx)
+                .ok_or_else(|| anyhow!("Path {path} not found in project"))
+        })??;
+
+        project
+            .update(cx, |project, cx| project.open_buffer(project_path, cx))?
+            .await?
+    };
+
+    action_log.update(cx, |action_log, cx| {
+        action_log.track_buffer(buffer.clone(), cx);
+    })?;
+
+    // Wait until the buffer has been fully parsed, so that we can read its outline.
+    let mut parse_status = buffer.read_with(cx, |buffer, _| buffer.parse_status())?;
+    while *parse_status.borrow() != ParseStatus::Idle {
+        parse_status.changed().await?;
+    }
+
+    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
+    let Some(outline) = snapshot.outline(None) else {
+        return Err(anyhow!("No outline information available for this file."));
+    };
+
+    render_outline(
+        outline
+            .items
+            .into_iter()
+            .map(|item| item.to_point(&snapshot)),
+        regex,
+        0,
+        usize::MAX,
+    )
+    .await
+}
+
+async fn project_symbols(
+    project: Entity<Project>,
+    regex: Option<Regex>,
+    offset: u32,
+    cx: &mut AsyncApp,
+) -> anyhow::Result<String> {
+    let symbols = project
+        .update(cx, |project, cx| project.symbols("", cx))?
+        .await?;
+
+    if symbols.is_empty() {
+        return Err(anyhow!("No symbols found in project."));
+    }
+
+    let mut symbols_by_path: IndexMap<PathBuf, Vec<&Symbol>> = IndexMap::default();
+
+    for symbol in symbols
+        .iter()
+        .filter(|symbol| {
+            if let Some(regex) = &regex {
+                regex.is_match(&symbol.name)
+            } else {
+                true
+            }
+        })
+        .skip(offset as usize)
+        // Take 1 more than RESULTS_PER_PAGE so we can tell if there are more results.
+        .take((RESULTS_PER_PAGE as usize).saturating_add(1))
+    {
+        if let Some(worktree_path) = project.read_with(cx, |project, cx| {
+            project
+                .worktree_for_id(symbol.path.worktree_id, cx)
+                .map(|worktree| PathBuf::from(worktree.read(cx).root_name()))
+        })? {
+            let path = worktree_path.join(&symbol.path.path);
+            symbols_by_path.entry(path).or_default().push(symbol);
+        }
+    }
+
+    // If no symbols matched the filter, return early
+    if symbols_by_path.is_empty() {
+        return Err(anyhow!("No symbols found matching the criteria."));
+    }
+
+    let mut symbols_rendered = 0;
+    let mut has_more_symbols = false;
+    let mut output = String::new();
+
+    'outer: for (file_path, file_symbols) in symbols_by_path {
+        if symbols_rendered > 0 {
+            output.push('\n');
+        }
+
+        writeln!(&mut output, "{}", file_path.display()).ok();
+
+        for symbol in file_symbols {
+            if symbols_rendered >= RESULTS_PER_PAGE {
+                has_more_symbols = true;
+                break 'outer;
+            }
+
+            write!(&mut output, "  {} ", symbol.label.text()).ok();
+
+            // Convert to 1-based line numbers for display
+            let start_line = symbol.range.start.0.row as usize + 1;
+            let end_line = symbol.range.end.0.row as usize + 1;
+
+            if start_line == end_line {
+                writeln!(&mut output, "[L{}]", start_line).ok();
+            } else {
+                writeln!(&mut output, "[L{}-{}]", start_line, end_line).ok();
+            }
+
+            symbols_rendered += 1;
+        }
+    }
+
+    Ok(if symbols_rendered == 0 {
+        "No symbols found in the requested page.".to_string()
+    } else if has_more_symbols {
+        format!(
+            "{output}\nShowing symbols {}-{} (more symbols were found; use offset: {} to see next page)",
+            offset + 1,
+            offset + symbols_rendered,
+            offset + RESULTS_PER_PAGE,
+        )
+    } else {
+        output
+    })
+}
+
+async fn render_outline(
+    items: impl IntoIterator<Item = OutlineItem<Point>>,
+    regex: Option<Regex>,
+    offset: usize,
+    results_per_page: usize,
+) -> Result<String> {
+    let mut items = items.into_iter().skip(offset);
+
+    let entries = items
+        .by_ref()
+        .filter(|item| {
+            regex
+                .as_ref()
+                .is_none_or(|regex| regex.is_match(&item.text))
+        })
+        .take(results_per_page)
+        .collect::<Vec<_>>();
+    let has_more = items.next().is_some();
+
+    let mut output = String::new();
+    let entries_rendered = render_entries(&mut output, entries);
+
+    // Calculate pagination information
+    let page_start = offset + 1;
+    let page_end = offset + entries_rendered;
+    let total_symbols = if has_more {
+        format!("more than {}", page_end)
+    } else {
+        page_end.to_string()
+    };
+
+    // Add pagination information
+    if has_more {
+        writeln!(&mut output, "\nShowing symbols {page_start}-{page_end} (there were more symbols found; use offset: {page_end} to see next page)",
+        )
+    } else {
+        writeln!(
+            &mut output,
+            "\nShowing symbols {page_start}-{page_end} (total symbols: {total_symbols})",
+        )
+    }
+    .ok();
+
+    Ok(output)
+}
+
+fn render_entries(
+    output: &mut String,
+    items: impl IntoIterator<Item = OutlineItem<Point>>,
+) -> usize {
+    let mut entries_rendered = 0;
+
+    for item in items {
+        // Indent based on depth ("" for level 0, "  " for level 1, etc.)
+        for _ in 0..item.depth {
+            output.push(' ');
+        }
+        output.push_str(&item.text);
+
+        // Add position information - convert to 1-based line numbers for display
+        let start_line = item.range.start.row + 1;
+        let end_line = item.range.end.row + 1;
+
+        if start_line == end_line {
+            writeln!(output, " [L{}]", start_line).ok();
+        } else {
+            writeln!(output, " [L{}-{}]", start_line, end_line).ok();
+        }
+        entries_rendered += 1;
+    }
+
+    entries_rendered
+}
--- a/crates/assistant_tools/src/contents_tool.rs
+++ b/crates/assistant_tools/src/contents_tool.rs
@@ -0,0 +1,240 @@
+use std::sync::Arc;
+
+use crate::{code_symbols_tool::file_outline, schema::json_schema_for};
+use anyhow::{Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use gpui::{AnyWindowHandle, App, Entity, Task};
+use itertools::Itertools;
+use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::{fmt::Write, path::Path};
+use ui::IconName;
+use util::markdown::MarkdownString;
+
+/// If the model requests to read a file whose size exceeds this, then
+/// the tool will return the file's symbol outline instead of its contents,
+/// and suggest trying again using line ranges from the outline.
+const MAX_FILE_SIZE_TO_READ: usize = 16384;
+
+/// If the model requests to list the entries in a directory with more
+/// entries than this, then the tool will return a subset of the entries
+/// and suggest trying again.
+const MAX_DIR_ENTRIES: usize = 1024;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ContentsToolInput {
+    /// The relative path of the file or directory to access.
+    ///
+    /// This path should never be absolute, and the first component
+    /// of the path should always be a root directory in a project.
+    ///
+    /// <example>
+    /// If the project has the following root directories:
+    ///
+    /// - directory1
+    /// - directory2
+    ///
+    /// If you want to access `file.txt` in `directory1`, you should use the path `directory1/file.txt`.
+    /// If you want to list contents in the directory `directory2/subfolder`, you should use the path `directory2/subfolder`.
+    /// </example>
+    pub path: String,
+
+    /// Optional position (1-based index) to start reading on, if you want to read a subset of the contents.
+    /// When reading a file, this refers to a line number in the file (e.g. 1 is the first line).
+    /// When reading a directory, this refers to the number of the directory entry (e.g. 1 is the first entry).
+    ///
+    /// Defaults to 1.
+    pub start: Option<u32>,
+
+    /// Optional position (1-based index) to end reading on, if you want to read a subset of the contents.
+    /// When reading a file, this refers to a line number in the file (e.g. 1 is the first line).
+    /// When reading a directory, this refers to the number of the directory entry (e.g. 1 is the first entry).
+    ///
+    /// Defaults to reading until the end of the file or directory.
+    pub end: Option<u32>,
+}
+
+pub struct ContentsTool;
+
+impl Tool for ContentsTool {
+    fn name(&self) -> String {
+        "contents".into()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("./contents_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::FileSearch
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<ContentsToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<ContentsToolInput>(input.clone()) {
+            Ok(input) => {
+                let path = MarkdownString::inline_code(&input.path);
+
+                match (input.start, input.end) {
+                    (Some(start), None) => format!("Read {path} (from line {start})"),
+                    (Some(start), Some(end)) => {
+                        format!("Read {path} (lines {start}-{end})")
+                    }
+                    _ => format!("Read {path}"),
+                }
+            }
+            Err(_) => "Read file or directory".to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        _window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<ContentsToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+
+        // Sometimes models will return these even though we tell it to give a path and not a glob.
+        // When this happens, just list the root worktree directories.
+        if matches!(input.path.as_str(), "." | "" | "./" | "*") {
+            let output = project
+                .read(cx)
+                .worktrees(cx)
+                .filter_map(|worktree| {
+                    worktree.read(cx).root_entry().and_then(|entry| {
+                        if entry.is_dir() {
+                            entry.path.to_str()
+                        } else {
+                            None
+                        }
+                    })
+                })
+                .collect::<Vec<_>>()
+                .join("\n");
+
+            return Task::ready(Ok(output)).into();
+        }
+
+        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
+            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path))).into();
+        };
+
+        let Some(worktree) = project
+            .read(cx)
+            .worktree_for_id(project_path.worktree_id, cx)
+        else {
+            return Task::ready(Err(anyhow!("Worktree not found"))).into();
+        };
+        let worktree = worktree.read(cx);
+
+        let Some(entry) = worktree.entry_for_path(&project_path.path) else {
+            return Task::ready(Err(anyhow!("Path not found: {}", input.path))).into();
+        };
+
+        // If it's a directory, list its contents
+        if entry.is_dir() {
+            let mut output = String::new();
+            let start_index = input
+                .start
+                .map(|line| (line as usize).saturating_sub(1))
+                .unwrap_or(0);
+            let end_index = input
+                .end
+                .map(|line| (line as usize).saturating_sub(1))
+                .unwrap_or(MAX_DIR_ENTRIES);
+            let mut skipped = 0;
+
+            for (index, entry) in worktree.child_entries(&project_path.path).enumerate() {
+                if index >= start_index && index <= end_index {
+                    writeln!(
+                        output,
+                        "{}",
+                        Path::new(worktree.root_name()).join(&entry.path).display(),
+                    )
+                    .unwrap();
+                } else {
+                    skipped += 1;
+                }
+            }
+
+            if output.is_empty() {
+                output.push_str(&input.path);
+                output.push_str(" is empty.");
+            }
+
+            if skipped > 0 {
+                write!(
+                    output,
+                    "\n\nNote: Skipped {skipped} entries. Adjust start and end to see other entries.",
+                ).ok();
+            }
+
+            Task::ready(Ok(output)).into()
+        } else {
+            // It's a file, so read its contents
+            let file_path = input.path.clone();
+            cx.spawn(async move |cx| {
+                let buffer = cx
+                    .update(|cx| {
+                        project.update(cx, |project, cx| project.open_buffer(project_path, cx))
+                    })?
+                    .await?;
+
+                if input.start.is_some() || input.end.is_some() {
+                    let result = buffer.read_with(cx, |buffer, _cx| {
+                        let text = buffer.text();
+                        let start = input.start.unwrap_or(1);
+                        let lines = text.split('\n').skip(start as usize - 1);
+                        if let Some(end) = input.end {
+                            let count = end.saturating_sub(start).max(1); // Ensure at least 1 line
+                            Itertools::intersperse(lines.take(count as usize), "\n").collect()
+                        } else {
+                            Itertools::intersperse(lines, "\n").collect()
+                        }
+                    })?;
+
+                    action_log.update(cx, |log, cx| {
+                        log.track_buffer(buffer, cx);
+                    })?;
+
+                    Ok(result)
+                } else {
+                    // No line ranges specified, so check file size to see if it's too big.
+                    let file_size = buffer.read_with(cx, |buffer, _cx| buffer.text().len())?;
+
+                    if file_size <= MAX_FILE_SIZE_TO_READ {
+                        let result = buffer.read_with(cx, |buffer, _cx| buffer.text())?;
+
+                        action_log.update(cx, |log, cx| {
+                            log.track_buffer(buffer, cx);
+                        })?;
+
+                        Ok(result)
+                    } else {
+                        // File is too big, so return its outline and a suggestion to
+                        // read again with a line number range specified.
+                        let outline = file_outline(project, file_path, action_log, None, cx).await?;
+
+                        Ok(format!("This file was too big to read all at once. Here is an outline of its symbols:\n\n{outline}\n\nUsing the line numbers in this outline, you can call this tool again while specifying the start and end fields to see the implementations of symbols in the outline."))
+                    }
+                }
+            }).into()
+        }
+    }
+}
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -10,7 +10,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use ui::IconName;
-use util::markdown::MarkdownInlineCode;
+use util::markdown::MarkdownString;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CopyPathToolInput {
@@ -45,7 +45,7 @@ impl Tool for CopyPathTool {
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
+        true
    }

    fn description(&self) -> String {
@@ -63,8 +63,8 @@ impl Tool for CopyPathTool {
    fn ui_text(&self, input: &serde_json::Value) -> String {
        match serde_json::from_value::<CopyPathToolInput>(input.clone()) {
            Ok(input) => {
-                let src = MarkdownInlineCode(&input.source_path);
-                let dest = MarkdownInlineCode(&input.destination_path);
+                let src = MarkdownString::inline_code(&input.source_path);
+                let dest = MarkdownString::inline_code(&input.destination_path);
                format!("Copy {src} to {dest}")
            }
            Err(_) => "Copy path".to_string(),
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -10,7 +10,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use ui::IconName;
-use util::markdown::MarkdownInlineCode;
+use util::markdown::MarkdownString;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct CreateDirectoryToolInput {
@@ -35,7 +35,7 @@ impl Tool for CreateDirectoryTool {
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
+        true
    }

    fn description(&self) -> String {
@@ -53,7 +53,10 @@ impl Tool for CreateDirectoryTool {
    fn ui_text(&self, input: &serde_json::Value) -> String {
        match serde_json::from_value::<CreateDirectoryToolInput>(input.clone()) {
            Ok(input) => {
-                format!("Create directory {}", MarkdownInlineCode(&input.path))
+                format!(
+                    "Create directory {}",
+                    MarkdownString::inline_code(&input.path)
+                )
            }
            Err(_) => "Create directory".to_string(),
        }
--- a/crates/assistant_tools/src/create_file_tool.rs
+++ b/crates/assistant_tools/src/create_file_tool.rs
@@ -0,0 +1,192 @@
+use crate::schema::json_schema_for;
+use anyhow::{Result, anyhow};
+use assistant_tool::{ActionLog, Tool, ToolResult};
+use gpui::AnyWindowHandle;
+use gpui::{App, Entity, Task};
+use language_model::LanguageModelRequestMessage;
+use language_model::LanguageModelToolSchemaFormat;
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+use ui::IconName;
+use util::markdown::MarkdownString;
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct CreateFileToolInput {
+    /// The path where the file should be created.
+    ///
+    /// <example>
+    /// If the project has the following structure:
+    ///
+    /// - directory1/
+    /// - directory2/
+    ///
+    /// You can create a new file by providing a path of "directory1/new_file.txt"
+    /// </example>
+    pub path: String,
+
+    /// The text contents of the file to create.
+    ///
+    /// <example>
+    /// To create a file with the text "Hello, World!", provide contents of "Hello, World!"
+    /// </example>
+    pub contents: String,
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+struct PartialInput {
+    #[serde(default)]
+    path: String,
+    #[serde(default)]
+    contents: String,
+}
+
+pub struct CreateFileTool;
+
+const DEFAULT_UI_TEXT: &str = "Create file";
+
+impl Tool for CreateFileTool {
+    fn name(&self) -> String {
+        "create_file".into()
+    }
+
+    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
+        false
+    }
+
+    fn description(&self) -> String {
+        include_str!("./create_file_tool/description.md").into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::FileCreate
+    }
+
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+        json_schema_for::<CreateFileToolInput>(format)
+    }
+
+    fn ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<CreateFileToolInput>(input.clone()) {
+            Ok(input) => {
+                let path = MarkdownString::inline_code(&input.path);
+                format!("Create file {path}")
+            }
+            Err(_) => DEFAULT_UI_TEXT.to_string(),
+        }
+    }
+
+    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
+        match serde_json::from_value::<PartialInput>(input.clone()).ok() {
+            Some(input) if !input.path.is_empty() => input.path,
+            _ => DEFAULT_UI_TEXT.to_string(),
+        }
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        _messages: &[LanguageModelRequestMessage],
+        project: Entity<Project>,
+        action_log: Entity<ActionLog>,
+        _window: Option<AnyWindowHandle>,
+        cx: &mut App,
+    ) -> ToolResult {
+        let input = match serde_json::from_value::<CreateFileToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
+        };
+        let project_path = match project.read(cx).find_project_path(&input.path, cx) {
+            Some(project_path) => project_path,
+            None => {
+                return Task::ready(Err(anyhow!("Path to create was outside the project"))).into();
+            }
+        };
+        let contents: Arc<str> = input.contents.as_str().into();
+        let destination_path: Arc<str> = input.path.as_str().into();
+
+        cx.spawn(async move |cx| {
+            let buffer = project
+                .update(cx, |project, cx| {
+                    project.open_buffer(project_path.clone(), cx)
+                })?
+                .await
+                .map_err(|err| anyhow!("Unable to open buffer for {destination_path}: {err}"))?;
+            cx.update(|cx| {
+                action_log.update(cx, |action_log, cx| {
+                    action_log.track_buffer(buffer.clone(), cx)
+                });
+                buffer.update(cx, |buffer, cx| buffer.set_text(contents, cx));
+                action_log.update(cx, |action_log, cx| {
+                    action_log.buffer_edited(buffer.clone(), cx)
+                });
+            })?;
+
+            project
+                .update(cx, |project, cx| project.save_buffer(buffer, cx))?
+                .await
+                .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;
+
+            Ok(format!("Created file {destination_path}"))
+        })
+        .into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn still_streaming_ui_text_with_path() {
+        let tool = CreateFileTool;
+        let input = json!({
+            "path": "src/main.rs",
+            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
+        });
+
+        assert_eq!(tool.still_streaming_ui_text(&input), "src/main.rs");
+    }
+
+    #[test]
+    fn still_streaming_ui_text_without_path() {
+        let tool = CreateFileTool;
+        let input = json!({
+            "path": "",
+            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
+        });
+
+        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
+    }
+
+    #[test]
+    fn still_streaming_ui_text_with_null() {
+        let tool = CreateFileTool;
+        let input = serde_json::Value::Null;
+
+        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
+    }
+
+    #[test]
+    fn ui_text_with_valid_input() {
+        let tool = CreateFileTool;
+        let input = json!({
+            "path": "src/main.rs",
+            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
+        });
+
+        assert_eq!(tool.ui_text(&input), "Create file `src/main.rs`");
+    }
+
+    #[test]
+    fn ui_text_with_invalid_input() {
+        let tool = CreateFileTool;
+        let input = json!({
+            "invalid": "field"
+        });
+
+        assert_eq!(tool.ui_text(&input), DEFAULT_UI_TEXT);
+    }
+}
--- a/crates/assistant_tools/src/create_file_tool/description.md
+++ b/crates/assistant_tools/src/create_file_tool/description.md
@@ -0,0 +1,3 @@
+Creates a new file at the specified path within the project, containing the given text content. Returns confirmation that the file was created.
+
+This tool is the most efficient way to create new files within the project, so it should always be chosen whenever it's necessary to create a new file in the project with specific text content, or whenever a file in the project needs such a drastic change that you would prefer to replace the entire thing instead of making individual edits. This tool should not be used when making changes to parts of an existing file but not all of it. In those cases, it's better to use another approach to edit the file.
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -34,7 +34,7 @@ impl Tool for DeletePathTool {
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
+        true
    }

    fn description(&self) -> String {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nathan Sobo	878312a812	Fix warnings Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>	2025-04-23 15:05:54 -06:00
Nathan Sobo	6dc61cefb0	Send serialized EvaluatedExample structs to Snowflake Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>	2025-04-23 14:53:31 -06:00
Nathan Sobo	88008c940b	Register assertion groups in programmatic tests This will let us track how many assertions were even run out of the total we may expect. Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>	2025-04-23 14:44:06 -06: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-hammer-icon lucide-hammer"><path d="m15 12-8.373 8.373a1 1 0 1 1-3-3L12 9"/><path d="m18 15 4-4"/><path d="m21.5 11.5-1.914-1.914A2 2 0 0 1 19 8.172V7l-2.26-2.26a6 6 0 0 0-4.202-1.756L9 2.96l.92.82A6.18 6.18 0 0 1 12 8.4V10l2 2h1.172a2 2 0 0 1 1.414.586L18.5 14.5"/></svg>`