Merge remote-tracking branch 'origin/main' into custom-tool-cards

Checkpoint
Lay the groundwork to support rendering custom tool cards
2025-04-09 16:42:30 -06:00 · 2025-04-09 15:21:36 -06:00 · 2025-04-09 08:17:35 -06:00
489 changed files with 14130 additions and 21184 deletions
--- a/.github/ISSUE_TEMPLATE/99_other.yml
+++ b/.github/ISSUE_TEMPLATE/99_other.yml
@@ -1,19 +0,0 @@
-name: Other [Staff Only]
-description: Zed Staff Only
-body:
-  - type: textarea
-    attributes:
-      label: Summary
-      value: |
-        <!-- Please insert a one line summary of the issue below -->
-        SUMMARY_SENTENCE_HERE
-
-        ### Description
-
-        IF YOU DO NOT WORK FOR ZED INDUSTRIES DO NOT CREATE ISSUES WITH THIS TEMPLATE.
-        THEY WILL BE AUTO-CLOSED AND MAY RESULT IN YOU BEING BANNED FROM THE ZED ISSUE TRACKER.
-
-        FEATURE REQUESTS / SUPPORT REQUESTS SHOULD BE OPENED AS DISCUSSIONS:
-          https://github.com/zed-industries/zed/discussions/new/choose
-    validations:
-      required: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -594,7 +594,7 @@ jobs:
    timeout-minutes: 60
    name: Linux x86_x64 release bundle
    runs-on:
-      - buildjet-16vcpu-ubuntu-2004 # ubuntu 20.04 for minimal glibc
+      - buildjet-16vcpu-ubuntu-2004
    if: |
      startsWith(github.ref, 'refs/tags/v')
      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
@@ -622,23 +622,26 @@ jobs:
      - name: Create Linux .tar.gz bundle
        run: script/bundle-linux

-      - name: Upload Artifact to Workflow - zed (run-bundling)
+      - name: Upload Linux bundle to workflow run if main branch or specific label
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: |
+          github.ref == 'refs/heads/main'
+          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
          path: target/release/zed-*.tar.gz

-      - name: Upload Artifact to Workflow - zed-remote-server (run-bundling)
+      - name: Upload Linux remote server to workflow run if main branch or specific label
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: |
+          github.ref == 'refs/heads/main'
+          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
        with:
          name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.gz
          path: target/zed-remote-server-linux-x86_64.gz

-      - name: Upload Artifacts to release
+      - name: Upload app bundle to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
        with:
          draft: true
          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
@@ -677,26 +680,29 @@ jobs:
          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
          script/determine-release-channel

-      - name: Create and upload Linux .tar.gz bundles
+      - name: Create and upload Linux .tar.gz bundle
        run: script/bundle-linux

-      - name: Upload Artifact to Workflow - zed (run-bundling)
+      - name: Upload Linux bundle to workflow run if main branch or specific label
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: |
+          github.ref == 'refs/heads/main'
+          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
          path: target/release/zed-*.tar.gz

-      - name: Upload Artifact to Workflow - zed-remote-server (run-bundling)
+      - name: Upload Linux remote server to workflow run if main branch or specific label
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: |
+          github.ref == 'refs/heads/main'
+          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
        with:
          name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.gz
          path: target/zed-remote-server-linux-aarch64.gz

-      - name: Upload Artifacts to release
+      - name: Upload app bundle to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
-        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
        with:
          draft: true
          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -117,10 +117,12 @@ jobs:
            export ZED_KUBE_NAMESPACE=production
            export ZED_COLLAB_LOAD_BALANCER_SIZE_UNIT=10
            export ZED_API_LOAD_BALANCER_SIZE_UNIT=2
+            export ZED_LLM_LOAD_BALANCER_SIZE_UNIT=2
          elif [[ $GITHUB_REF_NAME = "collab-staging" ]]; then
            export ZED_KUBE_NAMESPACE=staging
            export ZED_COLLAB_LOAD_BALANCER_SIZE_UNIT=1
            export ZED_API_LOAD_BALANCER_SIZE_UNIT=1
+            export ZED_LLM_LOAD_BALANCER_SIZE_UNIT=1
          else
            echo "cowardly refusing to deploy from an unknown branch"
            exit 1
@@ -145,3 +147,9 @@ jobs:
          envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
          kubectl -n "$ZED_KUBE_NAMESPACE" rollout status deployment/$ZED_SERVICE_NAME --watch
          echo "deployed ${ZED_SERVICE_NAME} to ${ZED_KUBE_NAMESPACE}"
+
+          export ZED_SERVICE_NAME=llm
+          export ZED_LOAD_BALANCER_SIZE_UNIT=$ZED_LLM_LOAD_BALANCER_SIZE_UNIT
+          envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
+          kubectl -n "$ZED_KUBE_NAMESPACE" rollout status deployment/$ZED_SERVICE_NAME --watch
+          echo "deployed ${ZED_SERVICE_NAME} to ${ZED_KUBE_NAMESPACE}"
--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -1,13 +1,13 @@
 [
  {
-    "label": "Debug Zed (CodeLLDB)",
-    "adapter": "CodeLLDB",
+    "label": "Debug Zed with LLDB",
+    "adapter": "LLDB",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
    "cwd": "$ZED_WORKTREE_ROOT"
  },
  {
-    "label": "Debug Zed (GDB)",
+    "label": "Debug Zed with GDB",
    "adapter": "GDB",
    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
    "request": "launch",
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,6 +52,7 @@ dependencies = [
 name = "agent"
 version = "0.1.0"
 dependencies = [
+ "agent_rules",
 "anyhow",
 "assistant_context_editor",
 "assistant_settings",
@@ -64,7 +65,6 @@ dependencies = [
 "clock",
 "collections",
 "command_palette_hooks",
- "component",
 "context_server",
 "convert_case 0.8.0",
 "db",
@@ -85,7 +85,6 @@ dependencies = [
 "language",
 "language_model",
 "language_model_selector",
- "linkme",
 "log",
 "lsp",
 "markdown",
@@ -115,7 +114,6 @@ dependencies = [
 "terminal_view",
 "text",
 "theme",
- "thiserror 2.0.12",
 "time",
 "time_format",
 "ui",
@@ -127,6 +125,57 @@ dependencies = [
 "zed_actions",
 ]

+[[package]]
+name = "agent_eval"
+version = "0.1.0"
+dependencies = [
+ "agent",
+ "anyhow",
+ "assistant_tool",
+ "assistant_tools",
+ "clap",
+ "client",
+ "collections",
+ "context_server",
+ "dap",
+ "env_logger 0.11.8",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "gpui_tokio",
+ "language",
+ "language_model",
+ "language_models",
+ "node_runtime",
+ "project",
+ "prompt_store",
+ "release_channel",
+ "reqwest_client",
+ "serde",
+ "serde_json",
+ "serde_json_lenient",
+ "settings",
+ "smol",
+ "tempfile",
+ "util",
+ "walkdir",
+ "workspace-hack",
+]
+
+[[package]]
+name = "agent_rules"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "fs",
+ "gpui",
+ "indoc",
+ "prompt_store",
+ "util",
+ "workspace-hack",
+ "worktree",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -326,6 +375,7 @@ dependencies = [
 "serde_json",
 "strum",
 "thiserror 2.0.12",
+ "util",
 "workspace-hack",
 ]

@@ -718,7 +768,6 @@ dependencies = [
 "schemars",
 "serde",
 "serde_json",
- "settings",
 "ui",
 "unindent",
 "util",
@@ -1182,18 +1231,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "auto_update_helper"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "log",
- "simplelog",
- "windows 0.61.1",
- "winresource",
- "workspace-hack",
-]
-
 [[package]]
 name = "auto_update_ui"
 version = "0.1.0"
@@ -1602,7 +1639,7 @@ dependencies = [
 "hyper-util",
 "pin-project-lite",
 "rustls 0.21.12",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-native-certs 0.8.1",
 "rustls-pki-types",
 "tokio",
@@ -2943,6 +2980,7 @@ dependencies = [
 name = "collab"
 version = "0.44.0"
 dependencies = [
+ "anthropic",
 "anyhow",
 "assistant",
 "assistant_context_editor",
@@ -3186,18 +3224,14 @@ dependencies = [
 name = "component_preview"
 version = "0.1.0"
 dependencies = [
- "anyhow",
 "client",
 "collections",
 "component",
- "db",
 "gpui",
 "languages",
 "notifications",
 "project",
- "serde",
 "ui",
- "ui_input",
 "workspace",
 "workspace-hack",
 ]
@@ -4002,6 +4036,7 @@ dependencies = [
 "node_runtime",
 "parking_lot",
 "paths",
+ "regex",
 "schemars",
 "serde",
 "serde_json",
@@ -4033,6 +4068,7 @@ dependencies = [
 "gpui",
 "language",
 "paths",
+ "regex",
 "serde",
 "serde_json",
 "task",
@@ -4176,7 +4212,6 @@ dependencies = [
 "collections",
 "command_palette_hooks",
 "dap",
- "db",
 "editor",
 "env_logger 0.11.8",
 "feature_flags",
@@ -4195,7 +4230,6 @@ dependencies = [
 "settings",
 "sysinfo",
 "task",
- "tasks_ui",
 "terminal_view",
 "theme",
 "ui",
@@ -4316,24 +4350,19 @@ dependencies = [
 "anyhow",
 "client",
 "collections",
- "component",
 "ctor",
 "editor",
 "env_logger 0.11.8",
 "gpui",
- "indoc",
 "language",
- "linkme",
 "log",
 "lsp",
- "markdown",
 "pretty_assertions",
 "project",
 "rand 0.8.5",
 "serde",
 "serde_json",
 "settings",
- "text",
 "theme",
 "ui",
 "unindent",
@@ -4872,49 +4901,6 @@ dependencies = [
 "num-traits",
 ]

-[[package]]
-name = "eval"
-version = "0.1.0"
-dependencies = [
- "agent",
- "anyhow",
- "assistant_tool",
- "assistant_tools",
- "async-watch",
- "chrono",
- "clap",
- "client",
- "collections",
- "context_server",
- "dap",
- "env_logger 0.11.8",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "handlebars 4.5.0",
- "language",
- "language_extension",
- "language_model",
- "language_models",
- "languages",
- "node_runtime",
- "paths",
- "project",
- "prompt_store",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "toml 0.8.20",
- "unindent",
- "util",
- "workspace-hack",
-]
-
 [[package]]
 name = "evals"
 version = "0.1.0"
@@ -5006,10 +4992,10 @@ dependencies = [
 "async-tar",
 "async-trait",
 "collections",
+ "convert_case 0.8.0",
 "fs",
 "futures 0.3.31",
 "gpui",
- "heck 0.5.0",
 "http_client",
 "language",
 "log",
@@ -6650,7 +6636,7 @@ dependencies = [
 name = "http_client_tls"
 version = "0.1.0"
 dependencies = [
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-platform-verifier",
 "workspace-hack",
 ]
@@ -6749,7 +6735,7 @@ dependencies = [
 "http 1.3.1",
 "hyper 1.6.0",
 "hyper-util",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-native-certs 0.8.1",
 "rustls-pki-types",
 "tokio",
@@ -7202,12 +7188,9 @@ name = "install_cli"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "client",
 "gpui",
- "release_channel",
 "smol",
 "util",
- "workspace",
 "workspace-hack",
 ]

@@ -7684,7 +7667,6 @@ dependencies = [
 name = "language_model_selector"
 version = "0.1.0"
 dependencies = [
- "collections",
 "feature_flags",
 "gpui",
 "language_model",
@@ -7735,7 +7717,6 @@ dependencies = [
 "smol",
 "strum",
 "theme",
- "thiserror 2.0.12",
 "tiktoken-rs",
 "tokio",
 "ui",
@@ -10969,9 +10950,9 @@ dependencies = [

 [[package]]
 name = "prometheus"
-version = "0.14.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
 "cfg-if",
 "fnv",
@@ -10979,7 +10960,7 @@ dependencies = [
 "memchr",
 "parking_lot",
 "protobuf",
- "thiserror 2.0.12",
+ "thiserror 1.0.69",
 ]

 [[package]]
@@ -11154,23 +11135,9 @@ dependencies = [

 [[package]]
 name = "protobuf"
-version = "3.7.2"
+version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
-dependencies = [
- "once_cell",
- "protobuf-support",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "protobuf-support"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
-dependencies = [
- "thiserror 1.0.69",
-]
+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"

 [[package]]
 name = "psm"
@@ -11296,7 +11263,7 @@ dependencies = [
 "quinn-proto",
 "quinn-udp",
 "rustc-hash 2.1.1",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "socket2",
 "thiserror 2.0.12",
 "tokio",
@@ -11315,7 +11282,7 @@ dependencies = [
 "rand 0.9.0",
 "ring",
 "rustc-hash 2.1.1",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-pki-types",
 "slab",
 "thiserror 2.0.12",
@@ -11923,7 +11890,7 @@ dependencies = [
 "percent-encoding",
 "pin-project-lite",
 "quinn",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-native-certs 0.8.1",
 "rustls-pemfile 2.2.0",
 "rustls-pki-types",
@@ -12314,9 +12281,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.26"
+version = "0.23.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
+checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
 dependencies = [
 "aws-lc-rs",
 "log",
@@ -12390,7 +12357,7 @@ dependencies = [
 "jni",
 "log",
 "once_cell",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-native-certs 0.8.1",
 "rustls-platform-verifier-android",
 "rustls-webpki 0.103.1",
@@ -13255,9 +13222,9 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 dependencies = [
 "serde",
 ]
@@ -13488,7 +13455,7 @@ dependencies = [
 "once_cell",
 "percent-encoding",
 "rust_decimal",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-pemfile 2.2.0",
 "serde",
 "serde_json",
@@ -14223,7 +14190,9 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
+ "debugger_ui",
 "editor",
+ "feature_flags",
 "file_icons",
 "fuzzy",
 "gpui",
@@ -14781,7 +14750,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "tokio",
 ]

@@ -14841,7 +14810,7 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
 dependencies = [
 "futures-util",
 "log",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-pki-types",
 "tokio",
 "tokio-rustls 0.26.2",
@@ -15400,7 +15369,7 @@ dependencies = [
 "httparse",
 "log",
 "rand 0.9.0",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-pki-types",
 "sha1",
 "thiserror 2.0.12",
@@ -17631,7 +17600,6 @@ dependencies = [
 "ui",
 "util",
 "uuid",
- "windows 0.61.1",
 "workspace-hack",
 "zed_actions",
 ]
@@ -17749,7 +17717,7 @@ dependencies = [
 "rust_decimal",
 "rustix 0.38.44",
 "rustix 1.0.5",
- "rustls 0.23.26",
+ "rustls 0.23.25",
 "rustls-webpki 0.103.1",
 "scopeguard",
 "sea-orm",
@@ -17794,8 +17762,6 @@ dependencies = [
 "wasmtime-cranelift",
 "wasmtime-environ",
 "winapi",
- "windows-core 0.61.0",
- "windows-numerics",
 "windows-sys 0.48.0",
 "windows-sys 0.52.0",
 "windows-sys 0.59.0",
@@ -18140,7 +18106,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.183.0"
+version = "0.182.0"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -18236,6 +18202,7 @@ dependencies = [
 "settings",
 "settings_ui",
 "shellexpand 2.1.2",
+ "simplelog",
 "smol",
 "snippet_provider",
 "snippets_ui",
@@ -18270,7 +18237,6 @@ dependencies = [
 "workspace-hack",
 "zed_actions",
 "zeta",
- "zlog",
 "zlog_settings",
 ]

@@ -18320,7 +18286,7 @@ dependencies = [

 [[package]]
 name = "zed_html"
-version = "0.2.1"
+version = "0.2.0"
 dependencies = [
 "zed_extension_api 0.1.0",
 ]
@@ -18583,10 +18549,7 @@ dependencies = [
 name = "zlog"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "chrono",
 "log",
- "tempfile",
 "workspace-hack",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,11 +3,13 @@ resolver = "2"
 members = [
    "crates/activity_indicator",
    "crates/agent",
+    "crates/agent_rules",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
    "crates/assistant",
    "crates/assistant_context_editor",
+    "crates/agent_eval",
    "crates/assistant_settings",
    "crates/assistant_slash_command",
    "crates/assistant_slash_commands",
@@ -15,7 +17,6 @@ members = [
    "crates/assistant_tools",
    "crates/audio",
    "crates/auto_update",
-    "crates/auto_update_helper",
    "crates/auto_update_ui",
    "crates/aws_http_client",
    "crates/bedrock",
@@ -46,7 +47,6 @@ members = [
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/editor",
-    "crates/eval",
    "crates/evals",
    "crates/extension",
    "crates/extension_api",
@@ -210,12 +210,14 @@ edition = "2024"

 activity_indicator = { path = "crates/activity_indicator" }
 agent = { path = "crates/agent" }
+agent_rules = { path = "crates/agent_rules" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
+assistant_eval = { path = "crates/agent_eval" }
 assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
@@ -223,7 +225,6 @@ assistant_tool = { path = "crates/assistant_tool" }
 assistant_tools = { path = "crates/assistant_tools" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
-auto_update_helper = { path = "crates/auto_update_helper" }
 auto_update_ui = { path = "crates/auto_update_ui" }
 aws_http_client = { path = "crates/aws_http_client" }
 bedrock = { path = "crates/bedrock" }
@@ -401,12 +402,8 @@ async-tungstenite = "0.29.1"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
-aws-credential-types = { version = "1.2.2", features = [
-    "hardcoded-credentials",
-] }
-aws-sdk-bedrockruntime = { version = "1.80.0", features = [
-    "behavior-version-latest",
-] }
+aws-credential-types = { version = "1.2.2", features = ["hardcoded-credentials"] }
+aws-sdk-bedrockruntime = { version = "1.80.0", features = ["behavior-version-latest"] }
 aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
@@ -445,7 +442,6 @@ futures-lite = "1.13"
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
-heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
 html5ever = "0.27.0"
@@ -513,7 +509,7 @@ runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804
 rustc-demangle = "0.1.23"
 rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
-rustls = { version = "0.23.26" }
+rustls = { version = "0.23.22" }
 rustls-platform-verifier = "0.5.0"
 scap = { git = "https://github.com/zed-industries/scap", rev = "08f0a01417505cc0990b9931a37e5120db92e0d0", default-features = false }
 schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
@@ -622,10 +618,12 @@ features = [
 [workspace.dependencies.windows]
 version = "0.61"
 features = [
+    "Foundation_Collections",
    "Foundation_Numerics",
    "Storage_Search",
    "Storage_Streams",
    "System_Threading",
+    "UI_StartScreen",
    "UI_ViewManagement",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
@@ -652,7 +650,6 @@ features = [
    "Win32_System_SystemInformation",
    "Win32_System_SystemServices",
    "Win32_System_Threading",
-    "Win32_System_Variant",
    "Win32_System_WinRT",
    "Win32_UI_Controls",
    "Win32_UI_HiDpi",
@@ -660,7 +657,6 @@ features = [
    "Win32_UI_Input_KeyboardAndMouse",
    "Win32_UI_Shell",
    "Win32_UI_Shell_Common",
-    "Win32_UI_Shell_PropertiesSystem",
    "Win32_UI_WindowsAndMessaging",
 ]

@@ -784,12 +780,4 @@ let_underscore_future = "allow"
 too_many_arguments = "allow"

 [workspace.metadata.cargo-machete]
-ignored = [
-    "bindgen",
-    "cbindgen",
-    "prost_build",
-    "serde",
-    "component",
-    "linkme",
-    "workspace-hack",
-]
+ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme", "workspace-hack"]
--- a/assets/icons/ai_anthropic_hosted.svg
+++ b/assets/icons/ai_anthropic_hosted.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" rx="2" fill="black" fill-opacity="0.2"/>
+<g clip-path="url(#clip0_1916_18)">
+<path d="M10.652 3.79999H8.816L12.164 12.2H14L10.652 3.79999Z" fill="#1F1F1E"/>
+<path d="M5.348 3.79999L2 12.2H3.872L4.55672 10.436H8.05927L8.744 12.2H10.616L7.268 3.79999H5.348ZM5.16224 8.87599L6.308 5.92399L7.45374 8.87599H5.16224Z" fill="#1F1F1E"/>
+</g>
+<defs>
+<clipPath id="clip0_1916_18">
+<rect width="12" height="8.4" fill="white" transform="translate(2 3.79999)"/>
+</clipPath>
+</defs>
+</svg>
--- a/assets/icons/binary.svg
+++ b/assets/icons/binary.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-binary-icon lucide-binary"><rect x="14" y="14" width="4" height="6" rx="2"/><rect x="6" y="4" width="4" height="6" rx="2"/><path d="M6 20h4"/><path d="M14 10h4"/><path d="M6 14h2v6"/><path d="M14 4h2v6"/></svg>
--- a/assets/icons/flame.svg
+++ b/assets/icons/flame.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-flame-icon lucide-flame"><path d="M8.5 14.5A2.5 2.5 0 0 0 11 12c0-1.38-.5-2-1-3-1.072-2.143-.224-4.054 2-6 .5 2.5 2 4.9 4 6.5 2 1.6 3 3.5 3 5.5a7 7 0 1 1-14 0c0-1.153.433-2.294 1-3a2.5 2.5 0 0 0 2.5 2.5z"/></svg>
--- a/assets/icons/function.svg
+++ b/assets/icons/function.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-square-function-icon lucide-square-function"><rect width="18" height="18" x="3" y="3" rx="2" ry="2"/><path d="M9 17c2 0 2.8-1 2.8-2.8V10c0-2 1-3.3 3.2-3"/><path d="M9 11.2h5.7"/></svg>
--- a/assets/icons/layout.svg
+++ b/assets/icons/layout.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="M20 14H4C3.44772 14 3 14.4477 3 15V20C3 20.5523 3.44772 21 4 21H20C20.5523 21 21 20.5523 21 20V15C21 14.4477 20.5523 14 20 14Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 3H4C3.44772 3 3 3.44772 3 4V9C3 9.55228 3.44772 10 4 10H11C11.5523 10 12 9.55228 12 9V4C12 3.44772 11.5523 3 11 3Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M20 3H17C16.4477 3 16 3.44772 16 4V9C16 9.55228 16.4477 10 17 10H20C20.5523 10 21 9.55228 21 9V4C21 3.44772 20.5523 3 20 3Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -150,9 +150,7 @@
    "context": "AgentDiff",
    "bindings": {
      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
+      "ctrl-n": "agent::Reject"
    }
  },
  {
@@ -354,11 +352,11 @@
      "alt-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
      "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
      "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
-      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
-      "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch
-      "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch
-      "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch  / find_under_expand_skip
-      "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
+      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }],
+      "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match
+      "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }],
+      "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }],
+      "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }],
      "ctrl-k ctrl-i": "editor::Hover",
      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
      "ctrl-u": "editor::UndoSelection",
@@ -627,13 +625,12 @@
    "context": "AgentPanel",
    "bindings": {
      "ctrl-n": "agent::NewThread",
-      "ctrl-alt-n": "agent::NewTextThread",
+      "ctrl-alt-n": "agent::NewPromptEditor",
      "ctrl-shift-h": "agent::OpenHistory",
      "ctrl-alt-c": "agent::OpenConfiguration",
      "ctrl-i": "agent::ToggleProfileSelector",
      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-shift-a": "agent::ToggleContextPicker",
-      "shift-escape": "agent::ExpandMessageEditor",
      "ctrl-e": "agent::ChatMode",
      "ctrl-alt-e": "agent::RemoveAllContext"
    }
@@ -647,8 +644,9 @@
  },
  {
    "context": "AgentPanel && prompt_editor",
+    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "agent::NewTextThread",
+      "cmd-n": "agent::NewPromptEditor",
      "cmd-alt-t": "agent::NewThread"
    }
  },
@@ -662,6 +660,7 @@
  },
  {
    "context": "EditMessageEditor > Editor",
+    "use_key_equivalents": true,
    "bindings": {
      "escape": "menu::Cancel",
      "enter": "menu::Confirm",
@@ -670,6 +669,7 @@
  },
  {
    "context": "AgentFeedbackMessageEditor > Editor",
+    "use_key_equivalents": true,
    "bindings": {
      "escape": "menu::Cancel",
      "enter": "menu::Confirm",
@@ -782,7 +782,6 @@
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
      "alt-enter": "menu::SecondaryConfirm",
      "delete": ["git::RestoreFile", { "skip_prompt": false }],
      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
@@ -791,25 +790,18 @@
      "ctrl-delete": ["git::RestoreFile", { "skip_prompt": false }]
    }
  },
-  {
-    "context": "GitPanel && CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git::Cancel"
-    }
-  },
  {
    "context": "GitCommit > Editor",
    "bindings": {
      "escape": "menu::Cancel",
      "enter": "editor::Newline",
      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
      "alt-l": "git::GenerateCommitMessage"
    }
  },
  {
    "context": "GitPanel",
+    "use_key_equivalents": true,
    "bindings": {
      "ctrl-g ctrl-g": "git::Fetch",
      "ctrl-g up": "git::Push",
@@ -826,7 +818,6 @@
    "context": "GitDiff > Editor",
    "bindings": {
      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
      "ctrl-space": "git::StageAll",
      "ctrl-shift-space": "git::UnstageAll"
    }
@@ -845,7 +836,6 @@
      "shift-tab": "git_panel::FocusChanges",
      "enter": "editor::Newline",
      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
      "alt-up": "git_panel::FocusChanges",
      "alt-l": "git::GenerateCommitMessage"
    }
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -242,9 +242,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-y": "agent::Keep",
-      "cmd-n": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
+      "cmd-n": "agent::Reject"
    }
  },
  {
@@ -283,13 +281,12 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-n": "agent::NewThread",
-      "cmd-alt-n": "agent::NewTextThread",
+      "cmd-alt-n": "agent::NewPromptEditor",
      "cmd-shift-h": "agent::OpenHistory",
      "cmd-alt-c": "agent::OpenConfiguration",
      "cmd-i": "agent::ToggleProfileSelector",
      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-shift-a": "agent::ToggleContextPicker",
-      "shift-escape": "agent::ExpandMessageEditor",
      "cmd-e": "agent::ChatMode",
      "cmd-alt-e": "agent::RemoveAllContext"
    }
@@ -305,7 +302,7 @@
    "context": "AgentPanel && prompt_editor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "agent::NewTextThread",
+      "cmd-n": "agent::NewPromptEditor",
      "cmd-alt-t": "agent::NewThread"
    }
  },
@@ -491,15 +488,12 @@
      "alt-shift-down": "editor::DuplicateLineDown",
      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand Selection
      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection
-      "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
+      "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match
      "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
      "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word
-      "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch / find_under_expand_skip
-      // macOS binds `ctrl-cmd-d` to Show Dictionary which breaks these two binds
-      // To use `ctrl-cmd-d` or `ctrl-k ctrl-cmd-d` in Zed you must execute this command and then restart:
-      //   defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 70 '<dict><key>enabled</key><false/></dict>'
-      "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch
-      "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
+      "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }],
+      "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }],
+      "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }],
      "cmd-k cmd-i": "editor::Hover",
      "cmd-/": ["editor::ToggleComments", { "advance_downwards": false }],
      "cmd-u": "editor::UndoSelection",
@@ -855,26 +849,17 @@
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
      "delete": ["git::RestoreFile", { "skip_prompt": false }],
      "cmd-backspace": ["git::RestoreFile", { "skip_prompt": true }],
      "cmd-delete": ["git::RestoreFile", { "skip_prompt": true }]
    }
  },
-  {
-    "context": "GitPanel && CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git::Cancel"
-    }
-  },
  {
    "context": "GitDiff > Editor",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
      "cmd-ctrl-y": "git::StageAll",
      "cmd-ctrl-shift-y": "git::UnstageAll"
    }
@@ -885,7 +870,6 @@
    "bindings": {
      "enter": "editor::Newline",
      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
      "tab": "git_panel::FocusChanges",
      "shift-tab": "git_panel::FocusChanges",
      "alt-up": "git_panel::FocusChanges",
@@ -915,7 +899,6 @@
      "enter": "editor::Newline",
      "escape": "menu::Cancel",
      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
      "alt-tab": "git::GenerateCommitMessage"
    }
  },
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -37,8 +37,6 @@
      "ctrl-shift-a": "editor::SelectLargerSyntaxNode",
      "ctrl-shift-d": "editor::DuplicateSelection",
      "alt-f3": "editor::SelectAllMatches", // find_all_under
-      // "ctrl-f3": "", // find_under (cancels any selections)
-      // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections)
      "f9": "editor::SortLinesCaseSensitive",
      "ctrl-f9": "editor::SortLinesCaseInsensitive",
      "f12": "editor::GoToDefinition",
@@ -51,9 +49,7 @@
      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "f3": "editor::FindNextMatch",
-      "shift-f3": "editor::FindPreviousMatch"
+      "ctrl-delete": "editor::DeleteToNextWordEnd"
    }
  },
  {
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -38,8 +38,6 @@
      "cmd-shift-a": "editor::SelectLargerSyntaxNode",
      "cmd-shift-d": "editor::DuplicateSelection",
      "ctrl-cmd-g": "editor::SelectAllMatches", // find_all_under
-      // "cmd-alt-g": "", // find_under (cancels any selections)
-      // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections)
      "f5": "editor::SortLinesCaseSensitive",
      "ctrl-f5": "editor::SortLinesCaseInsensitive",
      "shift-f12": "editor::FindAllReferences",
@@ -53,9 +51,7 @@
      "cmd-shift-j": "editor::JoinLines",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "cmd-g": "editor::FindNextMatch",
-      "cmd-shift-g": "editor::FindPreviousMatch"
+      "ctrl-delete": "editor::DeleteToNextWordEnd"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -203,7 +203,6 @@
      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
      "d": "vim::PushDelete",
-      "delete": "vim::DeleteRight",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
      "g shift-j": "vim::JoinLinesNoWhitespace",
@@ -539,7 +538,6 @@
    "bindings": {
      "d": "vim::CurrentLine",
      "s": "vim::PushDeleteSurrounds",
-      "v": "vim::PushForcedMotion", // "d v"
      "o": "editor::ToggleSelectedDiffHunks", // "d o"
      "shift-o": "git::ToggleStaged",
      "p": "git::Restore", // "d p"
@@ -588,7 +586,6 @@
    "context": "vim_operator == y",
    "bindings": {
      "y": "vim::CurrentLine",
-      "v": "vim::PushForcedMotion",
      "s": ["vim::PushAddSurrounds", {}]
    }
  },
--- a/assets/prompts/assistant_system_prompt.hbs
+++ b/assets/prompts/assistant_system_prompt.hbs
@@ -1,65 +1,148 @@
-You are a powerful agentic AI coding assistant. You operate exclusively in Zed, the world's best IDE.
+You are an AI assistant integrated into a code editor. You have the programming ability of an expert programmer who takes pride in writing high-quality code and is driven to the point of obsession about solving problems effectively. Your goal is to do one of the following two things:

-You are pair programming with a USER to solve their coding task.
-The task may require creating a new codebase, modifying or debugging an existing codebase, or simply answering a question.
-Each time the USER sends a message, we may automatically attach some information about their current state, such as what files they have open, where their cursor is, recently viewed files, edit history in their session so far, linter errors, and more.
-This information may or may not be relevant to the coding task, it is up for you to decide.
-Your main goal is to follow the USER's instructions at each message.
+1. Help users answer questions and perform tasks related to their codebase.
+2. Answer general-purpose questions unrelated to their particular codebase.

-<communication>
-1. Be conversational but professional.
-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. Use \( and \) for inline math, \[ and \] for block math.
-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.
-</communication>
+It will be up to you to decide which of these you are doing based on what the user has told you. When unclear, ask clarifying questions to understand the user's intent before proceeding.

-<tool_calling>
-You have tools at your disposal to solve the coding task. Follow these rules regarding tool calls:
-1. ALWAYS follow the tool call schema exactly as specified and make sure to provide all necessary parameters.
-2. The conversation may reference tools that are no longer available. NEVER call tools that are not explicitly provided.
-3. **NEVER refer to tool names when speaking to the USER.** For example, instead of saying 'I need to use the edit_file tool to edit your file', just say 'I will edit your file'.
-4. Only calls tools when they are necessary. If the USER's task is general or you already know the answer, just respond without calling tools.
-5. Before calling each tool, first explain to the USER why you are calling it.
-</tool_calling>
+You should only perform actions that modify the user's system if explicitly requested by the user:
+- If the user asks a question about how to accomplish a task, provide guidance or information, and use read-only tools (e.g., search) to assist. You may suggest potential actions, but do not directly modify the user's system without explicit instruction.
+- If the user clearly requests that you perform an action, carry out the action directly without explaining why you are doing so.

-<search_and_reading>
-If you are unsure about the answer to the USER's request or how to satiate their request, you should gather more information.
-This can be done with additional tool calls, asking clarifying questions, etc...
+When answering questions, it's okay to give incomplete examples containing comments about what would go there in a real version. When being asked to directly perform tasks on the code base, you must ALWAYS make fully working code. You may never "simplify" the code by omitting or deleting functionality you know the user has requested, and you must NEVER write comments like "in a full version, this would..." - instead, you must actually implement the real version. Don't be lazy!

-For example, if you've performed a semantic search, and the results may not fully answer the USER's request, or merit gathering more information, feel free to call more tools.
-Similarly, if you've performed an edit that may partially satiate the USER's query, but you're not confident, gather more information or use more tools
-before ending your turn.
+Note that project files are automatically backed up. The user can always get them back later if anything goes wrong, so there's
+no need to create backup files (e.g. `.bak` files) because these files will just take up unnecessary space on the user's disk.

-Bias towards not asking the user for help if you can find the answer yourself.
-</search_and_reading>
+When attempting to resolve issues around failing tests, never simply remove the failing tests. Unless the user explicitly asks you to remove tests, ALWAYS attempt to fix the code causing the tests to fail.

-<making_code_changes>
-When making code changes, NEVER output code to the USER, unless requested. Instead use one of the code edit tools to implement the change.
-Use the code edit tools at most once per turn.
-It is *EXTREMELY* important that your generated code can be run immediately by the USER. To ensure this, follow these instructions carefully:
-1. Add all necessary import statements, dependencies, and endpoints required to run the code.
-2. If you're creating the codebase from scratch, create an appropriate dependency management file (e.g. requirements.txt) with package versions and a helpful README.
-3. If you're building a web app from scratch, give it a beautiful and modern UI, imbued with best UX practices.
-4. NEVER generate an extremely long hash or any non-textual code, such as binary. These are not helpful to the USER and are very expensive.
-5. Unless you are appending some small easy to apply edit to a file, or creating a new file, you MUST read the the contents or section of what you're editing before editing it.
-6. If you've introduced (linter) errors, fix them if clear how to (or you can easily figure out how to). Do not make uneducated guesses. And DO NOT loop more than 3 times on fixing linter errors on the same file. On the third time, you should stop and ask the user what to do next.
-7. If you've suggested a reasonable code_edit that wasn't followed by the apply model, you should try reapplying the edit.
-</making_code_changes>
+Ignore "TODO"-type comments unless they're relevant to the user's explicit request or the user specifically asks you to address them. It is, however, okay to include them in codebase summaries.

-<debugging>
-When debugging, only make code changes if you are certain that you can solve the problem.
-Otherwise, follow debugging best practices:
-1. Address the root cause instead of the symptoms.
-2. Add descriptive logging statements and error messages to track variable and code state.
-3. Add test functions and statements to isolate the problem.
-</debugging>
+<style>
+Editing code:
+- Make sure to take previous edits into account.
+- The edits you perform might lead to errors or warnings. At the end of your changes, check whether you introduced any problems, and fix them before providing a summary of the changes you made.
+- You may only attempt to fix these up to 3 times. If you have tried 3 times to fix them, and there are still problems remaining, you must not continue trying to fix them, and must instead tell the user that there are problems remaining - and ask if the user would like you to attempt to solve them further.
+- Do not fix errors unrelated to your changes unless the user explicitly asks you to do so.
+- Prefer to move files over recreating them. The move can be followed by minor edits if required.
+- If you seem to be stuck, never go back and "simplify the implementation" by deleting the parts of the implementation you're stuck on and replacing them with comments. If you ever feel the urge to do this, instead immediately stop whatever you're doing (even if the code is in a broken state), report that you are stuck, explain what you're stuck on, and ask the user how to proceed.

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

 The user has opened a project that contains the following root directories/files. Whenever you specify a path in the project, it must be a relative path which begins with one of these root directories/files:

@@ -80,8 +163,3 @@ There are rules that apply to these root directories:
 {{/if}}
 {{/each}}
 {{/if}}
-
-<user_environment>
-Operating System: {{os}} ({{arch}})
-Shell: {{shell}}
-</user_environment>
--- a/assets/prompts/assistant_system_prompt_reminder.hbs
+++ b/assets/prompts/assistant_system_prompt_reminder.hbs
@@ -0,0 +1 @@
+In your response, make sure to remember and follow my instructions about how to format code blocks (and don't mention that you are remembering it, just follow the instructions).
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -80,8 +80,6 @@
    // Values are clamped to the [0.0, 1.0] range.
    "inactive_opacity": 1.0
  },
-  // Layout mode of the bottom dock. Defaults to "contained"
-  "bottom_dock_layout": "contained",
  // The direction that you want to split panes horizontally. Defaults to "up"
  "pane_split_direction_horizontal": "up",
  // The direction that you want to split panes horizontally. Defaults to "left"
@@ -626,14 +624,14 @@
      // The provider to use.
      "provider": "zed.dev",
      // The model to use.
-      "model": "claude-3-7-sonnet-latest"
+      "model": "claude-3-5-sonnet-latest"
    },
    // The model to use when applying edits from the assistant.
    "editor_model": {
      // The provider to use.
      "provider": "zed.dev",
      // The model to use.
-      "model": "claude-3-7-sonnet-latest"
+      "model": "claude-3-5-sonnet-latest"
    },
    // When enabled, the agent can run potentially destructive actions without asking for your confirmation.
    "always_allow_tool_actions": false,
@@ -644,7 +642,6 @@
        // We don't know which of the context server tools are safe for the "Ask" profile, so we don't enable them by default.
        // "enable_all_context_servers": true,
        "tools": {
-          "contents": true,
          "diagnostics": true,
          "fetch": true,
          "list_directory": false,
@@ -659,25 +656,22 @@
        "name": "Write",
        "enable_all_context_servers": true,
        "tools": {
-          "batch_tool": false,
-          "code_actions": false,
-          "code_symbols": false,
-          "contents": false,
+          "bash": true,
+          "batch_tool": true,
+          "code_symbols": true,
          "copy_path": false,
          "create_file": true,
          "delete_path": false,
          "diagnostics": true,
-          "edit_file": true,
+          "find_replace_file": true,
          "fetch": true,
-          "list_directory": true,
+          "list_directory": false,
          "move_path": false,
-          "now": false,
+          "now": true,
          "path_search": true,
          "read_file": true,
          "regex_search": true,
-          "rename": false,
-          "symbol_info": false,
-          "terminal": true,
+          "symbol_info": true,
          "thinking": true
        }
      }
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -19,6 +19,7 @@ test-support = [
 ]

 [dependencies]
+agent_rules.workspace = true
 anyhow.workspace = true
 assistant_context_editor.workspace = true
 assistant_settings.workspace = true
@@ -31,7 +32,6 @@ client.workspace = true
 clock.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
-component.workspace = true
 context_server.workspace = true
 convert_case.workspace = true
 db.workspace = true
@@ -51,7 +51,6 @@ itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
-linkme.workspace = true
 log.workspace = true
 lsp.workspace = true
 markdown.workspace = true
@@ -80,16 +79,15 @@ terminal.workspace = true
 terminal_view.workspace = true
 text.workspace = true
 theme.workspace = true
-thiserror.workspace = true
 time.workspace = true
 time_format.workspace = true
 ui.workspace = true
 ui_input.workspace = true
 util.workspace = true
 uuid.workspace = true
-workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
+workspace-hack.workspace = true

 [dev-dependencies]
 buffer_diff = { workspace = true, features = ["test-support"] }
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1,41 +1,40 @@
+use crate::AssistantPanel;
 use crate::context::{AssistantContext, ContextId};
 use crate::context_picker::MentionLink;
 use crate::thread::{
    LastRestoreCheckpoint, MessageId, MessageSegment, RequestKind, Thread, ThreadError,
    ThreadEvent, ThreadFeedback,
 };
-use crate::thread_store::{RulesLoadingError, ThreadStore};
+use crate::thread_store::ThreadStore;
 use crate::tool_use::{PendingToolUseStatus, ToolUse, ToolUseStatus};
 use crate::ui::{AddedContext, AgentNotification, AgentNotificationEvent, ContextPill};
-use crate::{AssistantPanel, OpenActiveThreadAsMarkdown};
 use anyhow::Context as _;
 use assistant_settings::{AssistantSettings, NotifyWhenAgentWaiting};
 use collections::{HashMap, HashSet};
 use editor::scroll::Autoscroll;
-use editor::{Editor, EditorElement, EditorStyle, MultiBuffer};
+use editor::{Editor, MultiBuffer};
 use gpui::{
    AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent, ClipboardItem,
    DefiniteLength, EdgesRefinement, Empty, Entity, Focusable, Hsla, ListAlignment, ListState,
    MouseButton, PlatformDisplay, ScrollHandle, Stateful, StyleRefinement, Subscription, Task,
-    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, WindowHandle,
+    TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, WindowHandle,
    linear_color_stop, linear_gradient, list, percentage, pulsating_between,
 };
 use language::{Buffer, LanguageRegistry};
-use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role, StopReason};
-use markdown::parser::{CodeBlockKind, CodeBlockMetadata};
-use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle, ParsedMarkdown};
+use language_model::{ConfiguredModel, LanguageModelRegistry, LanguageModelToolUseId, Role};
+use markdown::parser::CodeBlockKind;
+use markdown::{Markdown, MarkdownElement, MarkdownStyle, ParsedMarkdown, without_fences};
 use project::ProjectItem as _;
 use rope::Point;
 use settings::{Settings as _, update_settings_file};
+use std::ops::Range;
 use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
 use std::time::Duration;
 use text::ToPoint;
 use theme::ThemeSettings;
-use ui::{
-    Disclosure, IconButton, KeyBinding, Scrollbar, ScrollbarState, TextSize, Tooltip, prelude::*,
-};
+use ui::{Disclosure, IconButton, KeyBinding, Scrollbar, ScrollbarState, Tooltip, prelude::*};
 use util::ResultExt as _;
 use workspace::{OpenOptions, Workspace};

@@ -58,7 +57,6 @@ pub struct ActiveThread {
    editing_message: Option<(MessageId, EditMessageState)>,
    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
    expanded_thinking_segments: HashMap<(MessageId, usize), bool>,
-    expanded_code_blocks: HashMap<(MessageId, usize), bool>,
    last_error: Option<ThreadError>,
    notifications: Vec<WindowHandle<AgentNotification>>,
    copied_code_block_ids: HashSet<(MessageId, usize)>,
@@ -175,37 +173,11 @@ fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
    });

    MarkdownStyle {
-        base_text_style: text_style.clone(),
+        base_text_style: text_style,
        syntax: cx.theme().syntax().clone(),
        selection_background_color: cx.theme().players().local().selection,
        code_block_overflow_x_scroll: true,
        table_overflow_x_scroll: true,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
        code_block: StyleRefinement {
            padding: EdgesRefinement {
                top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
@@ -317,17 +289,15 @@ fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
    }
 }

-const MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK: usize = 10;
-
 fn render_markdown_code_block(
    message_id: MessageId,
    ix: usize,
    kind: &CodeBlockKind,
    parsed_markdown: &ParsedMarkdown,
-    metadata: CodeBlockMetadata,
+    codeblock_range: Range<usize>,
    active_thread: Entity<ActiveThread>,
    workspace: WeakEntity<Workspace>,
-    _window: &Window,
+    _window: &mut Window,
    cx: &App,
 ) -> Div {
    let label = match kind {
@@ -407,20 +377,16 @@ fn render_markdown_code_block(
                .rounded_sm()
                .hover(|item| item.bg(cx.theme().colors().element_hover.opacity(0.5)))
                .tooltip(Tooltip::text("Jump to File"))
+                .children(
+                    file_icons::FileIcons::get_icon(&path_range.path, cx)
+                        .map(Icon::from_path)
+                        .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
+                )
+                .child(content)
                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .children(
-                            file_icons::FileIcons::get_icon(&path_range.path, cx)
-                                .map(Icon::from_path)
-                                .map(|icon| icon.color(Color::Muted).size(IconSize::XSmall)),
-                        )
-                        .child(content)
-                        .child(
-                            Icon::new(IconName::ArrowUpRight)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
-                        ),
+                    Icon::new(IconName::ArrowUpRight)
+                        .size(IconSize::XSmall)
+                        .color(Color::Ignored),
                )
                .on_click({
                    let path_range = path_range.clone();
@@ -478,24 +444,17 @@ fn render_markdown_code_block(
        }),
    };

-    let codeblock_was_copied = active_thread
-        .read(cx)
-        .copied_code_block_ids
-        .contains(&(message_id, ix));
-
-    let is_expanded = active_thread
-        .read(cx)
-        .expanded_code_blocks
-        .get(&(message_id, ix))
-        .copied()
-        .unwrap_or(false);
-
    let codeblock_header_bg = cx
        .theme()
        .colors()
        .element_background
        .blend(cx.theme().colors().editor_foreground.opacity(0.01));

+    let codeblock_was_copied = active_thread
+        .read(cx)
+        .copied_code_block_ids
+        .contains(&(message_id, ix));
+
    let codeblock_header = h_flex()
        .group("codeblock_header")
        .p_1()
@@ -507,108 +466,57 @@ fn render_markdown_code_block(
        .rounded_t_md()
        .children(label)
        .child(
-            h_flex()
-                .gap_1()
-                .child(
-                    div().visible_on_hover("codeblock_header").child(
-                        IconButton::new(
-                            ("copy-markdown-code", ix),
-                            if codeblock_was_copied {
-                                IconName::Check
-                            } else {
-                                IconName::Copy
-                            },
-                        )
-                        .icon_color(Color::Muted)
-                        .shape(ui::IconButtonShape::Square)
-                        .tooltip(Tooltip::text("Copy Code"))
-                        .on_click({
-                            let active_thread = active_thread.clone();
-                            let parsed_markdown = parsed_markdown.clone();
-                            let code_block_range = metadata.content_range.clone();
-                            move |_event, _window, cx| {
-                                active_thread.update(cx, |this, cx| {
-                                    this.copied_code_block_ids.insert((message_id, ix));
-
-                                    let code = parsed_markdown.source()[code_block_range.clone()]
-                                        .to_string();
-                                    cx.write_to_clipboard(ClipboardItem::new_string(code));
-
-                                    cx.spawn(async move |this, cx| {
-                                        cx.background_executor()
-                                            .timer(Duration::from_secs(2))
-                                            .await;
-
-                                        cx.update(|cx| {
-                                            this.update(cx, |this, cx| {
-                                                this.copied_code_block_ids
-                                                    .remove(&(message_id, ix));
-                                                cx.notify();
-                                            })
-                                        })
-                                        .ok();
-                                    })
-                                    .detach();
-                                });
-                            }
-                        }),
-                    ),
-                )
-                .when(
-                    metadata.line_count > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK,
-                    |header| {
-                        header.child(
-                            IconButton::new(
-                                ("expand-collapse-code", ix),
-                                if is_expanded {
-                                    IconName::ChevronUp
-                                } else {
-                                    IconName::ChevronDown
-                                },
-                            )
-                            .icon_color(Color::Muted)
-                            .shape(ui::IconButtonShape::Square)
-                            .tooltip(Tooltip::text(if is_expanded {
-                                "Collapse Code"
-                            } else {
-                                "Expand Code"
-                            }))
-                            .on_click({
-                                let active_thread = active_thread.clone();
-                                move |_event, _window, cx| {
-                                    active_thread.update(cx, |this, cx| {
-                                        let is_expanded = this
-                                            .expanded_code_blocks
-                                            .entry((message_id, ix))
-                                            .or_insert(false);
-                                        *is_expanded = !*is_expanded;
-                                        cx.notify();
-                                    });
-                                }
-                            }),
-                        )
+            div().visible_on_hover("codeblock_header").child(
+                IconButton::new(
+                    ("copy-markdown-code", ix),
+                    if codeblock_was_copied {
+                        IconName::Check
+                    } else {
+                        IconName::Copy
                    },
-                ),
+                )
+                .icon_color(Color::Muted)
+                .shape(ui::IconButtonShape::Square)
+                .tooltip(Tooltip::text("Copy Code"))
+                .on_click({
+                    let active_thread = active_thread.clone();
+                    let parsed_markdown = parsed_markdown.clone();
+                    move |_event, _window, cx| {
+                        active_thread.update(cx, |this, cx| {
+                            this.copied_code_block_ids.insert((message_id, ix));
+
+                            let code =
+                                without_fences(&parsed_markdown.source()[codeblock_range.clone()])
+                                    .to_string();
+
+                            cx.write_to_clipboard(ClipboardItem::new_string(code.clone()));
+
+                            cx.spawn(async move |this, cx| {
+                                cx.background_executor().timer(Duration::from_secs(2)).await;
+
+                                cx.update(|cx| {
+                                    this.update(cx, |this, cx| {
+                                        this.copied_code_block_ids.remove(&(message_id, ix));
+                                        cx.notify();
+                                    })
+                                })
+                                .ok();
+                            })
+                            .detach();
+                        });
+                    }
+                }),
+            ),
        );

    v_flex()
-        .my_2()
+        .mb_2()
+        .relative()
        .overflow_hidden()
        .rounded_lg()
        .border_1()
        .border_color(cx.theme().colors().border_variant)
-        .bg(cx.theme().colors().editor_background)
        .child(codeblock_header)
-        .when(
-            metadata.line_count > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK,
-            |this| {
-                if is_expanded {
-                    this.h_full()
-                } else {
-                    this.max_h_80()
-                }
-            },
-        )
 }

 fn open_markdown_link(
@@ -696,7 +604,6 @@ impl ActiveThread {
        let subscriptions = vec![
            cx.observe(&thread, |_, _, cx| cx.notify()),
            cx.subscribe_in(&thread, window, Self::handle_thread_event),
-            cx.subscribe(&thread_store, Self::handle_rules_loading_error),
        ];

        let list_state = ListState::new(0, ListAlignment::Bottom, px(2048.), {
@@ -719,7 +626,6 @@ impl ActiveThread {
            rendered_tool_uses: HashMap::default(),
            expanded_tool_uses: HashMap::default(),
            expanded_thinking_segments: HashMap::default(),
-            expanded_code_blocks: HashMap::default(),
            list_state: list_state.clone(),
            scrollbar_state: ScrollbarState::new(list_state),
            show_scrollbar: false,
@@ -862,9 +768,10 @@ impl ActiveThread {
            | ThreadEvent::SummaryChanged => {
                self.save_thread(cx);
            }
-            ThreadEvent::Stopped(reason) => match reason {
-                Ok(StopReason::EndTurn | StopReason::MaxTokens) => {
-                    let thread = self.thread.read(cx);
+            ThreadEvent::DoneStreaming => {
+                let thread = self.thread.read(cx);
+
+                if !thread.is_generating() {
                    self.show_notification(
                        if thread.used_tools_since_last_user_message() {
                            "Finished running tools"
@@ -876,8 +783,7 @@ impl ActiveThread {
                        cx,
                    );
                }
-                _ => {}
-            },
+            }
            ThreadEvent::ToolConfirmationNeeded => {
                self.show_notification("Waiting for tool confirmation", IconName::Info, window, cx);
            }
@@ -922,7 +828,11 @@ impl ActiveThread {
                self.save_thread(cx);
                cx.notify();
            }
-            ThreadEvent::UsePendingTools { tool_uses } => {
+            ThreadEvent::UsePendingTools => {
+                let tool_uses = self
+                    .thread
+                    .update(cx, |thread, cx| thread.use_pending_tools(cx));
+
                for tool_use in tool_uses {
                    self.render_tool_use_markdown(
                        tool_use.id.clone(),
@@ -934,8 +844,11 @@ impl ActiveThread {
                }
            }
            ThreadEvent::ToolFinished {
-                pending_tool_use, ..
+                pending_tool_use,
+                canceled,
+                ..
            } => {
+                let canceled = *canceled;
                if let Some(tool_use) = pending_tool_use {
                    self.render_tool_use_markdown(
                        tool_use.id.clone(),
@@ -943,30 +856,29 @@ impl ActiveThread {
                        &tool_use.input,
                        self.thread
                            .read(cx)
-                            .tool_result(&tool_use.id)
-                            .map(|result| result.content.clone().into())
+                            .output_for_tool(&tool_use.id)
+                            .map(|output| output.clone().into())
                            .unwrap_or("".into()),
                        cx,
                    );
                }
+
+                if self.thread.read(cx).all_tools_finished() {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(ConfiguredModel { model, .. }) = model_registry.default_model() {
+                        self.thread.update(cx, |thread, cx| {
+                            thread.attach_tool_results(cx);
+                            if !canceled {
+                                thread.send_to_model(model, RequestKind::Chat, cx);
+                            }
+                        });
+                    }
+                }
            }
            ThreadEvent::CheckpointChanged => cx.notify(),
        }
    }

-    fn handle_rules_loading_error(
-        &mut self,
-        _thread_store: Entity<ThreadStore>,
-        error: &RulesLoadingError,
-        cx: &mut Context<Self>,
-    ) {
-        self.last_error = Some(ThreadError::Message {
-            header: "Error loading rules file".into(),
-            message: error.message.clone(),
-        });
-        cx.notify();
-    }
-
    fn show_notification(
        &mut self,
        caption: impl Into<SharedString>,
@@ -1402,16 +1314,8 @@ impl ActiveThread {
        let editor_bg_color = colors.editor_background;
        let bg_user_message_header = editor_bg_color.blend(active_color.opacity(0.25));

-        let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileCode)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::XSmall)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click(|_event, window, cx| {
-                window.dispatch_action(Box::new(OpenActiveThreadAsMarkdown), cx)
-            });
-
        let feedback_container = h_flex().py_2().px_4().gap_1().justify_between();
+
        let feedback_items = match self.thread.read(cx).message_feedback(message_id) {
            Some(feedback) => feedback_container
                .child(
@@ -1463,8 +1367,7 @@ impl ActiveThread {
                                        cx,
                                    );
                                })),
-                        )
-                        .child(open_as_markdown),
+                        ),
                )
                .into_any_element(),
            None => feedback_container
@@ -1477,7 +1380,6 @@ impl ActiveThread {
                )
                .child(
                    h_flex()
-                        .pr_1()
                        .gap_1()
                        .child(
                            IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
@@ -1508,8 +1410,7 @@ impl ActiveThread {
                                        cx,
                                    );
                                })),
-                        )
-                        .child(open_as_markdown),
+                        ),
                )
                .into_any_element(),
        };
@@ -1524,36 +1425,12 @@ impl ActiveThread {
                    .when(!message_is_empty, |parent| {
                        parent.child(
                            if let Some(edit_message_editor) = edit_message_editor.clone() {
-                                let settings = ThemeSettings::get_global(cx);
-                                let font_size = TextSize::Small.rems(cx);
-                                let line_height = font_size.to_pixels(window.rem_size()) * 1.5;
-
-                                let text_style = TextStyle {
-                                    color: cx.theme().colors().text,
-                                    font_family: settings.buffer_font.family.clone(),
-                                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                                    font_features: settings.buffer_font.features.clone(),
-                                    font_size: font_size.into(),
-                                    line_height: line_height.into(),
-                                    ..Default::default()
-                                };
-
                                div()
                                    .key_context("EditMessageEditor")
                                    .on_action(cx.listener(Self::cancel_editing_message))
                                    .on_action(cx.listener(Self::confirm_editing_message))
                                    .min_h_6()
-                                    .pt_1()
-                                    .child(EditorElement::new(
-                                        &edit_message_editor,
-                                        EditorStyle {
-                                            background: colors.editor_background,
-                                            local_player: cx.theme().players().local(),
-                                            text: text_style,
-                                            syntax: cx.theme().syntax().clone(),
-                                            ..Default::default()
-                                        },
-                                    ))
+                                    .child(edit_message_editor)
                                    .into_any()
                            } else {
                                div()
@@ -1718,9 +1595,11 @@ impl ActiveThread {
                ),
            Role::Assistant => v_flex()
                .id(("message-container", ix))
-                .ml_2p5()
+                .ml_2()
                .pl_2()
                .pr_4()
+                .border_l_1()
+                .border_color(cx.theme().colors().border_variant)
                .children(message_content)
                .when(has_tool_uses, |parent| {
                    parent.children(
@@ -1956,13 +1835,13 @@ impl ActiveThread {
                                    render: Arc::new({
                                        let workspace = workspace.clone();
                                        let active_thread = cx.entity();
-                                        move |kind, parsed_markdown, range, metadata, window, cx| {
+                                        move |id, kind, parsed_markdown, range, window, cx| {
                                            render_markdown_code_block(
                                                message_id,
-                                                range.start,
+                                                id,
                                                kind,
                                                parsed_markdown,
-                                                metadata,
+                                                range,
                                                active_thread.clone(),
                                                workspace.clone(),
                                                window,
@@ -1970,47 +1849,6 @@ impl ActiveThread {
                                            )
                                        }
                                    }),
-                                    transform: Some(Arc::new({
-                                        let active_thread = cx.entity();
-                                        move |el, range, metadata, _, cx| {
-                                            let is_expanded = active_thread
-                                                .read(cx)
-                                                .expanded_code_blocks
-                                                .get(&(message_id, range.start))
-                                                .copied()
-                                                .unwrap_or(false);
-
-                                            if is_expanded
-                                                || metadata.line_count
-                                                    <= MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK
-                                            {
-                                                return el;
-                                            }
-                                            el.child(
-                                                div()
-                                                    .absolute()
-                                                    .bottom_0()
-                                                    .left_0()
-                                                    .w_full()
-                                                    .h_1_4()
-                                                    .rounded_b_lg()
-                                                    .bg(gpui::linear_gradient(
-                                                        0.,
-                                                        gpui::linear_color_stop(
-                                                            cx.theme().colors().editor_background,
-                                                            0.,
-                                                        ),
-                                                        gpui::linear_color_stop(
-                                                            cx.theme()
-                                                                .colors()
-                                                                .editor_background
-                                                                .opacity(0.),
-                                                            1.,
-                                                        ),
-                                                    )),
-                                            )
-                                        }
-                                    })),
                                })
                                .on_url_click({
                                    let workspace = self.workspace.clone();
@@ -2364,18 +2202,23 @@ impl ActiveThread {
                                .buffer_font(cx),
                        )
                        .child(div().w_full().text_ui_sm(cx).children(
-                            rendered_tool_use.as_ref().map(|rendered| {
-                                MarkdownElement::new(
-                                    rendered.output.clone(),
-                                    tool_use_markdown_style(window, cx),
-                                )
-                                .on_url_click({
-                                    let workspace = self.workspace.clone();
-                                    move |text, window, cx| {
-                                        open_markdown_link(text, workspace.clone(), window, cx);
-                                    }
+                            if let Some(card) = self.thread.read(cx).card_for_tool(&tool_use.id) {
+                                Some(card.clone().into_any_element())
+                            } else {
+                                rendered_tool_use.as_ref().map(|rendered| {
+                                    MarkdownElement::new(
+                                        rendered.output.clone(),
+                                        tool_use_markdown_style(window, cx),
+                                    )
+                                    .on_url_click({
+                                        let workspace = self.workspace.clone();
+                                        move |text, window, cx| {
+                                            open_markdown_link(text, workspace.clone(), window, cx);
+                                        }
+                                    })
+                                    .into_any_element()
                                })
-                            }),
+                            },
                        )),
                ),
                ToolUseStatus::Running => container.child(
@@ -2417,10 +2260,11 @@ impl ActiveThread {
                                .color(Color::Muted)
                                .buffer_font(cx),
                        )
-                        .child(
-                            div()
-                                .text_ui_sm(cx)
-                                .children(rendered_tool_use.as_ref().map(|rendered| {
+                        .child(div().text_ui_sm(cx).children(
+                            if let Some(card) = self.thread.read(cx).card_for_tool(&tool_use.id) {
+                                Some(card.clone().into_any_element())
+                            } else {
+                                rendered_tool_use.as_ref().map(|rendered| {
                                    MarkdownElement::new(
                                        rendered.output.clone(),
                                        tool_use_markdown_style(window, cx),
@@ -2431,8 +2275,10 @@ impl ActiveThread {
                                            open_markdown_link(text, workspace.clone(), window, cx);
                                        }
                                    })
-                                })),
-                        ),
+                                    .into_any_element()
+                                })
+                            },
+                        )),
                ),
                ToolUseStatus::Pending => container,
                ToolUseStatus::NeedsConfirmation => container.child(
@@ -2765,13 +2611,12 @@ impl ActiveThread {
    }

    fn render_rules_item(&self, cx: &Context<Self>) -> AnyElement {
-        let project_context = self.thread.read(cx).project_context();
-        let project_context = project_context.borrow();
-        let Some(project_context) = project_context.as_ref() else {
+        let Some(system_prompt_context) = self.thread.read(cx).system_prompt_context().as_ref()
+        else {
            return div().into_any();
        };

-        let rules_files = project_context
+        let rules_files = system_prompt_context
            .worktrees
            .iter()
            .filter_map(|worktree| worktree.rules_file.as_ref())
@@ -2861,13 +2706,12 @@ impl ActiveThread {
    }

    fn handle_open_rules(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        let project_context = self.thread.read(cx).project_context();
-        let project_context = project_context.borrow();
-        let Some(project_context) = project_context.as_ref() else {
+        let Some(system_prompt_context) = self.thread.read(cx).system_prompt_context().as_ref()
+        else {
            return;
        };

-        let abs_paths = project_context
+        let abs_paths = system_prompt_context
            .worktrees
            .iter()
            .flat_map(|worktree| worktree.rules_file.as_ref())
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -1,4 +1,4 @@
-use crate::{Keep, KeepAll, Reject, RejectAll, Thread, ThreadEvent};
+use crate::{Keep, Reject, Thread, ThreadEvent};
 use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
 use collections::HashSet;
@@ -843,7 +843,7 @@ impl ToolbarItemView for AgentDiffToolbar {
 }

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

-        let focus_handle = agent_diff.focus_handle(cx);
-
        h_group_xl()
            .my_neg_1()
            .items_center()
@@ -866,25 +864,15 @@ impl Render for AgentDiffToolbar {
            .child(
                h_group_sm()
                    .child(
-                        Button::new("reject-all", "Reject All")
-                            .key_binding({
-                                KeyBinding::for_action_in(&RejectAll, &focus_handle, window, cx)
-                                    .map(|kb| kb.size(rems_from_px(12.)))
-                            })
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&RejectAll, window, cx)
-                            })),
+                        Button::new("reject-all", "Reject All").on_click(cx.listener(
+                            |this, _, window, cx| {
+                                this.dispatch_action(&crate::RejectAll, window, cx)
+                            },
+                        )),
                    )
-                    .child(
-                        Button::new("keep-all", "Keep All")
-                            .key_binding({
-                                KeyBinding::for_action_in(&KeepAll, &focus_handle, window, cx)
-                                    .map(|kb| kb.size(rems_from_px(12.)))
-                            })
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&KeepAll, window, cx)
-                            })),
-                    ),
+                    .child(Button::new("keep-all", "Keep All").on_click(cx.listener(
+                        |this, _, window, cx| this.dispatch_action(&crate::KeepAll, window, cx),
+                    ))),
            )
    }
 }
@@ -894,7 +882,6 @@ mod tests {
    use super::*;
    use crate::{ThreadStore, thread_store};
    use assistant_settings::AssistantSettings;
-    use assistant_tool::ToolWorkingSet;
    use context_server::ContextServerSettings;
    use editor::EditorSettings;
    use gpui::TestAppContext;
@@ -934,16 +921,15 @@ mod tests {
            })
            .unwrap();

-        let thread_store = cx
-            .update(|cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
-            })
-            .await;
+        let thread_store = cx.update(|cx| {
+            ThreadStore::new(
+                project.clone(),
+                Arc::default(),
+                Arc::new(PromptBuilder::new(None).unwrap()),
+                cx,
+            )
+            .unwrap()
+        });
        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());

--- a/crates/agent/src/assistant.rs
+++ b/crates/agent/src/assistant.rs
@@ -18,7 +18,6 @@ mod terminal_inline_assistant;
 mod thread;
 mod thread_history;
 mod thread_store;
-mod tool_compatibility;
 mod tool_use;
 mod ui;

@@ -47,11 +46,10 @@ pub use agent_diff::{AgentDiff, AgentDiffToolbar};
 actions!(
    agent,
    [
-        NewTextThread,
+        NewPromptEditor,
        ToggleContextPicker,
        ToggleProfileSelector,
        RemoveAllContext,
-        ExpandMessageEditor,
        OpenHistory,
        AddContextServer,
        RemoveSelectedThread,
--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -12,9 +12,7 @@ use fs::Fs;
 use gpui::{Action, AnyView, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription};
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
 use settings::{Settings, update_settings_file};
-use ui::{
-    Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Switch, Tooltip, prelude::*,
-};
+use ui::{Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Switch, prelude::*};
 use util::ResultExt as _;
 use zed_actions::ExtensionCategoryFilter;

@@ -29,7 +27,7 @@ pub struct AssistantConfiguration {
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_manager: Entity<ContextServerManager>,
    expanded_context_server_tools: HashMap<Arc<str>, bool>,
-    tools: Entity<ToolWorkingSet>,
+    tools: Arc<ToolWorkingSet>,
    _registry_subscription: Subscription,
 }

@@ -37,7 +35,7 @@ impl AssistantConfiguration {
    pub fn new(
        fs: Arc<dyn Fs>,
        context_server_manager: Entity<ContextServerManager>,
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -226,7 +224,7 @@ impl AssistantConfiguration {

    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 tools_by_source = self.tools.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.";
@@ -238,10 +236,7 @@ impl AssistantConfiguration {
            .child(
                v_flex()
                    .gap_0p5()
-                    .child(
-                        Headline::new("Model Context Protocol (MCP) Servers")
-                            .size(HeadlineSize::Small),
-                    )
+                    .child(Headline::new("Context Servers (MCP)").size(HeadlineSize::Small))
                    .child(Label::new(SUBHEADING).color(Color::Muted)),
            )
            .children(context_servers.into_iter().map(|context_server| {
@@ -267,9 +262,10 @@ impl AssistantConfiguration {
                    .bg(cx.theme().colors().editor_background)
                    .child(
                        h_flex()
-                            .p_1()
                            .justify_between()
-                            .when(are_tools_expanded && tool_count > 1, |element| {
+                            .px_2()
+                            .py_1()
+                            .when(are_tools_expanded, |element| {
                                element
                                    .border_b_1()
                                    .border_color(cx.theme().colors().border)
@@ -279,7 +275,6 @@ impl AssistantConfiguration {
                                    .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| {
@@ -300,11 +295,10 @@ impl AssistantConfiguration {
                                    .child(Label::new(context_server.id()))
                                    .child(
                                        Label::new(format!("{tool_count} tools"))
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small),
+                                            .color(Color::Muted),
                                    ),
                            )
-                            .child(
+                            .child(h_flex().child(
                                Switch::new("context-server-switch", is_running.into()).on_click({
                                    let context_server_manager =
                                        self.context_server_manager.clone();
@@ -340,7 +334,7 @@ impl AssistantConfiguration {
                                        }
                                    }
                                }),
-                            ),
+                            )),
                    )
                    .map(|parent| {
                        if !are_tools_expanded {
@@ -350,29 +344,14 @@ impl AssistantConfiguration {
                        parent.child(v_flex().children(tools.into_iter().enumerate().map(
                            |(ix, tool)| {
                                h_flex()
-                                    .id("tool-item")
-                                    .pl_2()
-                                    .pr_1()
+                                    .px_2()
                                    .py_1()
-                                    .gap_2()
-                                    .justify_between()
                                    .when(ix < tool_count - 1, |element| {
                                        element
                                            .border_b_1()
-                                            .border_color(cx.theme().colors().border_variant)
+                                            .border_color(cx.theme().colors().border)
                                    })
-                                    .child(
-                                        Label::new(tool.name())
-                                            .buffer_font(cx)
-                                            .size(LabelSize::Small),
-                                    )
-                                    .child(
-                                        IconButton::new(("tool-description", ix), IconName::Info)
-                                            .shape(ui::IconButtonShape::Square)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Ignored)
-                                            .tooltip(Tooltip::text(tool.description())),
-                                    )
+                                    .child(Label::new(tool.name()))
                            },
                        )))
                    })
@@ -383,7 +362,7 @@ impl AssistantConfiguration {
                    .gap_2()
                    .child(
                        h_flex().w_full().child(
-                            Button::new("add-context-server", "Add MCPs Directly")
+                            Button::new("add-context-server", "Add Context Server")
                                .style(ButtonStyle::Filled)
                                .layer(ElevationIndex::ModalSurface)
                                .full_width()
@@ -399,7 +378,7 @@ impl AssistantConfiguration {
                        h_flex().w_full().child(
                            Button::new(
                                "install-context-server-extensions",
-                                "Install MCP Extensions",
+                                "Install Context Server Extensions",
                            )
                            .style(ButtonStyle::Filled)
                            .layer(ElevationIndex::ModalSurface)
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
@@ -84,7 +84,7 @@ pub struct NewProfileMode {

 pub struct ManageProfilesModal {
    fs: Arc<dyn Fs>,
-    tools: Entity<ToolWorkingSet>,
+    tools: Arc<ToolWorkingSet>,
    thread_store: WeakEntity<ThreadStore>,
    focus_handle: FocusHandle,
    mode: Mode,
@@ -117,7 +117,7 @@ impl ManageProfilesModal {

    pub fn new(
        fs: Arc<dyn Fs>,
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        thread_store: WeakEntity<ThreadStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
--- a/crates/agent/src/assistant_configuration/tool_picker.rs
+++ b/crates/agent/src/assistant_configuration/tool_picker.rs
@@ -60,7 +60,7 @@ pub struct ToolPickerDelegate {
 impl ToolPickerDelegate {
    pub fn new(
        fs: Arc<dyn Fs>,
-        tool_set: Entity<ToolWorkingSet>,
+        tool_set: Arc<ToolWorkingSet>,
        thread_store: WeakEntity<ThreadStore>,
        profile_id: AgentProfileId,
        profile: AgentProfile,
@@ -68,7 +68,7 @@ impl ToolPickerDelegate {
    ) -> Self {
        let mut tool_entries = Vec::new();

-        for (source, tools) in tool_set.read(cx).tools_by_source(cx) {
+        for (source, tools) in tool_set.tools_by_source(cx) {
            tool_entries.extend(tools.into_iter().map(|tool| ToolEntry {
                name: tool.name().into(),
                source: source.clone(),
@@ -192,7 +192,7 @@ impl PickerDelegate for ToolPickerDelegate {
        if active_profile_id == &self.profile_id {
            self.thread_store
                .update(cx, |this, cx| {
-                    this.load_profile(self.profile.clone(), cx);
+                    this.load_profile(&self.profile, cx);
                })
                .log_err();
        }
--- a/crates/agent/src/assistant_model_selector.rs
+++ b/crates/agent/src/assistant_model_selector.rs
@@ -80,16 +80,17 @@ impl AssistantModelSelector {

 impl Render for AssistantModelSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
-
        let model_registry = LanguageModelRegistry::read_global(cx);
+
        let model = match self.model_type {
            ModelType::Default => model_registry.default_model(),
            ModelType::InlineAssistant => model_registry.inline_assistant_model(),
        };
-        let (model_name, model_icon) = match model {
-            Some(model) => (model.model.name().0, Some(model.provider.icon())),
-            _ => (SharedString::from("No model selected"), None),
+
+        let focus_handle = self.focus_handle.clone();
+        let model_name = match model {
+            Some(model) => model.model.name().0,
+            _ => SharedString::from("No model selected"),
        };

        LanguageModelSelectorPopoverMenu::new(
@@ -99,16 +100,10 @@ impl Render for AssistantModelSelector {
                .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(),
+                                .color(Color::Muted),
                        )
                        .child(
                            Icon::new(IconName::ChevronDown)
--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
@@ -44,8 +44,8 @@ use crate::thread::{Thread, ThreadError, ThreadId, TokenUsageRatio};
 use crate::thread_history::{PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::{
-    AgentDiff, ExpandMessageEditor, InlineAssistant, NewTextThread, NewThread,
-    OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ThreadEvent, ToggleContextPicker,
+    AgentDiff, InlineAssistant, NewPromptEditor, NewThread, OpenActiveThreadAsMarkdown,
+    OpenAgentDiff, OpenHistory, ThreadEvent, ToggleContextPicker,
 };

 pub fn init(cx: &mut App) {
@@ -70,7 +70,7 @@ pub fn init(cx: &mut App) {
                        panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
                    }
                })
-                .register_action(|workspace, _: &NewTextThread, window, cx| {
+                .register_action(|workspace, _: &NewPromptEditor, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
                        panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx));
@@ -90,16 +90,6 @@ pub fn init(cx: &mut App) {
                        let thread = panel.read(cx).thread.read(cx).thread().clone();
                        AgentDiff::deploy_in_workspace(thread, workspace, window, cx);
                    }
-                })
-                .register_action(|workspace, _: &ExpandMessageEditor, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.message_editor.update(cx, |editor, cx| {
-                                editor.expand_message_editor(&ExpandMessageEditor, window, cx);
-                            });
-                        });
-                    }
                });
        },
    )
@@ -203,13 +193,11 @@ impl AssistantPanel {
        cx: AsyncWindowContext,
    ) -> Task<Result<Entity<Self>>> {
        cx.spawn(async move |cx| {
-            let tools = cx.new(|_| ToolWorkingSet::default())?;
-            let thread_store = workspace
-                .update(cx, |workspace, cx| {
-                    let project = workspace.project().clone();
-                    ThreadStore::load(project, tools.clone(), prompt_builder.clone(), cx)
-                })?
-                .await;
+            let tools = Arc::new(ToolWorkingSet::default());
+            let thread_store = workspace.update(cx, |workspace, cx| {
+                let project = workspace.project().clone();
+                ThreadStore::new(project, tools.clone(), prompt_builder.clone(), cx)
+            })??;

            let slash_commands = Arc::new(SlashCommandWorkingSet::default());
            let context_store = workspace
@@ -569,7 +557,6 @@ impl AssistantPanel {
            ActiveView::Configuration | ActiveView::History => {
                self.active_view =
                    ActiveView::thread(self.thread.read(cx).thread().clone(), window, cx);
-                self.message_editor.focus_handle(cx).focus(window);
                cx.notify();
            }
            _ => {}
@@ -876,11 +863,7 @@ impl AssistantPanel {
                        .truncate()
                        .into_any_element()
                } else {
-                    div()
-                        .ml_2()
-                        .w_full()
-                        .child(change_title_editor.clone())
-                        .into_any_element()
+                    change_title_editor.clone().into_any_element()
                }
            }
            ActiveView::PromptEditor => {
@@ -1099,30 +1082,20 @@ impl AssistantPanel {
                                            window,
                                            cx,
                                            |menu, _window, _cx| {
-                                                menu
-                                                    .when(!is_empty, |menu| {
-                                                        menu.action(
-                                                            "Start New From Summary",
-                                                            Box::new(NewThread {
-                                                                from_thread_id: Some(thread_id.clone()),
-                                                            }),
-                                                        ).separator()
-                                                    })
-                                                    .action(
+                                                menu.action(
                                                    "New Text Thread",
-                                                    NewTextThread.boxed_clone(),
+                                                    NewPromptEditor.boxed_clone(),
                                                )
-                                                .action("Settings", OpenConfiguration.boxed_clone())
+                                                .when(!is_empty, |menu| {
+                                                    menu.action(
+                                                        "Continue in New Thread",
+                                                        Box::new(NewThread {
+                                                            from_thread_id: Some(thread_id.clone()),
+                                                        }),
+                                                    )
+                                                })
                                                .separator()
-                                                .action(
-                                                    "Install MCPs",
-                                                    zed_actions::Extensions {
-                                                        category_filter: Some(
-                                                            zed_actions::ExtensionCategoryFilter::ContextServers,
-                                                        ),
-                                                    }
-                                                    .boxed_clone(),
-                                                )
+                                                .action("Settings", OpenConfiguration.boxed_clone())
                                            },
                                        ))
                                    }),
@@ -1319,7 +1292,6 @@ impl AssistantPanel {
                let configuration_error_ref = &configuration_error;

                parent
-                    .overflow_hidden()
                    .p_1p5()
                    .justify_end()
                    .gap_1()
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -34,6 +34,12 @@ use crate::context_store::ContextStore;
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;

+#[derive(Debug, Clone, Copy)]
+pub enum ConfirmBehavior {
+    KeepOpen,
+    Close,
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum ContextPickerMode {
    File,
@@ -99,6 +105,7 @@ pub(super) struct ContextPicker {
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
+    confirm_behavior: ConfirmBehavior,
    _subscriptions: Vec<Subscription>,
 }

@@ -107,6 +114,7 @@ impl ContextPicker {
        workspace: WeakEntity<Workspace>,
        thread_store: Option<WeakEntity<ThreadStore>>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -135,6 +143,7 @@ impl ContextPicker {
            workspace,
            context_store,
            thread_store,
+            confirm_behavior,
            _subscriptions: subscriptions,
        }
    }
@@ -157,32 +166,37 @@ impl ContextPicker {

            let modes = supported_context_picker_modes(&self.thread_store);

-            menu.when(has_recent, |menu| {
-                menu.custom_row(|_, _| {
-                    div()
-                        .mb_1()
-                        .child(
-                            Label::new("Recent")
-                                .color(Color::Muted)
-                                .size(LabelSize::Small),
-                        )
-                        .into_any_element()
-                })
-            })
-            .extend(recent_entries)
-            .when(has_recent, |menu| menu.separator())
-            .extend(modes.into_iter().map(|mode| {
-                let context_picker = context_picker.clone();
-
-                ContextMenuEntry::new(mode.label())
-                    .icon(mode.icon())
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
-                    .handler(move |window, cx| {
-                        context_picker.update(cx, |this, cx| this.select_mode(mode, window, cx))
+            let menu = menu
+                .when(has_recent, |menu| {
+                    menu.custom_row(|_, _| {
+                        div()
+                            .mb_1()
+                            .child(
+                                Label::new("Recent")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small),
+                            )
+                            .into_any_element()
                    })
-            }))
-            .keep_open_on_confirm()
+                })
+                .extend(recent_entries)
+                .when(has_recent, |menu| menu.separator())
+                .extend(modes.into_iter().map(|mode| {
+                    let context_picker = context_picker.clone();
+
+                    ContextMenuEntry::new(mode.label())
+                        .icon(mode.icon())
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .handler(move |window, cx| {
+                            context_picker.update(cx, |this, cx| this.select_mode(mode, window, cx))
+                        })
+                }));
+
+            match self.confirm_behavior {
+                ConfirmBehavior::KeepOpen => menu.keep_open_on_confirm(),
+                ConfirmBehavior::Close => menu,
+            }
        });

        cx.subscribe(&menu, move |_, _, _: &DismissEvent, cx| {
@@ -213,6 +227,7 @@ impl ContextPicker {
                        context_picker.clone(),
                        self.workspace.clone(),
                        self.context_store.clone(),
+                        self.confirm_behavior,
                        window,
                        cx,
                    )
@@ -224,6 +239,7 @@ impl ContextPicker {
                        context_picker.clone(),
                        self.workspace.clone(),
                        self.context_store.clone(),
+                        self.confirm_behavior,
                        window,
                        cx,
                    )
@@ -235,6 +251,7 @@ impl ContextPicker {
                        context_picker.clone(),
                        self.workspace.clone(),
                        self.context_store.clone(),
+                        self.confirm_behavior,
                        window,
                        cx,
                    )
@@ -247,6 +264,7 @@ impl ContextPicker {
                            thread_store.clone(),
                            context_picker.clone(),
                            self.context_store.clone(),
+                            self.confirm_behavior,
                            window,
                            cx,
                        )
@@ -491,13 +509,14 @@ fn recent_context_picker_entries(
    recent
 }

-pub(crate) fn insert_fold_for_mention(
+pub(crate) fn insert_crease_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,
 ) {
    editor_entity.update(cx, |editor, cx| {
@@ -516,7 +535,6 @@ pub(crate) fn insert_fold_for_mention(
                crease_label,
                editor_entity.downgrade(),
            ),
-            merge_adjacent: false,
            ..Default::default()
        };

@@ -530,9 +548,8 @@ pub(crate) fn insert_fold_for_mention(
            render_trailer,
        );

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

@@ -589,13 +606,12 @@ fn render_fold_icon_button(
                        .gap_1()
                        .child(
                            Icon::from_path(icon_path.clone())
-                                .size(IconSize::XSmall)
+                                .size(IconSize::Small)
                                .color(Color::Muted),
                        )
                        .child(
                            Label::new(label.clone())
                                .size(LabelSize::Small)
-                                .buffer_font(cx)
                                .single_line(),
                        ),
                )
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -610,20 +610,21 @@ fn confirm_completion_callback(
    editor: Entity<Editor>,
    add_context_fn: impl Fn(&mut App) -> () + Send + Sync + 'static,
 ) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
-    Arc::new(move |_, _, cx| {
+    Arc::new(move |_, window, cx| {
        add_context_fn(cx);

        let crease_text = crease_text.clone();
        let crease_icon_path = crease_icon_path.clone();
        let editor = editor.clone();
-        cx.defer(move |cx| {
-            crate::context_picker::insert_fold_for_mention(
+        window.defer(cx, move |window, cx| {
+            crate::context_picker::insert_crease_for_mention(
                excerpt_id,
                start,
                content_len,
                crease_text,
                crease_icon_path,
                editor,
+                window,
                cx,
            );
        });
@@ -693,7 +694,6 @@ impl MentionCompletion {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use editor::AnchorRangeExt;
    use gpui::{EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext};
    use project::{Project, ProjectPath};
    use serde_json::json;
@@ -874,7 +874,7 @@ mod tests {
        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
            let editor = cx.new(|cx| {
                Editor::new(
-                    editor::EditorMode::full(),
+                    editor::EditorMode::Full,
                    multi_buffer::MultiBuffer::build_simple("", cx),
                    None,
                    window,
@@ -967,7 +967,7 @@ mod tests {
            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt)",);
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![Point::new(0, 6)..Point::new(0, 37)]
            );
        });
@@ -978,7 +978,7 @@ mod tests {
            assert_eq!(editor.text(cx), "Lorem [@one.txt](@file:dir/a/one.txt) ",);
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![Point::new(0, 6)..Point::new(0, 37)]
            );
        });
@@ -992,7 +992,7 @@ mod tests {
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![Point::new(0, 6)..Point::new(0, 37)]
            );
        });
@@ -1006,7 +1006,7 @@ mod tests {
            );
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![Point::new(0, 6)..Point::new(0, 37)]
            );
        });
@@ -1024,7 +1024,7 @@ mod tests {
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![
                    Point::new(0, 6)..Point::new(0, 37),
                    Point::new(0, 44)..Point::new(0, 79)
@@ -1041,7 +1041,7 @@ mod tests {
            );
            assert!(editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![
                    Point::new(0, 6)..Point::new(0, 37),
                    Point::new(0, 44)..Point::new(0, 79)
@@ -1062,7 +1062,7 @@ mod tests {
            );
            assert!(!editor.has_visible_completions_menu());
            assert_eq!(
-                fold_ranges(editor, cx),
+                crease_ranges(editor, cx),
                vec![
                    Point::new(0, 6)..Point::new(0, 37),
                    Point::new(0, 44)..Point::new(0, 79),
@@ -1072,13 +1072,15 @@ mod tests {
        });
    }

-    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
+    fn crease_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
        let snapshot = editor.buffer().read(cx).snapshot(cx);
        editor.display_map.update(cx, |display_map, cx| {
            display_map
                .snapshot(cx)
-                .folds_in_range(0..snapshot.len())
-                .map(|fold| fold.range.to_point(&snapshot))
+                .crease_snapshot
+                .crease_items_with_offsets(&snapshot)
+                .into_iter()
+                .map(|(_, range)| range)
                .collect()
        })
    }
--- a/crates/agent/src/context_picker/fetch_context_picker.rs
+++ b/crates/agent/src/context_picker/fetch_context_picker.rs
@@ -11,7 +11,7 @@ use picker::{Picker, PickerDelegate};
 use ui::{Context, ListItem, Window, prelude::*};
 use workspace::Workspace;

-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;

 pub struct FetchContextPicker {
@@ -23,10 +23,16 @@ impl FetchContextPicker {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate = FetchContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = FetchContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        Self { picker }
@@ -56,6 +62,7 @@ pub struct FetchContextPickerDelegate {
    context_picker: WeakEntity<ContextPicker>,
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    url: String,
 }

@@ -64,11 +71,13 @@ impl FetchContextPickerDelegate {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        FetchContextPickerDelegate {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            url: String::new(),
        }
    }
@@ -195,15 +204,25 @@ impl PickerDelegate for FetchContextPickerDelegate {

        let http_client = workspace.read(cx).client().http_client().clone();
        let url = self.url.clone();
+        let confirm_behavior = self.confirm_behavior;
        cx.spawn_in(window, async move |this, cx| {
            let text = cx
                .background_spawn(fetch_url_content(http_client, url.clone()))
                .await?;

-            this.update(cx, |this, cx| {
-                this.delegate.context_store.update(cx, |context_store, cx| {
-                    context_store.add_fetched_url(url, text, cx)
-                })
+            this.update_in(cx, |this, window, cx| {
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        context_store.add_fetched_url(url, text, cx)
+                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(window, cx),
+                }
+
+                anyhow::Ok(())
            })??;

            anyhow::Ok(())
--- a/crates/agent/src/context_picker/file_context_picker.rs
+++ b/crates/agent/src/context_picker/file_context_picker.rs
@@ -11,9 +11,9 @@ use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
 use ui::{ListItem, Tooltip, prelude::*};
 use util::ResultExt as _;
-use workspace::Workspace;
+use workspace::{Workspace, notifications::NotifyResultExt};

-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::{ContextStore, FileInclusion};

 pub struct FileContextPicker {
@@ -25,10 +25,16 @@ impl FileContextPicker {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate = FileContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = FileContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        Self { picker }
@@ -51,6 +57,7 @@ pub struct FileContextPickerDelegate {
    context_picker: WeakEntity<ContextPicker>,
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<FileMatch>,
    selected_index: usize,
 }
@@ -60,11 +67,13 @@ impl FileContextPickerDelegate {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        Self {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -118,7 +127,7 @@ impl PickerDelegate for FileContextPickerDelegate {
        })
    }

-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
        let Some(FileMatch { mat, .. }) = self.matches.get(self.selected_index) else {
            return;
        };
@@ -144,7 +153,17 @@ impl PickerDelegate for FileContextPickerDelegate {
            return;
        };

-        task.detach_and_log_err(cx);
+        let confirm_behavior = self.confirm_behavior;
+        cx.spawn_in(window, async move |this, cx| {
+            match task.await.notify_async_err(cx) {
+                None => anyhow::Ok(()),
+                Some(()) => this.update_in(cx, |this, window, cx| match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(window, cx),
+                }),
+            }
+        })
+        .detach_and_log_err(cx);
    }

    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
--- a/crates/agent/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent/src/context_picker/symbol_context_picker.rs
@@ -15,7 +15,7 @@ use ui::{ListItem, prelude::*};
 use util::ResultExt as _;
 use workspace::Workspace;

-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;

 pub struct SymbolContextPicker {
@@ -27,10 +27,16 @@ impl SymbolContextPicker {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate = SymbolContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = SymbolContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        Self { picker }
@@ -53,6 +59,7 @@ pub struct SymbolContextPickerDelegate {
    context_picker: WeakEntity<ContextPicker>,
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<SymbolEntry>,
    selected_index: usize,
 }
@@ -62,11 +69,13 @@ impl SymbolContextPickerDelegate {
        context_picker: WeakEntity<ContextPicker>,
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        Self {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -126,7 +135,7 @@ impl PickerDelegate for SymbolContextPickerDelegate {
        })
    }

-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
        let Some(mat) = self.matches.get(self.selected_index) else {
            return;
        };
@@ -134,6 +143,7 @@ impl PickerDelegate for SymbolContextPickerDelegate {
            return;
        };

+        let confirm_behavior = self.confirm_behavior;
        let add_symbol_task = add_symbol(
            mat.symbol.clone(),
            true,
@@ -143,12 +153,16 @@ impl PickerDelegate for SymbolContextPickerDelegate {
        );

        let selected_index = self.selected_index;
-        cx.spawn(async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
            let included = add_symbol_task.await?;
-            this.update(cx, |this, _| {
+            this.update_in(cx, |this, window, cx| {
                if let Some(mat) = this.delegate.matches.get_mut(selected_index) {
                    mat.is_included = included;
                }
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(window, cx),
+                }
            })
        })
        .detach_and_log_err(cx);
--- a/crates/agent/src/context_picker/thread_context_picker.rs
+++ b/crates/agent/src/context_picker/thread_context_picker.rs
@@ -6,7 +6,7 @@ use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
 use picker::{Picker, PickerDelegate};
 use ui::{ListItem, prelude::*};

-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::{self, ContextStore};
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;
@@ -20,11 +20,16 @@ impl ThreadContextPicker {
        thread_store: WeakEntity<ThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate =
-            ThreadContextPickerDelegate::new(thread_store, context_picker, context_store);
+        let delegate = ThreadContextPickerDelegate::new(
+            thread_store,
+            context_picker,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        ThreadContextPicker { picker }
@@ -53,6 +58,7 @@ pub struct ThreadContextPickerDelegate {
    thread_store: WeakEntity<ThreadStore>,
    context_picker: WeakEntity<ContextPicker>,
    context_store: WeakEntity<context_store::ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<ThreadContextEntry>,
    selected_index: usize,
 }
@@ -62,11 +68,13 @@ impl ThreadContextPickerDelegate {
        thread_store: WeakEntity<ThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        ThreadContextPickerDelegate {
            thread_store,
            context_picker,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -119,7 +127,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        })
    }

-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
        let Some(entry) = self.matches.get(self.selected_index) else {
            return;
        };
@@ -130,15 +138,20 @@ impl PickerDelegate for ThreadContextPickerDelegate {

        let open_thread_task = thread_store.update(cx, |this, cx| this.open_thread(&entry.id, cx));

-        cx.spawn(async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
            let thread = open_thread_task.await?;
-            this.update(cx, |this, cx| {
+            this.update_in(cx, |this, window, cx| {
                this.delegate
                    .context_store
                    .update(cx, |context_store, cx| {
                        context_store.add_thread(thread, true, cx)
                    })
                    .ok();
+
+                match this.delegate.confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(window, cx),
+                }
            })
        })
        .detach_and_log_err(cx);
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -15,7 +15,7 @@ use ui::{KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
 use workspace::{Workspace, notifications::NotifyResultExt};

 use crate::context::{ContextId, ContextKind};
-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
 use crate::thread::Thread;
 use crate::thread_store::ThreadStore;
@@ -52,6 +52,7 @@ impl ContextStrip {
                workspace.clone(),
                thread_store.clone(),
                context_store.downgrade(),
+                ConfirmBehavior::KeepOpen,
                window,
                cx,
            )
--- 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
@@ -86,7 +86,7 @@ impl ProfileSelector {

                            thread_store
                                .update(cx, |this, cx| {
-                                    this.load_profile_by_id(profile_id.clone(), cx);
+                                    this.load_profile_by_id(&profile_id, cx);
                                })
                                .log_err();
                        }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -2,39 +2,37 @@ use std::fmt::Write as _;
 use std::io::Write;
 use std::ops::Range;
 use std::sync::Arc;
-use std::time::Instant;

+use agent_rules::load_worktree_rules_file;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_settings::AssistantSettings;
-use assistant_tool::{ActionLog, Tool, ToolWorkingSet};
+use assistant_tool::{ActionLog, Tool, ToolResult, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap};
-use feature_flags::{self, FeatureFlagAppExt};
+use fs::Fs;
 use futures::future::Shared;
 use futures::{FutureExt, StreamExt as _};
 use git::repository::DiffType;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelKnownError, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
-    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
-    Role, StopReason, TokenUsage,
+    ConfiguredModel, LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry,
+    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestTool,
+    LanguageModelToolResult, LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent,
+    PaymentRequiredError, Role, StopReason, TokenUsage,
 };
-use project::Project;
 use project::git_store::{GitStore, GitStoreCheckpoint, RepositoryState};
-use prompt_store::PromptBuilder;
+use project::{Project, Worktree};
+use prompt_store::{AssistantSystemPromptContext, PromptBuilder, WorktreeInfoForSystemPrompt};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use thiserror::Error;
 use util::{ResultExt as _, TryFutureExt as _, post_inc};
 use uuid::Uuid;

 use crate::context::{AssistantContext, ContextId, format_context_as_string};
 use crate::thread_store::{
    SerializedMessage, SerializedMessageSegment, SerializedThread, SerializedToolResult,
-    SerializedToolUse, SharedProjectContext,
+    SerializedToolUse,
 };
 use crate::tool_use::{PendingToolUse, ToolUse, ToolUseState, USING_TOOL_MARKER};

@@ -229,7 +227,7 @@ pub struct TotalTokenUsage {
    pub ratio: TokenUsageRatio,
 }

-#[derive(Debug, Default, PartialEq, Eq)]
+#[derive(Default, PartialEq, Eq)]
 pub enum TokenUsageRatio {
    #[default]
    Normal,
@@ -248,42 +246,28 @@ pub struct Thread {
    next_message_id: MessageId,
    context: BTreeMap<ContextId, AssistantContext>,
    context_by_message: HashMap<MessageId, Vec<ContextId>>,
-    project_context: SharedProjectContext,
+    system_prompt_context: Option<AssistantSystemPromptContext>,
    checkpoints_by_message: HashMap<MessageId, ThreadCheckpoint>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
    project: Entity<Project>,
    prompt_builder: Arc<PromptBuilder>,
-    tools: Entity<ToolWorkingSet>,
+    tools: Arc<ToolWorkingSet>,
    tool_use: ToolUseState,
    action_log: Entity<ActionLog>,
    last_restore_checkpoint: Option<LastRestoreCheckpoint>,
    pending_checkpoint: Option<ThreadCheckpoint>,
    initial_project_snapshot: Shared<Task<Option<Arc<ProjectSnapshot>>>>,
    cumulative_token_usage: TokenUsage,
-    exceeded_window_error: Option<ExceededWindowError>,
    feedback: Option<ThreadFeedback>,
    message_feedback: HashMap<MessageId, ThreadFeedback>,
-    last_auto_capture_at: Option<Instant>,
-    request_callback: Option<
-        Box<dyn FnMut(&LanguageModelRequest, &[Result<LanguageModelCompletionEvent, String>])>,
-    >,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ExceededWindowError {
-    /// Model used when last message exceeded context window
-    model_id: LanguageModelId,
-    /// Token count including last message
-    token_count: usize,
 }

 impl Thread {
    pub fn new(
        project: Entity<Project>,
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
-        system_prompt: SharedProjectContext,
        cx: &mut Context<Self>,
    ) -> Self {
        Self {
@@ -296,7 +280,7 @@ impl Thread {
            next_message_id: MessageId(0),
            context: BTreeMap::default(),
            context_by_message: HashMap::default(),
-            project_context: system_prompt,
+            system_prompt_context: None,
            checkpoints_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
@@ -314,11 +298,8 @@ impl Thread {
                    .shared()
            },
            cumulative_token_usage: TokenUsage::default(),
-            exceeded_window_error: None,
            feedback: None,
            message_feedback: HashMap::default(),
-            last_auto_capture_at: None,
-            request_callback: None,
        }
    }

@@ -326,9 +307,8 @@ impl Thread {
        id: ThreadId,
        serialized: SerializedThread,
        project: Entity<Project>,
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
-        project_context: SharedProjectContext,
        cx: &mut Context<Self>,
    ) -> Self {
        let next_message_id = MessageId(
@@ -369,7 +349,7 @@ impl Thread {
            next_message_id,
            context: BTreeMap::default(),
            context_by_message: HashMap::default(),
-            project_context,
+            system_prompt_context: None,
            checkpoints_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
@@ -382,22 +362,11 @@ impl Thread {
            action_log: cx.new(|_| ActionLog::new(project)),
            initial_project_snapshot: Task::ready(serialized.initial_project_snapshot).shared(),
            cumulative_token_usage: serialized.cumulative_token_usage,
-            exceeded_window_error: None,
            feedback: None,
            message_feedback: HashMap::default(),
-            last_auto_capture_at: None,
-            request_callback: None,
        }
    }

-    pub fn set_request_callback(
-        &mut self,
-        callback: impl 'static
-        + FnMut(&LanguageModelRequest, &[Result<LanguageModelCompletionEvent, String>]),
-    ) {
-        self.request_callback = Some(Box::new(callback));
-    }
-
    pub fn id(&self) -> &ThreadId {
        &self.id
    }
@@ -418,10 +387,6 @@ impl Thread {
        self.summary.clone()
    }

-    pub fn project_context(&self) -> SharedProjectContext {
-        self.project_context.clone()
-    }
-
    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");

    pub fn summary_or_default(&self) -> SharedString {
@@ -471,7 +436,7 @@ impl Thread {
        !self.pending_completions.is_empty() || !self.all_tools_finished()
    }

-    pub fn tools(&self) -> &Entity<ToolWorkingSet> {
+    pub fn tools(&self) -> &Arc<ToolWorkingSet> {
        &self.tools
    }

@@ -639,8 +604,12 @@ impl Thread {
        self.tool_use.tool_results_for_message(id)
    }

-    pub fn tool_result(&self, id: &LanguageModelToolUseId) -> Option<&LanguageModelToolResult> {
-        self.tool_use.tool_result(id)
+    pub fn output_for_tool(&self, id: &LanguageModelToolUseId) -> Option<&Arc<str>> {
+        Some(&self.tool_use.tool_result(id)?.content)
+    }
+
+    pub fn card_for_tool(&self, id: &LanguageModelToolUseId) -> Option<&gpui::AnyView> {
+        self.tool_use.tool_result_card(id)
    }

    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
@@ -712,9 +681,6 @@ impl Thread {
                git_checkpoint,
            });
        }
-
-        self.auto_capture_telemetry(cx);
-
        message_id
    }

@@ -840,13 +806,92 @@ impl Thread {
                    })
                    .collect(),
                initial_project_snapshot,
-                cumulative_token_usage: this.cumulative_token_usage,
+                cumulative_token_usage: this.cumulative_token_usage.clone(),
                detailed_summary_state: this.detailed_summary_state.clone(),
-                exceeded_window_error: this.exceeded_window_error.clone(),
            })
        })
    }

+    pub fn set_system_prompt_context(&mut self, context: AssistantSystemPromptContext) {
+        self.system_prompt_context = Some(context);
+    }
+
+    pub fn system_prompt_context(&self) -> &Option<AssistantSystemPromptContext> {
+        &self.system_prompt_context
+    }
+
+    pub fn load_system_prompt_context(
+        &self,
+        cx: &App,
+    ) -> Task<(AssistantSystemPromptContext, Option<ThreadError>)> {
+        let project = self.project.read(cx);
+        let tasks = project
+            .visible_worktrees(cx)
+            .map(|worktree| {
+                Self::load_worktree_info_for_system_prompt(
+                    project.fs().clone(),
+                    worktree.read(cx),
+                    cx,
+                )
+            })
+            .collect::<Vec<_>>();
+
+        cx.spawn(async |_cx| {
+            let results = futures::future::join_all(tasks).await;
+            let mut first_err = None;
+            let worktrees = results
+                .into_iter()
+                .map(|(worktree, err)| {
+                    if first_err.is_none() && err.is_some() {
+                        first_err = err;
+                    }
+                    worktree
+                })
+                .collect::<Vec<_>>();
+            (AssistantSystemPromptContext::new(worktrees), first_err)
+        })
+    }
+
+    fn load_worktree_info_for_system_prompt(
+        fs: Arc<dyn Fs>,
+        worktree: &Worktree,
+        cx: &App,
+    ) -> Task<(WorktreeInfoForSystemPrompt, Option<ThreadError>)> {
+        let root_name = worktree.root_name().into();
+        let abs_path = worktree.abs_path();
+
+        let rules_task = load_worktree_rules_file(fs, worktree, cx);
+        let Some(rules_task) = rules_task else {
+            return Task::ready((
+                WorktreeInfoForSystemPrompt {
+                    root_name,
+                    abs_path,
+                    rules_file: None,
+                },
+                None,
+            ));
+        };
+
+        cx.spawn(async move |_| {
+            let (rules_file, rules_file_error) = match rules_task.await {
+                Ok(rules_file) => (Some(rules_file), None),
+                Err(err) => (
+                    None,
+                    Some(ThreadError::Message {
+                        header: "Error loading rules file".into(),
+                        message: format!("{err}").into(),
+                    }),
+                ),
+            };
+            let worktree_info = WorktreeInfoForSystemPrompt {
+                root_name,
+                abs_path,
+                rules_file,
+            };
+            (worktree_info, rules_file_error)
+        })
+    }
+
    pub fn send_to_model(
        &mut self,
        model: Arc<dyn LanguageModel>,
@@ -857,21 +902,13 @@ impl Thread {
        if model.supports_tools() {
            request.tools = {
                let mut tools = Vec::new();
-                tools.extend(
-                    self.tools()
-                        .read(cx)
-                        .enabled_tools(cx)
-                        .into_iter()
-                        .filter_map(|tool| {
-                            // Skip tools that cannot be supported
-                            let input_schema = tool.input_schema(model.tool_input_format()).ok()?;
-                            Some(LanguageModelRequestTool {
-                                name: tool.name(),
-                                description: tool.description(),
-                                input_schema,
-                            })
-                        }),
-                );
+                tools.extend(self.tools().enabled_tools(cx).into_iter().map(|tool| {
+                    LanguageModelRequestTool {
+                        name: tool.name(),
+                        description: tool.description(),
+                        input_schema: tool.input_schema(model.tool_input_format()),
+                    }
+                }));

                tools
            };
@@ -904,10 +941,10 @@ impl Thread {
            temperature: None,
        };

-        if let Some(project_context) = self.project_context.borrow().as_ref() {
+        if let Some(system_prompt_context) = self.system_prompt_context.as_ref() {
            if let Some(system_prompt) = self
                .prompt_builder
-                .generate_assistant_system_prompt(project_context)
+                .generate_assistant_system_prompt(system_prompt_context)
                .context("failed to generate assistant system prompt")
                .log_err()
            {
@@ -918,7 +955,7 @@ impl Thread {
                });
            }
        } else {
-            log::error!("project_context not set.")
+            log::error!("system_prompt_context not set.")
        }

        for message in &self.messages {
@@ -967,6 +1004,20 @@ impl Thread {

        self.attached_tracked_files_state(&mut request.messages, cx);

+        // Add reminder to the last user message about code blocks
+        if let Some(last_user_message) = request
+            .messages
+            .iter_mut()
+            .rev()
+            .find(|msg| msg.role == Role::User)
+        {
+            last_user_message
+                .content
+                .push(MessageContent::Text(system_prompt_reminder(
+                    &self.prompt_builder,
+                )));
+        }
+
        request
    }

@@ -1026,28 +1077,17 @@ impl Thread {
        cx: &mut Context<Self>,
    ) {
        let pending_completion_id = post_inc(&mut self.completion_count);
-        let request_callback_parameters = if self.request_callback.is_some() {
-            Some((request.clone(), Vec::new()))
-        } else {
-            None
-        };

        let task = cx.spawn(async move |thread, cx| {
            let stream = model.stream_completion(request, &cx);
            let initial_token_usage =
-                thread.read_with(cx, |thread, _cx| thread.cumulative_token_usage);
+                thread.read_with(cx, |thread, _cx| thread.cumulative_token_usage.clone());
            let stream_completion = async {
-                let mut request_callback_parameters = request_callback_parameters;
                let mut events = stream.await?;
                let mut stop_reason = StopReason::EndTurn;
                let mut current_token_usage = TokenUsage::default();

                while let Some(event) = events.next().await {
-                    if let Some((_, response_events)) = request_callback_parameters.as_mut() {
-                        response_events
-                            .push(event.as_ref().map_err(|error| error.to_string()).cloned());
-                    }
-
                    let event = event?;

                    thread.update(cx, |thread, cx| {
@@ -1063,9 +1103,9 @@ impl Thread {
                                stop_reason = reason;
                            }
                            LanguageModelCompletionEvent::UsageUpdate(token_usage) => {
-                                thread.cumulative_token_usage = thread.cumulative_token_usage
-                                    + token_usage
-                                    - current_token_usage;
+                                thread.cumulative_token_usage =
+                                    thread.cumulative_token_usage.clone() + token_usage.clone()
+                                        - current_token_usage.clone();
                                current_token_usage = token_usage;
                            }
                            LanguageModelCompletionEvent::Text(chunk) => {
@@ -1133,8 +1173,6 @@ impl Thread {
                        thread.touch_updated_at();
                        cx.emit(ThreadEvent::StreamedCompletion);
                        cx.notify();
-
-                        thread.auto_capture_telemetry(cx);
                    })?;

                    smol::future::yield_now().await;
@@ -1150,7 +1188,7 @@ impl Thread {
                    }
                })?;

-                anyhow::Ok((stop_reason, request_callback_parameters))
+                anyhow::Ok(stop_reason)
            };

            let result = stream_completion.await;
@@ -1159,24 +1197,13 @@ impl Thread {
                .update(cx, |thread, cx| {
                    thread.finalize_pending_checkpoint(cx);
                    match result.as_ref() {
-                        Ok((stop_reason, request_callback_parameters)) => {
-                            match stop_reason {
-                                StopReason::ToolUse => {
-                                    let tool_uses = thread.use_pending_tools(cx);
-                                    cx.emit(ThreadEvent::UsePendingTools { tool_uses });
-                                }
-                                StopReason::EndTurn => {}
-                                StopReason::MaxTokens => {}
+                        Ok(stop_reason) => match stop_reason {
+                            StopReason::ToolUse => {
+                                cx.emit(ThreadEvent::UsePendingTools);
                            }
-
-                            if let Some((request_callback, (request, response_events))) = thread
-                                .request_callback
-                                .as_mut()
-                                .zip(request_callback_parameters.as_ref())
-                            {
-                                request_callback(request, response_events);
-                            }
-                        }
+                            StopReason::EndTurn => {}
+                            StopReason::MaxTokens => {}
+                        },
                        Err(error) => {
                            if error.is::<PaymentRequiredError>() {
                                cx.emit(ThreadEvent::ShowError(ThreadError::PaymentRequired));
@@ -1184,20 +1211,6 @@ impl Thread {
                                cx.emit(ThreadEvent::ShowError(
                                    ThreadError::MaxMonthlySpendReached,
                                ));
-                            } else if let Some(known_error) =
-                                error.downcast_ref::<LanguageModelKnownError>()
-                            {
-                                match known_error {
-                                    LanguageModelKnownError::ContextWindowLimitExceeded {
-                                        tokens,
-                                    } => {
-                                        thread.exceeded_window_error = Some(ExceededWindowError {
-                                            model_id: model.id(),
-                                            token_count: *tokens,
-                                        });
-                                        cx.notify();
-                                    }
-                                }
                            } else {
                                let error_message = error
                                    .chain()
@@ -1213,14 +1226,10 @@ impl Thread {
                            thread.cancel_last_completion(cx);
                        }
                    }
-                    cx.emit(ThreadEvent::Stopped(
-                        result.map(|result| result.0).map_err(Arc::new),
-                    ));
-
-                    thread.auto_capture_telemetry(cx);
+                    cx.emit(ThreadEvent::DoneStreaming);

                    if let Ok(initial_usage) = initial_token_usage {
-                        let usage = thread.cumulative_token_usage - initial_usage;
+                        let usage = thread.cumulative_token_usage.clone() - initial_usage;

                        telemetry::event!(
                            "Assistant Thread Completion",
@@ -1378,8 +1387,10 @@ impl Thread {
        )
    }

-    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) -> Vec<PendingToolUse> {
-        self.auto_capture_telemetry(cx);
+    pub fn use_pending_tools(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> impl IntoIterator<Item = PendingToolUse> + use<> {
        let request = self.to_completion_request(RequestKind::Chat, cx);
        let messages = Arc::new(request.messages);
        let pending_tool_uses = self
@@ -1391,7 +1402,7 @@ impl Thread {
            .collect::<Vec<_>>();

        for tool_use in pending_tool_uses.iter() {
-            if let Some(tool) = self.tools.read(cx).tool(&tool_use.name, cx) {
+            if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
                if tool.needs_confirmation(&tool_use.input, cx)
                    && !AssistantSettings::get_global(cx).always_allow_tool_actions
                {
@@ -1443,8 +1454,11 @@ impl Thread {
    ) -> Task<()> {
        let tool_name: Arc<str> = tool.name().into();

-        let tool_result = if self.tools.read(cx).is_disabled(&tool.source(), &tool_name) {
-            Task::ready(Err(anyhow!("tool is disabled: {tool_name}"))).into()
+        let tool_result = if self.tools.is_disabled(&tool.source(), &tool_name) {
+            ToolResult {
+                output: Task::ready(Err(anyhow!("tool is disabled: {tool_name}"))),
+                card: None,
+            }
        } else {
            tool.run(
                input,
@@ -1455,6 +1469,12 @@ impl Thread {
            )
        };

+        // Store the card separately if it exists
+        if let Some(card) = tool_result.card.clone() {
+            self.tool_use
+                .insert_tool_result_card(tool_use_id.clone(), card);
+        }
+
        cx.spawn({
            async move |thread: WeakEntity<Thread>, cx| {
                let output = tool_result.output.await;
@@ -1467,36 +1487,18 @@ impl Thread {
                            output,
                            cx,
                        );
-                        thread.tool_finished(tool_use_id, pending_tool_use, false, cx);
+
+                        cx.emit(ThreadEvent::ToolFinished {
+                            tool_use_id,
+                            pending_tool_use,
+                            canceled: false,
+                        });
                    })
                    .ok();
            }
        })
    }

-    fn tool_finished(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        pending_tool_use: Option<PendingToolUse>,
-        canceled: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if self.all_tools_finished() {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            if let Some(ConfiguredModel { model, .. }) = model_registry.default_model() {
-                self.attach_tool_results(cx);
-                if !canceled {
-                    self.send_to_model(model, RequestKind::Chat, cx);
-                }
-            }
-        }
-
-        cx.emit(ThreadEvent::ToolFinished {
-            tool_use_id,
-            pending_tool_use,
-        });
-    }
-
    pub fn attach_tool_results(&mut self, cx: &mut Context<Self>) {
        // Insert a user message to contain the tool results.
        self.insert_user_message(
@@ -1520,12 +1522,11 @@ impl Thread {
            let mut canceled = false;
            for pending_tool_use in self.tool_use.cancel_pending() {
                canceled = true;
-                self.tool_finished(
-                    pending_tool_use.id.clone(),
-                    Some(pending_tool_use),
-                    true,
-                    cx,
-                );
+                cx.emit(ThreadEvent::ToolFinished {
+                    tool_use_id: pending_tool_use.id.clone(),
+                    pending_tool_use: Some(pending_tool_use),
+                    canceled: true,
+                });
            }
            canceled
        };
@@ -1556,14 +1557,6 @@ impl Thread {
        let thread_id = self.id().clone();
        let client = self.project.read(cx).client();

-        let enabled_tool_names: Vec<String> = self
-            .tools()
-            .read(cx)
-            .enabled_tools(cx)
-            .iter()
-            .map(|tool| tool.name().to_string())
-            .collect();
-
        self.message_feedback.insert(message_id, feedback);

        cx.notify();
@@ -1587,7 +1580,6 @@ impl Thread {
                "Assistant Thread Rated",
                rating,
                thread_id,
-                enabled_tool_names,
                message_id = message_id.0,
                message_content,
                thread_data,
@@ -1856,52 +1848,8 @@ impl Thread {
        &self.project
    }

-    pub fn auto_capture_telemetry(&mut self, cx: &mut Context<Self>) {
-        if !cx.has_flag::<feature_flags::ThreadAutoCapture>() {
-            return;
-        }
-
-        let now = Instant::now();
-        if let Some(last) = self.last_auto_capture_at {
-            if now.duration_since(last).as_secs() < 10 {
-                return;
-            }
-        }
-
-        self.last_auto_capture_at = Some(now);
-
-        let thread_id = self.id().clone();
-        let github_login = self
-            .project
-            .read(cx)
-            .user_store()
-            .read(cx)
-            .current_user()
-            .map(|user| user.github_login.clone());
-        let client = self.project.read(cx).client().clone();
-        let serialize_task = self.serialize(cx);
-
-        cx.background_executor()
-            .spawn(async move {
-                if let Ok(serialized_thread) = serialize_task.await {
-                    if let Ok(thread_data) = serde_json::to_value(serialized_thread) {
-                        telemetry::event!(
-                            "Agent Thread Auto-Captured",
-                            thread_id = thread_id.to_string(),
-                            thread_data = thread_data,
-                            auto_capture_reason = "tracked_user",
-                            github_login = github_login
-                        );
-
-                        client.telemetry().flush_events();
-                    }
-                }
-            })
-            .detach();
-    }
-
    pub fn cumulative_token_usage(&self) -> TokenUsage {
-        self.cumulative_token_usage
+        self.cumulative_token_usage.clone()
    }

    pub fn total_token_usage(&self, cx: &App) -> TotalTokenUsage {
@@ -1912,16 +1860,6 @@ impl Thread {

        let max = model.model.max_token_count();

-        if let Some(exceeded_error) = &self.exceeded_window_error {
-            if model.model.id() == exceeded_error.model_id {
-                return TotalTokenUsage {
-                    total: exceeded_error.token_count,
-                    max,
-                    ratio: TokenUsageRatio::Exceeded,
-                };
-            }
-        }
-
        #[cfg(debug_assertions)]
        let warning_threshold: f32 = std::env::var("ZED_THREAD_WARNING_THRESHOLD")
            .unwrap_or("0.8".to_string())
@@ -1955,17 +1893,25 @@ impl Thread {

        self.tool_use
            .insert_tool_output(tool_use_id.clone(), tool_name, err, cx);
-        self.tool_finished(tool_use_id.clone(), None, true, cx);
+
+        cx.emit(ThreadEvent::ToolFinished {
+            tool_use_id,
+            pending_tool_use: None,
+            canceled: true,
+        });
    }
 }

-#[derive(Debug, Clone, Error)]
+pub fn system_prompt_reminder(prompt_builder: &prompt_store::PromptBuilder) -> String {
+    prompt_builder
+        .generate_assistant_system_prompt_reminder()
+        .unwrap_or_default()
+}
+
+#[derive(Debug, Clone)]
 pub enum ThreadError {
-    #[error("Payment required")]
    PaymentRequired,
-    #[error("Max monthly spend reached")]
    MaxMonthlySpendReached,
-    #[error("Message {header}: {message}")]
    Message {
        header: SharedString,
        message: SharedString,
@@ -1978,20 +1924,20 @@ pub enum ThreadEvent {
    StreamedCompletion,
    StreamedAssistantText(MessageId, String),
    StreamedAssistantThinking(MessageId, String),
-    Stopped(Result<StopReason, Arc<anyhow::Error>>),
+    DoneStreaming,
    MessageAdded(MessageId),
    MessageEdited(MessageId),
    MessageDeleted(MessageId),
    SummaryGenerated,
    SummaryChanged,
-    UsePendingTools {
-        tool_uses: Vec<PendingToolUse>,
-    },
+    UsePendingTools,
    ToolFinished {
        #[allow(unused)]
        tool_use_id: LanguageModelToolUseId,
        /// The pending tool use that corresponds to this tool.
        pending_tool_use: Option<PendingToolUse>,
+        /// Whether the tool was canceled by the user.
+        canceled: bool,
    },
    CheckpointChanged,
    ToolConfirmationNeeded,
@@ -2031,7 +1977,7 @@ mod tests {
        )
        .await;

-        let (_workspace, _thread_store, thread, context_store) =
+        let (_workspace, _thread_store, thread, context_store, prompt_builder) =
            setup_test_environment(cx, project.clone()).await;

        add_file_to_context(&project, &context_store, "test/code.rs", cx)
@@ -2084,9 +2030,15 @@ fn main() {{
            thread.to_completion_request(RequestKind::Chat, cx)
        });

-        assert_eq!(request.messages.len(), 2);
-        let expected_full_message = format!("{}Please explain this code", expected_context);
-        assert_eq!(request.messages[1].string_contents(), expected_full_message);
+        assert_eq!(request.messages.len(), 1);
+        let actual_message = request.messages[0].string_contents();
+        let expected_content = format!(
+            "{}Please explain this code{}",
+            expected_context,
+            system_prompt_reminder(&prompt_builder)
+        );
+
+        assert_eq!(actual_message, expected_content);
    }

    #[gpui::test]
@@ -2103,7 +2055,7 @@ fn main() {{
        )
        .await;

-        let (_, _thread_store, thread, context_store) =
+        let (_, _thread_store, thread, context_store, _prompt_builder) =
            setup_test_environment(cx, project.clone()).await;

        // Open files individually
@@ -2177,20 +2129,20 @@ fn main() {{
        });

        // The request should contain all 3 messages
-        assert_eq!(request.messages.len(), 4);
+        assert_eq!(request.messages.len(), 3);

        // Check that the contexts are properly formatted in each message
-        assert!(request.messages[1].string_contents().contains("file1.rs"));
-        assert!(!request.messages[1].string_contents().contains("file2.rs"));
+        assert!(request.messages[0].string_contents().contains("file1.rs"));
+        assert!(!request.messages[0].string_contents().contains("file2.rs"));
+        assert!(!request.messages[0].string_contents().contains("file3.rs"));
+
+        assert!(!request.messages[1].string_contents().contains("file1.rs"));
+        assert!(request.messages[1].string_contents().contains("file2.rs"));
        assert!(!request.messages[1].string_contents().contains("file3.rs"));

        assert!(!request.messages[2].string_contents().contains("file1.rs"));
-        assert!(request.messages[2].string_contents().contains("file2.rs"));
-        assert!(!request.messages[2].string_contents().contains("file3.rs"));
-
-        assert!(!request.messages[3].string_contents().contains("file1.rs"));
-        assert!(!request.messages[3].string_contents().contains("file2.rs"));
-        assert!(request.messages[3].string_contents().contains("file3.rs"));
+        assert!(!request.messages[2].string_contents().contains("file2.rs"));
+        assert!(request.messages[2].string_contents().contains("file3.rs"));
    }

    #[gpui::test]
@@ -2203,7 +2155,7 @@ fn main() {{
        )
        .await;

-        let (_, _thread_store, thread, _context_store) =
+        let (_, _thread_store, thread, _context_store, prompt_builder) =
            setup_test_environment(cx, project.clone()).await;

        // Insert user message without any context (empty context vector)
@@ -2228,12 +2180,15 @@ fn main() {{
            thread.to_completion_request(RequestKind::Chat, cx)
        });

-        assert_eq!(request.messages.len(), 2);
-        assert_eq!(
-            request.messages[1].string_contents(),
-            "What is the best way to learn Rust?"
+        assert_eq!(request.messages.len(), 1);
+        let actual_message = request.messages[0].string_contents();
+        let expected_content = format!(
+            "What is the best way to learn Rust?{}",
+            system_prompt_reminder(&prompt_builder)
        );

+        assert_eq!(actual_message, expected_content);
+
        // Add second message, also without context
        let message2_id = thread.update(cx, |thread, cx| {
            thread.insert_user_message("Are there any good books?", vec![], None, cx)
@@ -2248,15 +2203,18 @@ fn main() {{
            thread.to_completion_request(RequestKind::Chat, cx)
        });

-        assert_eq!(request.messages.len(), 3);
-        assert_eq!(
-            request.messages[1].string_contents(),
-            "What is the best way to learn Rust?"
-        );
-        assert_eq!(
-            request.messages[2].string_contents(),
-            "Are there any good books?"
+        assert_eq!(request.messages.len(), 2);
+        // First message should be the system prompt
+        assert_eq!(request.messages[0].role, Role::User);
+
+        // Second message should be the user message with prompt reminder
+        let actual_message = request.messages[1].string_contents();
+        let expected_content = format!(
+            "Are there any good books?{}",
+            system_prompt_reminder(&prompt_builder)
        );
+
+        assert_eq!(actual_message, expected_content);
    }

    #[gpui::test]
@@ -2269,7 +2227,7 @@ fn main() {{
        )
        .await;

-        let (_workspace, _thread_store, thread, context_store) =
+        let (_workspace, _thread_store, thread, context_store, prompt_builder) =
            setup_test_environment(cx, project.clone()).await;

        // Open buffer and add it to context
@@ -2329,11 +2287,14 @@ fn main() {{
        // The last message should be the stale buffer notification
        assert_eq!(last_message.role, Role::User);

-        // Check the exact content of the message
-        let expected_content = "These files changed since last read:\n- code.rs\n";
+        let actual_message = last_message.string_contents();
+        let expected_content = format!(
+            "These files changed since last read:\n- code.rs\n{}",
+            system_prompt_reminder(&prompt_builder)
+        );
+
        assert_eq!(
-            last_message.string_contents(),
-            expected_content,
+            actual_message, expected_content,
            "Last message should be exactly the stale buffer notification"
        );
    }
@@ -2371,25 +2332,27 @@ fn main() {{
        Entity<ThreadStore>,
        Entity<Thread>,
        Entity<ContextStore>,
+        Arc<PromptBuilder>,
    ) {
        let (workspace, cx) =
            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));

-        let thread_store = cx
-            .update(|_, cx| {
-                ThreadStore::load(
-                    project.clone(),
-                    cx.new(|_| ToolWorkingSet::default()),
-                    Arc::new(PromptBuilder::new(None).unwrap()),
-                    cx,
-                )
-            })
-            .await;
+        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+
+        let thread_store = cx.update(|_, cx| {
+            ThreadStore::new(project.clone(), Arc::default(), prompt_builder.clone(), cx).unwrap()
+        });

        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
        let context_store = cx.new(|_cx| ContextStore::new(project.downgrade(), None));

-        (workspace, thread_store, thread, context_store)
+        (
+            workspace,
+            thread_store,
+            thread,
+            context_store,
+            prompt_builder,
+        )
    }

    async fn add_file_to_context(
--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -4,14 +4,11 @@ use assistant_context_editor::SavedContextMetadata;
 use editor::{Editor, EditorEvent};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    App, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task, UniformListScrollHandle,
-    WeakEntity, Window, uniform_list,
+    App, Entity, FocusHandle, Focusable, ScrollStrategy, Task, UniformListScrollHandle, WeakEntity,
+    Window, uniform_list,
 };
 use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
-    Tooltip, prelude::*,
-};
+use ui::{HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Tooltip, prelude::*};
 use util::ResultExt;

 use crate::history_store::{HistoryEntry, HistoryStore};
@@ -29,8 +26,6 @@ pub struct ThreadHistory {
    matches: Vec<StringMatch>,
    _subscriptions: Vec<gpui::Subscription>,
    _search_task: Option<Task<()>>,
-    scrollbar_visibility: bool,
-    scrollbar_state: ScrollbarState,
 }

 impl ThreadHistory {
@@ -63,13 +58,10 @@ impl ThreadHistory {
            this.update_all_entries(cx);
        });

-        let scroll_handle = UniformListScrollHandle::default();
-        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
-
        Self {
            assistant_panel,
            history_store,
-            scroll_handle,
+            scroll_handle: UniformListScrollHandle::default(),
            selected_index: 0,
            search_query: SharedString::new_static(""),
            all_entries: entries,
@@ -77,8 +69,6 @@ impl ThreadHistory {
            search_editor,
            _subscriptions: vec![search_editor_subscription, history_store_subscription],
            _search_task: None,
-            scrollbar_visibility: true,
-            scrollbar_state,
        }
    }

@@ -230,43 +220,6 @@ impl ThreadHistory {
        cx.notify();
    }

-    fn render_scrollbar(&self, cx: &mut Context<Self>) -> Option<Stateful<Div>> {
-        if !(self.scrollbar_visibility || self.scrollbar_state.is_dragging()) {
-            return None;
-        }
-
-        Some(
-            div()
-                .occlude()
-                .id("thread-history-scroll")
-                .h_full()
-                .bg(cx.theme().colors().panel_background.opacity(0.8))
-                .border_l_1()
-                .border_color(cx.theme().colors().border_variant)
-                .absolute()
-                .right_1()
-                .top_0()
-                .bottom_0()
-                .w_4()
-                .pl_1()
-                .cursor_default()
-                .on_mouse_move(cx.listener(|_, _, _window, cx| {
-                    cx.notify();
-                    cx.stop_propagation()
-                }))
-                .on_hover(|_, _window, cx| {
-                    cx.stop_propagation();
-                })
-                .on_any_mouse_down(|_, _window, cx| {
-                    cx.stop_propagation();
-                })
-                .on_scroll_wheel(cx.listener(|_, _, _window, cx| {
-                    cx.notify();
-                }))
-                .children(Scrollbar::vertical(self.scrollbar_state.clone())),
-        )
-    }
-
    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 {
@@ -352,11 +305,7 @@ impl Render for ThreadHistory {
                )
            })
            .child({
-                let view = v_flex()
-                    .id("list-container")
-                    .relative()
-                    .overflow_hidden()
-                    .flex_grow();
+                let view = v_flex().overflow_hidden().flex_grow();

                if self.all_entries.is_empty() {
                    view.justify_center()
@@ -373,70 +322,59 @@ impl Render for ThreadHistory {
                        ),
                    )
                } else {
-                    view.pr_5()
-                        .child(
-                            uniform_list(
-                                cx.entity().clone(),
-                                "thread-history",
-                                self.matched_count(),
-                                move |history, range, _window, _cx| {
-                                    let range_start = range.start;
-                                    let assistant_panel = history.assistant_panel.clone();
+                    view.p_1().child(
+                        uniform_list(
+                            cx.entity().clone(),
+                            "thread-history",
+                            self.matched_count(),
+                            move |history, range, _window, _cx| {
+                                let range_start = range.start;
+                                let assistant_panel = history.assistant_panel.clone();

-                                    let render_item = |index: usize,
-                                                       entry: &HistoryEntry,
-                                                       highlight_positions: Vec<usize>|
-                                     -> Div {
-                                        h_flex().w_full().pb_1().child(match entry {
-                                            HistoryEntry::Thread(thread) => PastThread::new(
-                                                thread.clone(),
-                                                assistant_panel.clone(),
-                                                selected_index == index + range_start,
-                                                highlight_positions,
-                                            )
-                                            .into_any_element(),
-                                            HistoryEntry::Context(context) => PastContext::new(
-                                                context.clone(),
-                                                assistant_panel.clone(),
-                                                selected_index == index + range_start,
-                                                highlight_positions,
-                                            )
-                                            .into_any_element(),
-                                        })
-                                    };
+                                let render_item = |index: usize,
+                                                   entry: &HistoryEntry,
+                                                   highlight_positions: Vec<usize>|
+                                 -> Div {
+                                    h_flex().w_full().pb_1().child(match entry {
+                                        HistoryEntry::Thread(thread) => PastThread::new(
+                                            thread.clone(),
+                                            assistant_panel.clone(),
+                                            selected_index == index + range_start,
+                                            highlight_positions,
+                                        )
+                                        .into_any_element(),
+                                        HistoryEntry::Context(context) => PastContext::new(
+                                            context.clone(),
+                                            assistant_panel.clone(),
+                                            selected_index == index + range_start,
+                                            highlight_positions,
+                                        )
+                                        .into_any_element(),
+                                    })
+                                };

-                                    if history.has_search_query() {
-                                        history.matches[range]
-                                            .iter()
-                                            .enumerate()
-                                            .filter_map(|(index, m)| {
-                                                history.all_entries.get(m.candidate_id).map(
-                                                    |entry| {
-                                                        render_item(
-                                                            index,
-                                                            entry,
-                                                            m.positions.clone(),
-                                                        )
-                                                    },
-                                                )
+                                if history.has_search_query() {
+                                    history.matches[range]
+                                        .iter()
+                                        .enumerate()
+                                        .filter_map(|(index, m)| {
+                                            history.all_entries.get(m.candidate_id).map(|entry| {
+                                                render_item(index, entry, m.positions.clone())
                                            })
-                                            .collect()
-                                    } else {
-                                        history.all_entries[range]
-                                            .iter()
-                                            .enumerate()
-                                            .map(|(index, entry)| render_item(index, entry, vec![]))
-                                            .collect()
-                                    }
-                                },
-                            )
-                            .p_1()
-                            .track_scroll(self.scroll_handle.clone())
-                            .flex_grow(),
+                                        })
+                                        .collect()
+                                } else {
+                                    history.all_entries[range]
+                                        .iter()
+                                        .enumerate()
+                                        .map(|(index, entry)| render_item(index, entry, vec![]))
+                                        .collect()
+                                }
+                            },
                        )
-                        .when_some(self.render_scrollbar(cx), |div, scrollbar| {
-                            div.child(scrollbar)
-                        })
+                        .track_scroll(self.scroll_handle.clone())
+                        .flex_grow(),
+                    )
                }
            })
    }
@@ -502,7 +440,6 @@ impl RenderOnce for PastThread {
                        IconButton::new("delete", IconName::TrashAlt)
                            .shape(IconButtonShape::Square)
                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
                            .tooltip(move |window, cx| {
                                Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                            })
@@ -594,7 +531,6 @@ impl RenderOnce for PastContext {
                    IconButton::new("delete", IconName::TrashAlt)
                        .shape(IconButtonShape::Square)
                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
                        .tooltip(move |window, cx| {
                            Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                        })
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,254 +1,88 @@
 use std::borrow::Cow;
-use std::cell::{Ref, RefCell};
-use std::path::{Path, PathBuf};
-use std::rc::Rc;
+use std::path::PathBuf;
 use std::sync::Arc;

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

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

-const RULES_FILE_NAMES: [&'static str; 6] = [
-    ".rules",
-    ".cursorrules",
-    ".windsurfrules",
-    ".clinerules",
-    ".github/copilot-instructions.md",
-    "CLAUDE.md",
-];
-
 pub fn init(cx: &mut App) {
    ThreadsDatabase::init(cx);
 }

-/// A system prompt shared by all threads created by this ThreadStore
-#[derive(Clone, Default)]
-pub struct SharedProjectContext(Rc<RefCell<Option<ProjectContext>>>);
-
-impl SharedProjectContext {
-    pub fn borrow(&self) -> Ref<Option<ProjectContext>> {
-        self.0.borrow()
-    }
-}
-
 pub struct ThreadStore {
    project: Entity<Project>,
-    tools: Entity<ToolWorkingSet>,
+    tools: Arc<ToolWorkingSet>,
    prompt_builder: Arc<PromptBuilder>,
    context_server_manager: Entity<ContextServerManager>,
    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SerializedThreadMetadata>,
-    project_context: SharedProjectContext,
    _subscriptions: Vec<Subscription>,
 }

-pub struct RulesLoadingError {
-    pub message: SharedString,
-}
-
-impl EventEmitter<RulesLoadingError> for ThreadStore {}
-
 impl ThreadStore {
-    pub fn load(
+    pub fn new(
        project: Entity<Project>,
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
        cx: &mut App,
-    ) -> Task<Entity<Self>> {
-        let thread_store = cx.new(|cx| Self::new(project, tools, prompt_builder, cx));
-        let reload = thread_store.update(cx, |store, cx| store.reload_system_prompt(cx));
-        cx.foreground_executor().spawn(async move {
-            reload.await;
-            thread_store
-        })
-    }
-
-    fn new(
-        project: Entity<Project>,
-        tools: Entity<ToolWorkingSet>,
-        prompt_builder: Arc<PromptBuilder>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let context_server_factory_registry = ContextServerFactoryRegistry::default_global(cx);
-        let context_server_manager = cx.new(|cx| {
-            ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
-        });
-        let settings_subscription =
-            cx.observe_global::<SettingsStore>(move |this: &mut Self, cx| {
-                this.load_default_profile(cx);
+    ) -> Result<Entity<Self>> {
+        let this = cx.new(|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)
            });
-        let project_subscription = cx.subscribe(&project, Self::handle_project_event);
+            let settings_subscription =
+                cx.observe_global::<SettingsStore>(move |this: &mut Self, cx| {
+                    this.load_default_profile(cx);
+                });

-        let this = Self {
-            project,
-            tools,
-            prompt_builder,
-            context_server_manager,
-            context_server_tool_ids: HashMap::default(),
-            threads: Vec::new(),
-            project_context: SharedProjectContext::default(),
-            _subscriptions: vec![settings_subscription, project_subscription],
-        };
-        this.load_default_profile(cx);
-        this.register_context_server_handlers(cx);
-        this.reload(cx).detach_and_log_err(cx);
-        this
-    }
-
-    fn handle_project_event(
-        &mut self,
-        _project: Entity<Project>,
-        event: &project::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::Event::WorktreeAdded(_) | project::Event::WorktreeRemoved(_) => {
-                self.reload_system_prompt(cx).detach();
-            }
-            project::Event::WorktreeUpdatedEntries(_, items) => {
-                if items.iter().any(|(path, _, _)| {
-                    RULES_FILE_NAMES
-                        .iter()
-                        .any(|name| path.as_ref() == Path::new(name))
-                }) {
-                    self.reload_system_prompt(cx).detach();
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn reload_system_prompt(&self, cx: &mut Context<Self>) -> Task<()> {
-        let project = self.project.read(cx);
-        let tasks = project
-            .visible_worktrees(cx)
-            .map(|worktree| {
-                Self::load_worktree_info_for_system_prompt(
-                    project.fs().clone(),
-                    worktree.read(cx),
-                    cx,
-                )
-            })
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |this, cx| {
-            let results = futures::future::join_all(tasks).await;
-            let worktrees = results
-                .into_iter()
-                .map(|(worktree, rules_error)| {
-                    if let Some(rules_error) = rules_error {
-                        this.update(cx, |_, cx| cx.emit(rules_error)).ok();
-                    }
-                    worktree
-                })
-                .collect::<Vec<_>>();
-            this.update(cx, |this, _cx| {
-                *this.project_context.0.borrow_mut() = Some(ProjectContext::new(worktrees));
-            })
-            .ok();
-        })
-    }
-
-    fn load_worktree_info_for_system_prompt(
-        fs: Arc<dyn Fs>,
-        worktree: &Worktree,
-        cx: &App,
-    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
-        let root_name = worktree.root_name().into();
-        let abs_path = worktree.abs_path();
-
-        let rules_task = Self::load_worktree_rules_file(fs, worktree, cx);
-        let Some(rules_task) = rules_task else {
-            return Task::ready((
-                WorktreeContext {
-                    root_name,
-                    abs_path,
-                    rules_file: None,
-                },
-                None,
-            ));
-        };
-
-        cx.spawn(async move |_| {
-            let (rules_file, rules_file_error) = match rules_task.await {
-                Ok(rules_file) => (Some(rules_file), None),
-                Err(err) => (
-                    None,
-                    Some(RulesLoadingError {
-                        message: format!("{err}").into(),
-                    }),
-                ),
+            let this = Self {
+                project,
+                tools,
+                prompt_builder,
+                context_server_manager,
+                context_server_tool_ids: HashMap::default(),
+                threads: Vec::new(),
+                _subscriptions: vec![settings_subscription],
            };
-            let worktree_info = WorktreeContext {
-                root_name,
-                abs_path,
-                rules_file,
-            };
-            (worktree_info, rules_file_error)
-        })
-    }
+            this.load_default_profile(cx);
+            this.register_context_server_handlers(cx);
+            this.reload(cx).detach_and_log_err(cx);

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

-        // 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, abs_path)| {
-            let fs = fs.clone();
-            cx.background_spawn(async move {
-                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,
-                    abs_path: abs_path.into(),
-                    text: text.trim().to_string(),
-                })
-            })
-        })
+        Ok(this)
    }

    pub fn context_server_manager(&self) -> Entity<ContextServerManager> {
        self.context_server_manager.clone()
    }

-    pub fn tools(&self) -> Entity<ToolWorkingSet> {
+    pub fn tools(&self) -> Arc<ToolWorkingSet> {
        self.tools.clone()
    }

@@ -273,7 +107,6 @@ impl ThreadStore {
                self.project.clone(),
                self.tools.clone(),
                self.prompt_builder.clone(),
-                self.project_context.clone(),
                cx,
            )
        })
@@ -301,12 +134,21 @@ impl ThreadStore {
                        this.project.clone(),
                        this.tools.clone(),
                        this.prompt_builder.clone(),
-                        this.project_context.clone(),
                        cx,
                    )
                })
            })?;

+            let (system_prompt_context, load_error) = thread
+                .update(cx, |thread, cx| thread.load_system_prompt_context(cx))?
+                .await;
+            thread.update(cx, |thread, cx| {
+                thread.set_system_prompt_context(system_prompt_context);
+                if let Some(load_error) = load_error {
+                    cx.emit(ThreadEvent::ShowError(load_error));
+                }
+            })?;
+
            Ok(thread)
        })
    }
@@ -355,60 +197,52 @@ impl ThreadStore {
        })
    }

-    fn load_default_profile(&self, cx: &mut Context<Self>) {
+    fn load_default_profile(&self, cx: &Context<Self>) {
        let assistant_settings = AssistantSettings::get_global(cx);

-        self.load_profile_by_id(assistant_settings.default_profile.clone(), cx);
+        self.load_profile_by_id(&assistant_settings.default_profile, cx);
    }

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

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

-    pub fn load_profile(&self, profile: AgentProfile, cx: &mut Context<Self>) {
-        self.tools.update(cx, |tools, cx| {
-            tools.disable_all_tools(cx);
-            tools.enable(
-                ToolSource::Native,
-                &profile
-                    .tools
-                    .iter()
-                    .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
-                    .collect::<Vec<_>>(),
-                cx,
-            );
-        });
+    pub fn load_profile(&self, profile: &AgentProfile, cx: &Context<Self>) {
+        self.tools.disable_all_tools();
+        self.tools.enable(
+            ToolSource::Native,
+            &profile
+                .tools
+                .iter()
+                .filter_map(|(tool, enabled)| enabled.then(|| tool.clone()))
+                .collect::<Vec<_>>(),
+        );

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

                            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<_>>()
+                                    let tool_ids = 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<_>>();

-                                    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();
-                                    }
+                                    this.update(cx, |this, cx| {
+                                        this.context_server_tool_ids.insert(server_id, tool_ids);
+                                        this.load_default_profile(cx);
+                                    })
+                                    .log_err();
                                }
                            }
                        }
@@ -481,9 +308,7 @@ impl ThreadStore {
            }
            context_server::manager::Event::ServerStopped { server_id } => {
                if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
-                    tool_working_set.update(cx, |tool_working_set, _| {
-                        tool_working_set.remove(&tool_ids);
-                    });
+                    tool_working_set.remove(&tool_ids);
                    self.load_default_profile(cx);
                }
            }
@@ -510,8 +335,6 @@ pub struct SerializedThread {
    pub cumulative_token_usage: TokenUsage,
    #[serde(default)]
    pub detailed_summary_state: DetailedSummaryState,
-    #[serde(default)]
-    pub exceeded_window_error: Option<ExceededWindowError>,
 }

 impl SerializedThread {
@@ -598,7 +421,6 @@ impl LegacySerializedThread {
            initial_project_snapshot: self.initial_project_snapshot,
            cumulative_token_usage: TokenUsage::default(),
            detailed_summary_state: DetailedSummaryState::default(),
-            exceeded_window_error: None,
        }
    }
 }
@@ -669,7 +491,7 @@ impl ThreadsDatabase {
        let database_future = executor
            .spawn({
                let executor = executor.clone();
-                let database_path = paths::data_dir().join("threads/threads-db.1.mdb");
+                let database_path = paths::support_dir().join("threads/threads-db.1.mdb");
                async move { ThreadsDatabase::new(database_path, executor) }
            })
            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
--- a/crates/agent/src/tool_compatibility.rs
+++ b/crates/agent/src/tool_compatibility.rs
@@ -1,89 +0,0 @@
-use std::sync::Arc;
-
-use assistant_tool::{Tool, ToolWorkingSet, ToolWorkingSetEvent};
-use collections::HashMap;
-use gpui::{App, Context, Entity, IntoElement, Render, Subscription, Window};
-use language_model::{LanguageModel, LanguageModelToolSchemaFormat};
-use ui::prelude::*;
-
-pub struct IncompatibleToolsState {
-    cache: HashMap<LanguageModelToolSchemaFormat, Vec<Arc<dyn Tool>>>,
-    tool_working_set: Entity<ToolWorkingSet>,
-    _tool_working_set_subscription: Subscription,
-}
-
-impl IncompatibleToolsState {
-    pub fn new(tool_working_set: Entity<ToolWorkingSet>, cx: &mut Context<Self>) -> Self {
-        let _tool_working_set_subscription =
-            cx.subscribe(&tool_working_set, |this, _, event, _| match event {
-                ToolWorkingSetEvent::EnabledToolsChanged => {
-                    this.cache.clear();
-                }
-            });
-
-        Self {
-            cache: HashMap::default(),
-            tool_working_set,
-            _tool_working_set_subscription,
-        }
-    }
-
-    pub fn incompatible_tools(
-        &mut self,
-        model: &Arc<dyn LanguageModel>,
-        cx: &App,
-    ) -> &[Arc<dyn Tool>] {
-        self.cache
-            .entry(model.tool_input_format())
-            .or_insert_with(|| {
-                self.tool_working_set
-                    .read(cx)
-                    .enabled_tools(cx)
-                    .iter()
-                    .filter(|tool| tool.input_schema(model.tool_input_format()).is_err())
-                    .cloned()
-                    .collect()
-            })
-    }
-}
-
-pub struct IncompatibleToolsTooltip {
-    pub incompatible_tools: Vec<Arc<dyn Tool>>,
-}
-
-impl Render for IncompatibleToolsTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        ui::tooltip_container(window, cx, |container, _, cx| {
-            container
-                .w_72()
-                .child(Label::new("Incompatible Tools").size(LabelSize::Small))
-                .child(
-                    Label::new(
-                        "This model is incompatible with the following tools from your MCPs:",
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    v_flex()
-                        .my_1p5()
-                        .py_0p5()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .children(
-                            self.incompatible_tools
-                                .iter()
-                                .map(|tool| Label::new(tool.name()).size(LabelSize::Small).buffer_font(cx)),
-                        ),
-                )
-                .child(Label::new("What To Do Instead").size(LabelSize::Small))
-                .child(
-                    Label::new(
-                        "Every other tool continues to work with this model, but to specifically use those, switch to another model.",
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-        })
-    }
-}
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -5,7 +5,7 @@ use assistant_tool::{Tool, ToolWorkingSet};
 use collections::HashMap;
 use futures::FutureExt as _;
 use futures::future::Shared;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{App, SharedString, Task};
 use language_model::{
    LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolResult,
    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
@@ -49,23 +49,25 @@ impl ToolUseStatus {
 }

 pub struct ToolUseState {
-    tools: Entity<ToolWorkingSet>,
+    tools: Arc<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, gpui::AnyView>,
 }

 pub const USING_TOOL_MARKER: &str = "<using_tool>";

 impl ToolUseState {
-    pub fn new(tools: Entity<ToolWorkingSet>) -> Self {
+    pub fn new(tools: Arc<ToolWorkingSet>) -> Self {
        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(),
        }
    }

@@ -73,7 +75,7 @@ impl ToolUseState {
    ///
    /// Accepts a function to filter the tools that should be used to populate the state.
    pub fn from_serialized_messages(
-        tools: Entity<ToolWorkingSet>,
+        tools: Arc<ToolWorkingSet>,
        messages: &[SerializedMessage],
        mut filter_by_tool_name: impl FnMut(&str) -> bool,
    ) -> Self {
@@ -199,12 +201,12 @@ impl ToolUseState {
                }
            })();

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

            tool_uses.push(ToolUse {
                id: tool_use.id.clone(),
@@ -226,7 +228,7 @@ impl ToolUseState {
        input: &serde_json::Value,
        cx: &App,
    ) -> SharedString {
-        if let Some(tool) = self.tools.read(cx).tool(tool_name, cx) {
+        if let Some(tool) = self.tools.tool(tool_name, cx) {
            tool.ui_text(input).into()
        } else {
            format!("Unknown tool {tool_name:?}").into()
@@ -257,6 +259,18 @@ impl ToolUseState {
        self.tool_results.get(tool_use_id)
    }

+    pub fn tool_result_card(&self, tool_use_id: &LanguageModelToolUseId) -> Option<&gpui::AnyView> {
+        self.tool_result_cards.get(tool_use_id)
+    }
+
+    pub fn insert_tool_result_card(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        card: gpui::AnyView,
+    ) {
+        self.tool_result_cards.insert(tool_use_id, card);
+    }
+
    pub fn request_tool_use(
        &mut self,
        assistant_message_id: MessageId,
--- a/crates/agent/src/ui.rs
+++ b/crates/agent/src/ui.rs
@@ -1,7 +1,5 @@
 mod agent_notification;
 mod context_pill;
-mod user_spending;

 pub use agent_notification::*;
 pub use context_pill::*;
-// pub use user_spending::*;
--- a/crates/agent/src/ui/user_spending.rs
+++ b/crates/agent/src/ui/user_spending.rs
@@ -1,186 +0,0 @@
-use gpui::{Entity, Render};
-use ui::{ProgressBar, prelude::*};
-
-#[derive(RegisterComponent)]
-pub struct UserSpending {
-    free_tier_current: u32,
-    free_tier_cap: u32,
-    over_tier_current: u32,
-    over_tier_cap: u32,
-    free_tier_progress: Entity<ProgressBar>,
-    over_tier_progress: Entity<ProgressBar>,
-}
-
-impl UserSpending {
-    pub fn new(
-        free_tier_current: u32,
-        free_tier_cap: u32,
-        over_tier_current: u32,
-        over_tier_cap: u32,
-        cx: &mut App,
-    ) -> Self {
-        let free_tier_capped = free_tier_current == free_tier_cap;
-        let free_tier_near_capped =
-            free_tier_current as f32 / 100.0 >= free_tier_cap as f32 / 100.0 * 0.9;
-        let over_tier_capped = over_tier_current == over_tier_cap;
-        let over_tier_near_capped =
-            over_tier_current as f32 / 100.0 >= over_tier_cap as f32 / 100.0 * 0.9;
-
-        let free_tier_progress = cx.new(|cx| {
-            ProgressBar::new(
-                "free_tier",
-                free_tier_current as f32,
-                free_tier_cap as f32,
-                cx,
-            )
-        });
-        let over_tier_progress = cx.new(|cx| {
-            ProgressBar::new(
-                "over_tier",
-                over_tier_current as f32,
-                over_tier_cap as f32,
-                cx,
-            )
-        });
-
-        if free_tier_capped {
-            free_tier_progress.update(cx, |progress_bar, cx| {
-                progress_bar.fg_color(cx.theme().status().error);
-            });
-        } else if free_tier_near_capped {
-            free_tier_progress.update(cx, |progress_bar, cx| {
-                progress_bar.fg_color(cx.theme().status().warning);
-            });
-        }
-
-        if over_tier_capped {
-            over_tier_progress.update(cx, |progress_bar, cx| {
-                progress_bar.fg_color(cx.theme().status().error);
-            });
-        } else if over_tier_near_capped {
-            over_tier_progress.update(cx, |progress_bar, cx| {
-                progress_bar.fg_color(cx.theme().status().warning);
-            });
-        }
-
-        Self {
-            free_tier_current,
-            free_tier_cap,
-            over_tier_current,
-            over_tier_cap,
-            free_tier_progress,
-            over_tier_progress,
-        }
-    }
-}
-
-impl Render for UserSpending {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let formatted_free_tier = format!(
-            "${} / ${}",
-            self.free_tier_current as f32 / 100.0,
-            self.free_tier_cap as f32 / 100.0
-        );
-        let formatted_over_tier = format!(
-            "${} / ${}",
-            self.over_tier_current as f32 / 100.0,
-            self.over_tier_cap as f32 / 100.0
-        );
-
-        v_group()
-            .elevation_2(cx)
-            .py_1p5()
-            .px_2p5()
-            .w(px(360.))
-            .child(
-                v_flex()
-                    .child(
-                        v_flex()
-                            .p_1p5()
-                            .gap_0p5()
-                            .child(
-                                h_flex()
-                                    .justify_between()
-                                    .child(Label::new("Free Tier Usage").size(LabelSize::Small))
-                                    .child(
-                                        Label::new(formatted_free_tier)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                            .child(self.free_tier_progress.clone()),
-                    )
-                    .child(
-                        v_flex()
-                            .p_1p5()
-                            .gap_0p5()
-                            .child(
-                                h_flex()
-                                    .justify_between()
-                                    .child(Label::new("Current Spending").size(LabelSize::Small))
-                                    .child(
-                                        Label::new(formatted_over_tier)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                            .child(self.over_tier_progress.clone()),
-                    ),
-            )
-    }
-}
-
-impl Component for UserSpending {
-    fn scope() -> ComponentScope {
-        ComponentScope::None
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let new_user = cx.new(|cx| UserSpending::new(0, 2000, 0, 2000, cx));
-        let free_capped = cx.new(|cx| UserSpending::new(2000, 2000, 0, 2000, cx));
-        let free_near_capped = cx.new(|cx| UserSpending::new(1800, 2000, 0, 2000, cx));
-        let over_near_capped = cx.new(|cx| UserSpending::new(2000, 2000, 1800, 2000, cx));
-        let over_capped = cx.new(|cx| UserSpending::new(1000, 2000, 2000, 2000, cx));
-
-        Some(
-            v_flex()
-                .gap_6()
-                .p_4()
-                .children(vec![example_group(vec![
-                    single_example(
-                        "New User",
-                        div().size_full().child(new_user.clone()).into_any_element(),
-                    ),
-                    single_example(
-                        "Free Tier Capped",
-                        div()
-                            .size_full()
-                            .child(free_capped.clone())
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Free Tier Near Capped",
-                        div()
-                            .size_full()
-                            .child(free_near_capped.clone())
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Over Tier Near Capped",
-                        div()
-                            .size_full()
-                            .child(over_near_capped.clone())
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Over Tier Capped",
-                        div()
-                            .size_full()
-                            .child(over_capped.clone())
-                            .into_any_element(),
-                    ),
-                ])])
-                .into_any_element(),
-        )
-    }
-}
--- a/crates/agent_eval/Cargo.toml
+++ b/crates/agent_eval/Cargo.toml
@@ -1,51 +1,46 @@
 [package]
-name = "eval"
+name = "agent_eval"
 version = "0.1.0"
-publish.workspace = true
 edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[[bin]]
+name = "agent_eval"
+path = "src/main.rs"

 [dependencies]
 agent.workspace = true
 anyhow.workspace = true
-async-watch.workspace = true
 assistant_tool.workspace = true
 assistant_tools.workspace = true
-chrono.workspace = true
 clap.workspace = true
 client.workspace = true
 collections.workspace = true
 context_server.workspace = true
 dap.workspace = true
 env_logger.workspace = true
-extension.workspace = true
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 gpui_tokio.workspace = true
-handlebars.workspace = true
 language.workspace = true
-language_extension.workspace = true
 language_model.workspace = true
 language_models.workspace = true
-languages = { workspace = true, features = ["load-grammars"] }
 node_runtime.workspace = true
-paths.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 release_channel.workspace = true
 reqwest_client.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 settings.workspace = true
-shellexpand.workspace = true
-toml.workspace = true
-unindent.workspace = true
+smol.workspace = true
+tempfile.workspace = true
 util.workspace = true
+walkdir.workspace = true
 workspace-hack.workspace = true
-
-[[bin]]
-name = "eval"
-path = "src/eval.rs"
-
-[lints]
-workspace = true
--- a/crates/auto_update_helper/LICENSE-GPL
+++ b/crates/auto_update_helper/LICENSE-GPL
--- a/crates/agent_eval/build.rs
+++ b/crates/agent_eval/build.rs
@@ -0,0 +1,52 @@
+// Copied from `crates/zed/build.rs`, with removal of code for including the zed icon on windows.
+
+use std::process::Command;
+
+fn main() {
+    if cfg!(target_os = "macos") {
+        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
+
+        // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+.
+        println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit");
+
+        // Seems to be required to enable Swift concurrency
+        println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");
+
+        // Register exported Objective-C selectors, protocols, etc
+        println!("cargo:rustc-link-arg=-Wl,-ObjC");
+    }
+
+    // Populate git sha environment variable if git is available
+    println!("cargo:rerun-if-changed=../../.git/logs/HEAD");
+    println!(
+        "cargo:rustc-env=TARGET={}",
+        std::env::var("TARGET").unwrap()
+    );
+    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
+        if output.status.success() {
+            let git_sha = String::from_utf8_lossy(&output.stdout);
+            let git_sha = git_sha.trim();
+
+            println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
+
+            if let Ok(build_profile) = std::env::var("PROFILE") {
+                if build_profile == "release" {
+                    // This is currently the best way to make `cargo build ...`'s build script
+                    // to print something to stdout without extra verbosity.
+                    println!(
+                        "cargo:warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var"
+                    );
+                }
+            }
+        }
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+        #[cfg(target_env = "msvc")]
+        {
+            // todo(windows): This is to avoid stack overflow. Remove it when solved.
+            println!("cargo:rustc-link-arg=/stack:{}", 8 * 1024 * 1024);
+        }
+    }
+}
--- a/crates/agent_eval/src/eval.rs
+++ b/crates/agent_eval/src/eval.rs
@@ -0,0 +1,384 @@
+use crate::git_commands::{run_git, setup_temp_repo};
+use crate::headless_assistant::{HeadlessAppState, HeadlessAssistant};
+use crate::{get_exercise_language, get_exercise_name};
+use agent::RequestKind;
+use anyhow::{Result, anyhow};
+use collections::HashMap;
+use gpui::{App, Task};
+use language_model::{LanguageModel, TokenUsage};
+use serde::{Deserialize, Serialize};
+use std::{
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::{Duration, SystemTime},
+};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct EvalResult {
+    pub exercise_name: String,
+    pub diff: String,
+    pub assistant_response: String,
+    pub elapsed_time_ms: u128,
+    pub timestamp: u128,
+    // Token usage fields
+    pub input_tokens: usize,
+    pub output_tokens: usize,
+    pub total_tokens: usize,
+    pub tool_use_counts: usize,
+}
+
+pub struct EvalOutput {
+    pub diff: String,
+    pub last_message: String,
+    pub elapsed_time: Duration,
+    pub assistant_response_count: usize,
+    pub tool_use_counts: HashMap<Arc<str>, u32>,
+    pub token_usage: TokenUsage,
+}
+
+#[derive(Deserialize)]
+pub struct EvalSetup {
+    pub url: String,
+    pub base_sha: String,
+}
+
+pub struct Eval {
+    pub repo_path: PathBuf,
+    pub eval_setup: EvalSetup,
+    pub user_prompt: String,
+}
+
+impl Eval {
+    // Keep this method for potential future use, but mark it as intentionally unused
+    #[allow(dead_code)]
+    pub async fn load(_name: String, path: PathBuf, repos_dir: &Path) -> Result<Self> {
+        let prompt_path = path.join("prompt.txt");
+        let user_prompt = smol::unblock(|| std::fs::read_to_string(prompt_path)).await?;
+        let setup_path = path.join("setup.json");
+        let setup_contents = smol::unblock(|| std::fs::read_to_string(setup_path)).await?;
+        let eval_setup = serde_json_lenient::from_str_lenient::<EvalSetup>(&setup_contents)?;
+
+        // Move this internal function inside the load method since it's only used here
+        fn repo_dir_name(url: &str) -> String {
+            url.trim_start_matches("https://")
+                .replace(|c: char| !c.is_alphanumeric(), "_")
+        }
+
+        let repo_path = repos_dir.join(repo_dir_name(&eval_setup.url));
+
+        Ok(Eval {
+            repo_path,
+            eval_setup,
+            user_prompt,
+        })
+    }
+
+    pub fn run(
+        self,
+        app_state: Arc<HeadlessAppState>,
+        model: Arc<dyn LanguageModel>,
+        cx: &mut App,
+    ) -> Task<Result<EvalOutput>> {
+        cx.spawn(async move |cx| {
+            run_git(&self.repo_path, &["checkout", &self.eval_setup.base_sha]).await?;
+
+            let (assistant, done_rx) =
+                cx.update(|cx| HeadlessAssistant::new(app_state.clone(), cx))??;
+
+            let _worktree = assistant
+                .update(cx, |assistant, cx| {
+                    assistant.project.update(cx, |project, cx| {
+                        project.create_worktree(&self.repo_path, true, cx)
+                    })
+                })?
+                .await?;
+
+            let start_time = std::time::SystemTime::now();
+
+            let (system_prompt_context, load_error) = cx
+                .update(|cx| {
+                    assistant
+                        .read(cx)
+                        .thread
+                        .read(cx)
+                        .load_system_prompt_context(cx)
+                })?
+                .await;
+
+            if let Some(load_error) = load_error {
+                return Err(anyhow!("{:?}", load_error));
+            };
+
+            assistant.update(cx, |assistant, cx| {
+                assistant.thread.update(cx, |thread, cx| {
+                    let context = vec![];
+                    thread.insert_user_message(self.user_prompt.clone(), context, None, cx);
+                    thread.set_system_prompt_context(system_prompt_context);
+                    thread.send_to_model(model, RequestKind::Chat, cx);
+                });
+            })?;
+
+            done_rx.recv().await??;
+
+            // Add this section to check untracked files
+            println!("Checking for untracked files:");
+            let untracked = run_git(
+                &self.repo_path,
+                &["ls-files", "--others", "--exclude-standard"],
+            )
+            .await?;
+            if untracked.is_empty() {
+                println!("No untracked files found");
+            } else {
+                // Add all files to git so they appear in the diff
+                println!("Adding untracked files to git");
+                run_git(&self.repo_path, &["add", "."]).await?;
+            }
+
+            // get git status
+            let _status = run_git(&self.repo_path, &["status", "--short"]).await?;
+
+            let elapsed_time = start_time.elapsed()?;
+
+            // Get diff of staged changes (the files we just added)
+            let staged_diff = run_git(&self.repo_path, &["diff", "--staged"]).await?;
+
+            // Get diff of unstaged changes
+            let unstaged_diff = run_git(&self.repo_path, &["diff"]).await?;
+
+            // Combine both diffs
+            let diff = if unstaged_diff.is_empty() {
+                staged_diff
+            } else if staged_diff.is_empty() {
+                unstaged_diff
+            } else {
+                format!(
+                    "# Staged changes\n{}\n\n# Unstaged changes\n{}",
+                    staged_diff, unstaged_diff
+                )
+            };
+
+            assistant.update(cx, |assistant, cx| {
+                let thread = assistant.thread.read(cx);
+                let last_message = thread.messages().last().unwrap();
+                if last_message.role != language_model::Role::Assistant {
+                    return Err(anyhow!("Last message is not from assistant"));
+                }
+                let assistant_response_count = thread
+                    .messages()
+                    .filter(|message| message.role == language_model::Role::Assistant)
+                    .count();
+                Ok(EvalOutput {
+                    diff,
+                    last_message: last_message.to_string(),
+                    elapsed_time,
+                    assistant_response_count,
+                    tool_use_counts: assistant.tool_use_counts.clone(),
+                    token_usage: thread.cumulative_token_usage(),
+                })
+            })?
+        })
+    }
+}
+
+impl EvalOutput {
+    // Keep this method for potential future use, but mark it as intentionally unused
+    #[allow(dead_code)]
+    pub fn save_to_directory(&self, output_dir: &Path, eval_output_value: String) -> Result<()> {
+        // Create the output directory if it doesn't exist
+        fs::create_dir_all(&output_dir)?;
+
+        // Save the diff to a file
+        let diff_path = output_dir.join("diff.patch");
+        let mut diff_file = fs::File::create(&diff_path)?;
+        diff_file.write_all(self.diff.as_bytes())?;
+
+        // Save the last message to a file
+        let message_path = output_dir.join("assistant_response.txt");
+        let mut message_file = fs::File::create(&message_path)?;
+        message_file.write_all(self.last_message.as_bytes())?;
+
+        // Current metrics for this run
+        let current_metrics = serde_json::json!({
+            "elapsed_time_ms": self.elapsed_time.as_millis(),
+            "assistant_response_count": self.assistant_response_count,
+            "tool_use_counts": self.tool_use_counts,
+            "token_usage": self.token_usage,
+            "eval_output_value": eval_output_value,
+        });
+
+        // Get current timestamp in milliseconds
+        let timestamp = std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)?
+            .as_millis()
+            .to_string();
+
+        // Path to metrics file
+        let metrics_path = output_dir.join("metrics.json");
+
+        // Load existing metrics if the file exists, or create a new object
+        let mut historical_metrics = if metrics_path.exists() {
+            let metrics_content = fs::read_to_string(&metrics_path)?;
+            serde_json::from_str::<serde_json::Value>(&metrics_content)
+                .unwrap_or_else(|_| serde_json::json!({}))
+        } else {
+            serde_json::json!({})
+        };
+
+        // Add new run with timestamp as key
+        if let serde_json::Value::Object(ref mut map) = historical_metrics {
+            map.insert(timestamp, current_metrics);
+        }
+
+        // Write updated metrics back to file
+        let metrics_json = serde_json::to_string_pretty(&historical_metrics)?;
+        let mut metrics_file = fs::File::create(&metrics_path)?;
+        metrics_file.write_all(metrics_json.as_bytes())?;
+
+        Ok(())
+    }
+}
+
+pub async fn read_instructions(exercise_path: &Path) -> Result<String> {
+    let instructions_path = exercise_path.join(".docs").join("instructions.md");
+    println!("Reading instructions from: {}", instructions_path.display());
+    let instructions = smol::unblock(move || std::fs::read_to_string(&instructions_path)).await?;
+    Ok(instructions)
+}
+
+pub async fn save_eval_results(exercise_path: &Path, results: Vec<EvalResult>) -> Result<()> {
+    let eval_dir = exercise_path.join("evaluation");
+    fs::create_dir_all(&eval_dir)?;
+
+    let eval_file = eval_dir.join("evals.json");
+
+    println!("Saving evaluation results to: {}", eval_file.display());
+    println!(
+        "Results to save: {} evaluations for exercise path: {}",
+        results.len(),
+        exercise_path.display()
+    );
+
+    // Check file existence before reading/writing
+    if eval_file.exists() {
+        println!("Existing evals.json file found, will update it");
+    } else {
+        println!("No existing evals.json file found, will create new one");
+    }
+
+    // Structure to organize evaluations by test name and timestamp
+    let mut eval_data: serde_json::Value = if eval_file.exists() {
+        let content = fs::read_to_string(&eval_file)?;
+        serde_json::from_str(&content).unwrap_or_else(|_| serde_json::json!({}))
+    } else {
+        serde_json::json!({})
+    };
+
+    // Get current timestamp for this batch of results
+    let timestamp = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)?
+        .as_millis()
+        .to_string();
+
+    // Group the new results by test name (exercise name)
+    for result in results {
+        let exercise_name = &result.exercise_name;
+
+        println!("Adding result: exercise={}", exercise_name);
+
+        // Ensure the exercise entry exists
+        if eval_data.get(exercise_name).is_none() {
+            eval_data[exercise_name] = serde_json::json!({});
+        }
+
+        // Ensure the timestamp entry exists as an object
+        if eval_data[exercise_name].get(&timestamp).is_none() {
+            eval_data[exercise_name][&timestamp] = serde_json::json!({});
+        }
+
+        // Add this result under the timestamp with template name as key
+        eval_data[exercise_name][&timestamp] = serde_json::to_value(&result)?;
+    }
+
+    // Write back to file with pretty formatting
+    let json_content = serde_json::to_string_pretty(&eval_data)?;
+    match fs::write(&eval_file, json_content) {
+        Ok(_) => println!("✓ Successfully saved results to {}", eval_file.display()),
+        Err(e) => println!("✗ Failed to write results file: {}", e),
+    }
+
+    Ok(())
+}
+
+pub async fn run_exercise_eval(
+    exercise_path: PathBuf,
+    model: Arc<dyn LanguageModel>,
+    app_state: Arc<HeadlessAppState>,
+    base_sha: String,
+    _framework_path: PathBuf,
+    cx: gpui::AsyncApp,
+) -> Result<EvalResult> {
+    let exercise_name = get_exercise_name(&exercise_path);
+    let language = get_exercise_language(&exercise_path)?;
+    let mut instructions = read_instructions(&exercise_path).await?;
+    instructions.push_str(&format!(
+        "\n\nWhen writing the code for this prompt, use {} to achieve the goal.",
+        language
+    ));
+
+    println!("Running evaluation for exercise: {}", exercise_name);
+
+    // Create temporary directory with exercise files
+    let temp_dir = setup_temp_repo(&exercise_path, &base_sha).await?;
+    let temp_path = temp_dir.path().to_path_buf();
+
+    let local_commit_sha = run_git(&temp_path, &["rev-parse", "HEAD"]).await?;
+
+    let start_time = SystemTime::now();
+
+    // Create a basic eval struct to work with the existing system
+    let eval = Eval {
+        repo_path: temp_path.clone(),
+        eval_setup: EvalSetup {
+            url: format!("file://{}", temp_path.display()),
+            base_sha: local_commit_sha, // Use the local commit SHA instead of the framework base SHA
+        },
+        user_prompt: instructions.clone(),
+    };
+
+    // Run the evaluation
+    let eval_output = cx
+        .update(|cx| eval.run(app_state.clone(), model.clone(), cx))?
+        .await?;
+
+    // Get diff from git
+    let diff = eval_output.diff.clone();
+
+    let elapsed_time = start_time.elapsed()?;
+
+    // Calculate total tokens as the sum of input and output tokens
+    let input_tokens = eval_output.token_usage.input_tokens;
+    let output_tokens = eval_output.token_usage.output_tokens;
+    let tool_use_counts = eval_output.tool_use_counts.values().sum::<u32>();
+    let total_tokens = input_tokens + output_tokens;
+
+    // Save results to evaluation directory
+    let result = EvalResult {
+        exercise_name: exercise_name.clone(),
+        diff,
+        assistant_response: eval_output.last_message.clone(),
+        elapsed_time_ms: elapsed_time.as_millis(),
+        timestamp: SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)?
+            .as_millis(),
+        // Convert u32 token counts to usize
+        input_tokens: input_tokens.try_into().unwrap(),
+        output_tokens: output_tokens.try_into().unwrap(),
+        total_tokens: total_tokens.try_into().unwrap(),
+        tool_use_counts: tool_use_counts.try_into().unwrap(),
+    };
+
+    Ok(result)
+}
--- a/crates/agent_eval/src/get_exercise.rs
+++ b/crates/agent_eval/src/get_exercise.rs
@@ -0,0 +1,149 @@
+use anyhow::{Result, anyhow};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+pub fn get_exercise_name(exercise_path: &Path) -> String {
+    exercise_path
+        .file_name()
+        .unwrap_or_default()
+        .to_string_lossy()
+        .to_string()
+}
+
+pub fn get_exercise_language(exercise_path: &Path) -> Result<String> {
+    // Extract the language from path (data/python/exercises/... => python)
+    let parts: Vec<_> = exercise_path.components().collect();
+
+    for (i, part) in parts.iter().enumerate() {
+        if i > 0 && part.as_os_str() == "eval_code" {
+            if i + 1 < parts.len() {
+                let language = parts[i + 1].as_os_str().to_string_lossy().to_string();
+                return Ok(language);
+            }
+        }
+    }
+
+    Err(anyhow!(
+        "Could not determine language from path: {:?}",
+        exercise_path
+    ))
+}
+
+pub fn find_exercises(
+    framework_path: &Path,
+    languages: &[&str],
+    max_per_language: Option<usize>,
+) -> Result<Vec<PathBuf>> {
+    let mut all_exercises = Vec::new();
+
+    println!("Searching for exercises in languages: {:?}", languages);
+
+    for language in languages {
+        let language_dir = framework_path
+            .join("eval_code")
+            .join(language)
+            .join("exercises")
+            .join("practice");
+
+        println!("Checking language directory: {:?}", language_dir);
+        if !language_dir.exists() {
+            println!("Warning: Language directory not found: {:?}", language_dir);
+            continue;
+        }
+
+        let mut exercises = Vec::new();
+        match fs::read_dir(&language_dir) {
+            Ok(entries) => {
+                for entry_result in entries {
+                    match entry_result {
+                        Ok(entry) => {
+                            let path = entry.path();
+
+                            if path.is_dir() {
+                                // Special handling for "internal" directory
+                                if *language == "internal" {
+                                    // Check for repo_info.json to validate it's an internal exercise
+                                    let repo_info_path = path.join(".meta").join("repo_info.json");
+                                    let instructions_path =
+                                        path.join(".docs").join("instructions.md");
+
+                                    if repo_info_path.exists() && instructions_path.exists() {
+                                        exercises.push(path);
+                                    }
+                                } else {
+                                    // Map the language to the file extension - original code
+                                    let language_extension = match *language {
+                                        "python" => "py",
+                                        "go" => "go",
+                                        "rust" => "rs",
+                                        "typescript" => "ts",
+                                        "javascript" => "js",
+                                        "ruby" => "rb",
+                                        "php" => "php",
+                                        "bash" => "sh",
+                                        "multi" => "diff",
+                                        _ => continue, // Skip unsupported languages
+                                    };
+
+                                    // Check if this is a valid exercise with instructions and example
+                                    let instructions_path =
+                                        path.join(".docs").join("instructions.md");
+                                    let has_instructions = instructions_path.exists();
+                                    let example_path = path
+                                        .join(".meta")
+                                        .join(format!("example.{}", language_extension));
+                                    let has_example = example_path.exists();
+
+                                    if has_instructions && has_example {
+                                        exercises.push(path);
+                                    }
+                                }
+                            }
+                        }
+                        Err(err) => println!("Error reading directory entry: {}", err),
+                    }
+                }
+            }
+            Err(err) => println!(
+                "Error reading directory {}: {}",
+                language_dir.display(),
+                err
+            ),
+        }
+
+        // Sort exercises by name for consistent selection
+        exercises.sort_by(|a, b| {
+            let a_name = a.file_name().unwrap_or_default().to_string_lossy();
+            let b_name = b.file_name().unwrap_or_default().to_string_lossy();
+            a_name.cmp(&b_name)
+        });
+
+        // Apply the limit if specified
+        if let Some(limit) = max_per_language {
+            if exercises.len() > limit {
+                println!(
+                    "Limiting {} exercises to {} for language {}",
+                    exercises.len(),
+                    limit,
+                    language
+                );
+                exercises.truncate(limit);
+            }
+        }
+
+        println!(
+            "Found {} exercises for language {}: {:?}",
+            exercises.len(),
+            language,
+            exercises
+                .iter()
+                .map(|p| p.file_name().unwrap_or_default().to_string_lossy())
+                .collect::<Vec<_>>()
+        );
+        all_exercises.extend(exercises);
+    }
+
+    Ok(all_exercises)
+}
--- a/crates/agent_eval/src/git_commands.rs
+++ b/crates/agent_eval/src/git_commands.rs
@@ -0,0 +1,125 @@
+use anyhow::{Result, anyhow};
+use serde::Deserialize;
+use std::{fs, path::Path};
+use tempfile::TempDir;
+use util::command::new_smol_command;
+use walkdir::WalkDir;
+
+#[derive(Debug, Deserialize)]
+pub struct SetupConfig {
+    #[serde(rename = "base.sha")]
+    pub base_sha: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct RepoInfo {
+    pub remote_url: String,
+    pub head_sha: String,
+}
+
+pub async fn run_git(repo_path: &Path, args: &[&str]) -> Result<String> {
+    let output = new_smol_command("git")
+        .current_dir(repo_path)
+        .args(args)
+        .output()
+        .await?;
+
+    if output.status.success() {
+        Ok(String::from_utf8(output.stdout)?.trim().to_string())
+    } else {
+        Err(anyhow!(
+            "Git command failed: {} with status: {}",
+            args.join(" "),
+            output.status
+        ))
+    }
+}
+
+pub async fn read_base_sha(framework_path: &Path) -> Result<String> {
+    let setup_path = framework_path.join("setup.json");
+    let setup_content = smol::unblock(move || std::fs::read_to_string(&setup_path)).await?;
+    let setup_config: SetupConfig = serde_json_lenient::from_str_lenient(&setup_content)?;
+    Ok(setup_config.base_sha)
+}
+
+pub async fn read_repo_info(exercise_path: &Path) -> Result<RepoInfo> {
+    let repo_info_path = exercise_path.join(".meta").join("repo_info.json");
+    println!("Reading repo info from: {}", repo_info_path.display());
+    let repo_info_content = smol::unblock(move || std::fs::read_to_string(&repo_info_path)).await?;
+    let repo_info: RepoInfo = serde_json_lenient::from_str_lenient(&repo_info_content)?;
+
+    // Remove any quotes from the strings
+    let remote_url = repo_info.remote_url.trim_matches('"').to_string();
+    let head_sha = repo_info.head_sha.trim_matches('"').to_string();
+
+    Ok(RepoInfo {
+        remote_url,
+        head_sha,
+    })
+}
+
+pub async fn setup_temp_repo(exercise_path: &Path, _base_sha: &str) -> Result<TempDir> {
+    let temp_dir = TempDir::new()?;
+
+    // Check if this is an internal exercise by looking for repo_info.json
+    let repo_info_path = exercise_path.join(".meta").join("repo_info.json");
+    if repo_info_path.exists() {
+        // This is an internal exercise, handle it differently
+        let repo_info = read_repo_info(exercise_path).await?;
+
+        // Clone the repository to the temp directory
+        let url = repo_info.remote_url;
+        let clone_path = temp_dir.path();
+        println!(
+            "Cloning repository from {} to {}",
+            url,
+            clone_path.display()
+        );
+        run_git(
+            &std::env::current_dir()?,
+            &["clone", &url, &clone_path.to_string_lossy()],
+        )
+        .await?;
+
+        // Checkout the specified commit
+        println!("Checking out commit: {}", repo_info.head_sha);
+        run_git(temp_dir.path(), &["checkout", &repo_info.head_sha]).await?;
+
+        println!("Successfully set up internal repository");
+    } else {
+        // Original code for regular exercises
+        // Copy the exercise files to the temp directory, excluding .docs and .meta
+        for entry in WalkDir::new(exercise_path).min_depth(0).max_depth(10) {
+            let entry = entry?;
+            let source_path = entry.path();
+
+            // Skip .docs and .meta directories completely
+            if source_path.starts_with(exercise_path.join(".docs"))
+                || source_path.starts_with(exercise_path.join(".meta"))
+            {
+                continue;
+            }
+
+            if source_path.is_file() {
+                let relative_path = source_path.strip_prefix(exercise_path)?;
+                let dest_path = temp_dir.path().join(relative_path);
+
+                // Make sure parent directories exist
+                if let Some(parent) = dest_path.parent() {
+                    fs::create_dir_all(parent)?;
+                }
+
+                fs::copy(source_path, dest_path)?;
+            }
+        }
+
+        // Initialize git repo in the temp directory
+        run_git(temp_dir.path(), &["init"]).await?;
+        run_git(temp_dir.path(), &["add", "."]).await?;
+        run_git(temp_dir.path(), &["commit", "-m", "Initial commit"]).await?;
+
+        println!("Created temp repo without .docs and .meta directories");
+    }
+
+    Ok(temp_dir)
+}
--- a/crates/agent_eval/src/headless_assistant.rs
+++ b/crates/agent_eval/src/headless_assistant.rs
@@ -0,0 +1,246 @@
+use agent::{RequestKind, Thread, ThreadEvent, ThreadStore};
+use anyhow::anyhow;
+use assistant_tool::ToolWorkingSet;
+use client::{Client, UserStore};
+use collections::HashMap;
+use dap::DapRegistry;
+use gpui::{App, Entity, SemanticVersion, Subscription, Task, prelude::*};
+use language::LanguageRegistry;
+use language_model::{
+    AuthenticateError, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
+};
+use node_runtime::NodeRuntime;
+use project::{Project, RealFs};
+use prompt_store::PromptBuilder;
+use settings::SettingsStore;
+use smol::channel;
+use std::sync::Arc;
+
+/// Subset of `workspace::AppState` needed by `HeadlessAssistant`, with additional fields.
+pub struct HeadlessAppState {
+    pub languages: Arc<LanguageRegistry>,
+    pub client: Arc<Client>,
+    pub user_store: Entity<UserStore>,
+    pub fs: Arc<dyn fs::Fs>,
+    pub node_runtime: NodeRuntime,
+
+    // Additional fields not present in `workspace::AppState`.
+    pub prompt_builder: Arc<PromptBuilder>,
+}
+
+pub struct HeadlessAssistant {
+    pub thread: Entity<Thread>,
+    pub project: Entity<Project>,
+    #[allow(dead_code)]
+    pub thread_store: Entity<ThreadStore>,
+    pub tool_use_counts: HashMap<Arc<str>, u32>,
+    pub done_tx: channel::Sender<anyhow::Result<()>>,
+    _subscription: Subscription,
+}
+
+impl HeadlessAssistant {
+    pub fn new(
+        app_state: Arc<HeadlessAppState>,
+        cx: &mut App,
+    ) -> anyhow::Result<(Entity<Self>, channel::Receiver<anyhow::Result<()>>)> {
+        let env = None;
+        let project = Project::local(
+            app_state.client.clone(),
+            app_state.node_runtime.clone(),
+            app_state.user_store.clone(),
+            app_state.languages.clone(),
+            Arc::new(DapRegistry::default()),
+            app_state.fs.clone(),
+            env,
+            cx,
+        );
+
+        let tools = Arc::new(ToolWorkingSet::default());
+        let thread_store =
+            ThreadStore::new(project.clone(), tools, app_state.prompt_builder.clone(), cx)?;
+
+        let thread = thread_store.update(cx, |thread_store, cx| thread_store.create_thread(cx));
+
+        let (done_tx, done_rx) = channel::unbounded::<anyhow::Result<()>>();
+
+        let headless_thread = cx.new(move |cx| Self {
+            _subscription: cx.subscribe(&thread, Self::handle_thread_event),
+            thread,
+            project,
+            thread_store,
+            tool_use_counts: HashMap::default(),
+            done_tx,
+        });
+
+        Ok((headless_thread, done_rx))
+    }
+
+    fn handle_thread_event(
+        &mut self,
+        thread: Entity<Thread>,
+        event: &ThreadEvent,
+        cx: &mut Context<Self>,
+    ) {
+        match event {
+            ThreadEvent::ShowError(err) => self
+                .done_tx
+                .send_blocking(Err(anyhow!("{:?}", err)))
+                .unwrap(),
+            ThreadEvent::DoneStreaming => {
+                let thread = thread.read(cx);
+                if let Some(message) = thread.messages().last() {
+                    println!("Message: {}", message.to_string());
+                }
+                if thread.all_tools_finished() {
+                    self.done_tx.send_blocking(Ok(())).unwrap()
+                }
+            }
+            ThreadEvent::UsePendingTools => {
+                thread.update(cx, |thread, cx| {
+                    thread.use_pending_tools(cx);
+                });
+            }
+            ThreadEvent::ToolConfirmationNeeded => {
+                // Automatically approve all tools that need confirmation in headless mode
+                println!("Tool confirmation needed - automatically approving in headless mode");
+
+                // Get the tools needing confirmation
+                let tools_needing_confirmation: Vec<_> = thread
+                    .read(cx)
+                    .tools_needing_confirmation()
+                    .cloned()
+                    .collect();
+
+                // Run each tool that needs confirmation
+                for tool_use in tools_needing_confirmation {
+                    if let Some(tool) = thread.read(cx).tools().tool(&tool_use.name, cx) {
+                        thread.update(cx, |thread, cx| {
+                            println!("Auto-approving tool: {}", tool_use.name);
+
+                            // Create a request to send to the tool
+                            let request = thread.to_completion_request(RequestKind::Chat, cx);
+                            let messages = Arc::new(request.messages);
+
+                            // Run the tool
+                            thread.run_tool(
+                                tool_use.id.clone(),
+                                tool_use.ui_text.clone(),
+                                tool_use.input.clone(),
+                                &messages,
+                                tool,
+                                cx,
+                            );
+                        });
+                    }
+                }
+            }
+            ThreadEvent::ToolFinished {
+                tool_use_id,
+                pending_tool_use,
+                ..
+            } => {
+                if let Some(pending_tool_use) = pending_tool_use {
+                    println!(
+                        "Used tool {} with input: {}",
+                        pending_tool_use.name, pending_tool_use.input
+                    );
+                    *self
+                        .tool_use_counts
+                        .entry(pending_tool_use.name.clone())
+                        .or_insert(0) += 1;
+                }
+                if let Some(tool_result) = thread.read(cx).output_for_tool(tool_use_id) {
+                    println!("Tool result: {:?}", tool_result);
+                }
+                if thread.read(cx).all_tools_finished() {
+                    let model_registry = LanguageModelRegistry::read_global(cx);
+                    if let Some(model) = model_registry.default_model() {
+                        thread.update(cx, |thread, cx| {
+                            thread.attach_tool_results(cx);
+                            thread.send_to_model(model.model, RequestKind::Chat, cx);
+                        });
+                    } else {
+                        println!(
+                            "Warning: No active language model available to continue conversation"
+                        );
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+pub fn init(cx: &mut App) -> Arc<HeadlessAppState> {
+    release_channel::init(SemanticVersion::default(), cx);
+    gpui_tokio::init(cx);
+
+    let mut settings_store = SettingsStore::new(cx);
+    settings_store
+        .set_default_settings(settings::default_settings().as_ref(), cx)
+        .unwrap();
+    cx.set_global(settings_store);
+    client::init_settings(cx);
+    Project::init_settings(cx);
+
+    let client = Client::production(cx);
+    cx.set_http_client(client.http_client().clone());
+
+    let git_binary_path = None;
+    let fs = Arc::new(RealFs::new(
+        git_binary_path,
+        cx.background_executor().clone(),
+    ));
+
+    let languages = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
+
+    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
+
+    language::init(cx);
+    language_model::init(client.clone(), cx);
+    language_models::init(user_store.clone(), client.clone(), fs.clone(), cx);
+    assistant_tools::init(client.http_client().clone(), cx);
+    context_server::init(cx);
+    let stdout_is_a_pty = false;
+    let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
+    agent::init(fs.clone(), client.clone(), prompt_builder.clone(), cx);
+
+    Arc::new(HeadlessAppState {
+        languages,
+        client,
+        user_store,
+        fs,
+        node_runtime: NodeRuntime::unavailable(),
+        prompt_builder,
+    })
+}
+
+pub fn find_model(model_name: &str, cx: &App) -> anyhow::Result<Arc<dyn LanguageModel>> {
+    let model_registry = LanguageModelRegistry::read_global(cx);
+    let model = model_registry
+        .available_models(cx)
+        .find(|model| model.id().0 == model_name);
+
+    let Some(model) = model else {
+        return Err(anyhow!(
+            "No language model named {} was available. Available models: {}",
+            model_name,
+            model_registry
+                .available_models(cx)
+                .map(|model| model.id().0.clone())
+                .collect::<Vec<_>>()
+                .join(", ")
+        ));
+    };
+
+    Ok(model)
+}
+
+pub fn authenticate_model_provider(
+    provider_id: LanguageModelProviderId,
+    cx: &mut App,
+) -> Task<std::result::Result<(), AuthenticateError>> {
+    let model_registry = LanguageModelRegistry::read_global(cx);
+    let model_provider = model_registry.provider(&provider_id).unwrap();
+    model_provider.authenticate(cx)
+}
--- a/crates/agent_eval/src/main.rs
+++ b/crates/agent_eval/src/main.rs
@@ -0,0 +1,205 @@
+mod eval;
+mod get_exercise;
+mod git_commands;
+mod headless_assistant;
+
+use clap::Parser;
+use eval::{run_exercise_eval, save_eval_results};
+use futures::stream::{self, StreamExt};
+use get_exercise::{find_exercises, get_exercise_language, get_exercise_name};
+use git_commands::read_base_sha;
+use gpui::Application;
+use headless_assistant::{authenticate_model_provider, find_model};
+use language_model::LanguageModelRegistry;
+use reqwest_client::ReqwestClient;
+use std::{path::PathBuf, sync::Arc};
+
+#[derive(Parser, Debug)]
+#[command(
+    name = "agent_eval",
+    disable_version_flag = true,
+    before_help = "Tool eval runner"
+)]
+struct Args {
+    /// Match the names of evals to run.
+    #[arg(long)]
+    exercise_names: Vec<String>,
+    /// Runs all exercises, causes the exercise_names to be ignored.
+    #[arg(long)]
+    all: bool,
+    /// Supported language types to evaluate (default: internal).
+    /// Internal is data generated from the agent panel
+    #[arg(long, default_value = "internal")]
+    languages: String,
+    /// Name of the model (default: "claude-3-7-sonnet-latest")
+    #[arg(long, default_value = "claude-3-7-sonnet-latest")]
+    model_name: String,
+    /// Name of the editor model (default: value of `--model_name`).
+    #[arg(long)]
+    editor_model_name: Option<String>,
+    /// Number of evaluations to run concurrently (default: 3)
+    #[arg(short, long, default_value = "5")]
+    concurrency: usize,
+    /// Maximum number of exercises to evaluate per language
+    #[arg(long)]
+    max_exercises_per_language: Option<usize>,
+}
+
+fn main() {
+    env_logger::init();
+    let args = Args::parse();
+    let http_client = Arc::new(ReqwestClient::new());
+    let app = Application::headless().with_http_client(http_client.clone());
+
+    // Path to the zed-ace-framework repo
+    let framework_path = PathBuf::from("../zed-ace-framework")
+        .canonicalize()
+        .unwrap();
+
+    // Fix the 'languages' lifetime issue by creating owned Strings instead of slices
+    let languages: Vec<String> = args.languages.split(',').map(|s| s.to_string()).collect();
+
+    println!("Using zed-ace-framework at: {:?}", framework_path);
+    println!("Evaluating languages: {:?}", languages);
+
+    app.run(move |cx| {
+        let app_state = headless_assistant::init(cx);
+
+        let model = find_model(&args.model_name, cx).unwrap();
+        let editor_model = if let Some(model_name) = &args.editor_model_name {
+            find_model(model_name, cx).unwrap()
+        } else {
+            model.clone()
+        };
+
+        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+            registry.set_default_model(Some(model.clone()), cx);
+        });
+
+        let model_provider_id = model.provider_id();
+        let editor_model_provider_id = editor_model.provider_id();
+
+        let framework_path_clone = framework_path.clone();
+        let languages_clone = languages.clone();
+        let exercise_names = args.exercise_names.clone();
+        let all_flag = args.all;
+
+        cx.spawn(async move |cx| {
+            // Authenticate all model providers first
+            cx.update(|cx| authenticate_model_provider(model_provider_id.clone(), cx))
+                .unwrap()
+                .await
+                .unwrap();
+            cx.update(|cx| authenticate_model_provider(editor_model_provider_id.clone(), cx))
+                .unwrap()
+                .await
+                .unwrap();
+
+            println!("framework path: {}", framework_path_clone.display());
+
+            let base_sha = read_base_sha(&framework_path_clone).await.unwrap();
+
+            println!("base sha: {}", base_sha);
+
+            let all_exercises = find_exercises(
+                &framework_path_clone,
+                &languages_clone
+                    .iter()
+                    .map(|s| s.as_str())
+                    .collect::<Vec<_>>(),
+                args.max_exercises_per_language,
+            )
+            .unwrap();
+            println!("Found {} exercises total", all_exercises.len());
+
+            // Filter exercises if specific ones were requested
+            let exercises_to_run = if !exercise_names.is_empty() {
+                // If exercise names are specified, filter by them regardless of --all flag
+                all_exercises
+                    .into_iter()
+                    .filter(|path| {
+                        let name = get_exercise_name(path);
+                        exercise_names.iter().any(|filter| name.contains(filter))
+                    })
+                    .collect()
+            } else if all_flag {
+                // Only use all_flag if no exercise names are specified
+                all_exercises
+            } else {
+                // Default behavior (no filters)
+                all_exercises
+            };
+
+            println!("Will run {} exercises", exercises_to_run.len());
+
+            // Create exercise eval tasks - each exercise is a single task that will run templates sequentially
+            let exercise_tasks: Vec<_> = exercises_to_run
+                .into_iter()
+                .map(|exercise_path| {
+                    let exercise_name = get_exercise_name(&exercise_path);
+                    let model_clone = model.clone();
+                    let app_state_clone = app_state.clone();
+                    let base_sha_clone = base_sha.clone();
+                    let framework_path_clone = framework_path_clone.clone();
+                    let cx_clone = cx.clone();
+
+                    async move {
+                        println!("Processing exercise: {}", exercise_name);
+                        let mut exercise_results = Vec::new();
+
+                        match run_exercise_eval(
+                            exercise_path.clone(),
+                            model_clone.clone(),
+                            app_state_clone.clone(),
+                            base_sha_clone.clone(),
+                            framework_path_clone.clone(),
+                            cx_clone.clone(),
+                        )
+                        .await
+                        {
+                            Ok(result) => {
+                                println!("Completed {}", exercise_name);
+                                exercise_results.push(result);
+                            }
+                            Err(err) => {
+                                println!("Error running {}: {}", exercise_name, err);
+                            }
+                        }
+
+                        // Save results for this exercise
+                        if !exercise_results.is_empty() {
+                            if let Err(err) =
+                                save_eval_results(&exercise_path, exercise_results.clone()).await
+                            {
+                                println!("Error saving results for {}: {}", exercise_name, err);
+                            } else {
+                                println!("Saved results for {}", exercise_name);
+                            }
+                        }
+
+                        exercise_results
+                    }
+                })
+                .collect();
+
+            println!(
+                "Running {} exercises with concurrency: {}",
+                exercise_tasks.len(),
+                args.concurrency
+            );
+
+            // Run exercises concurrently, with each exercise running its templates sequentially
+            let all_results = stream::iter(exercise_tasks)
+                .buffer_unordered(args.concurrency)
+                .flat_map(stream::iter)
+                .collect::<Vec<_>>()
+                .await;
+
+            println!("Completed {} evaluation runs", all_results.len());
+            cx.update(|cx| cx.quit()).unwrap();
+        })
+        .detach();
+    });
+
+    println!("Done running evals");
+}
--- a/crates/agent_rules/Cargo.toml
+++ b/crates/agent_rules/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "agent_rules"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/agent_rules.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+fs.workspace = true
+gpui.workspace = true
+prompt_store.workspace = true
+util.workspace = true
+worktree.workspace = true
+workspace-hack = { version = "0.1", path = "../../tooling/workspace-hack" }
+
+[dev-dependencies]
+indoc.workspace = true
--- a/crates/agent_rules/LICENSE-GPL
+++ b/crates/agent_rules/LICENSE-GPL
--- a/crates/agent_rules/src/agent_rules.rs
+++ b/crates/agent_rules/src/agent_rules.rs
@@ -0,0 +1,51 @@
+use std::sync::Arc;
+
+use anyhow::{Context as _, Result};
+use fs::Fs;
+use gpui::{App, AppContext, Task};
+use prompt_store::SystemPromptRulesFile;
+use util::maybe;
+use worktree::Worktree;
+
+const RULES_FILE_NAMES: [&'static str; 6] = [
+    ".rules",
+    ".cursorrules",
+    ".windsurfrules",
+    ".clinerules",
+    ".github/copilot-instructions.md",
+    "CLAUDE.md",
+];
+
+pub fn load_worktree_rules_file(
+    fs: Arc<dyn Fs>,
+    worktree: &Worktree,
+    cx: &App,
+) -> Option<Task<Result<SystemPromptRulesFile>>> {
+    let selected_rules_file = RULES_FILE_NAMES
+        .into_iter()
+        .filter_map(|name| {
+            worktree
+                .entry_for_path(name)
+                .filter(|entry| entry.is_file())
+                .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, abs_path)| {
+        let fs = fs.clone();
+        cx.background_spawn(maybe!(async move {
+            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(SystemPromptRulesFile {
+                path_in_worktree,
+                abs_path: abs_path.into(),
+                text: text.trim().to_string(),
+            })
+        }))
+    })
+}
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -25,4 +25,5 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
+util.workspace = true
 workspace-hack.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -10,6 +10,7 @@ use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
 use strum::{EnumIter, EnumString};
 use thiserror::Error;
+use util::ResultExt as _;

 pub use supported_countries::*;

@@ -36,9 +37,9 @@ pub enum AnthropicModelMode {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
+    #[default]
    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
    Claude3_5Sonnet,
-    #[default]
    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
    Claude3_7Sonnet,
    #[serde(
@@ -362,25 +363,11 @@ pub struct RateLimitInfo {

 impl RateLimitInfo {
    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Self {
-        // Check if any rate limit headers exist
-        let has_rate_limit_headers = headers
-            .keys()
-            .any(|k| k.as_str().starts_with("anthropic-ratelimit-"));
-
-        if !has_rate_limit_headers {
-            return Self {
-                requests: None,
-                tokens: None,
-                input_tokens: None,
-                output_tokens: None,
-            };
-        }
-
        Self {
-            requests: RateLimit::from_headers("requests", headers).ok(),
-            tokens: RateLimit::from_headers("tokens", headers).ok(),
-            input_tokens: RateLimit::from_headers("input-tokens", headers).ok(),
-            output_tokens: RateLimit::from_headers("output-tokens", headers).ok(),
+            requests: RateLimit::from_headers("requests", headers).log_err(),
+            tokens: RateLimit::from_headers("tokens", headers).log_err(),
+            input_tokens: RateLimit::from_headers("input-tokens", headers).log_err(),
+            output_tokens: RateLimit::from_headers("output-tokens", headers).log_err(),
        }
    }
 }
@@ -737,54 +724,4 @@ impl ApiError {
    pub fn is_rate_limit_error(&self) -> bool {
        matches!(self.error_type.as_str(), "rate_limit_error")
    }
-
-    pub fn match_window_exceeded(&self) -> Option<usize> {
-        let Some(ApiErrorCode::InvalidRequestError) = self.code() else {
-            return None;
-        };
-
-        parse_prompt_too_long(&self.message)
-    }
-}
-
-pub fn parse_prompt_too_long(message: &str) -> Option<usize> {
-    message
-        .strip_prefix("prompt is too long: ")?
-        .split_once(" tokens")?
-        .0
-        .parse::<usize>()
-        .ok()
-}
-
-#[test]
-fn test_match_window_exceeded() {
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: 220000 tokens > 200000".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), Some(220_000));
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: 1234953 tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), Some(1234953));
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "not a prompt length error".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
-
-    let error = ApiError {
-        error_type: "rate_limit_error".to_string(),
-        message: "prompt is too long: 12345 tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: invalid tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
 }
--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -69,7 +69,7 @@ pub enum AssistantProviderContentV1 {
    },
 }

-#[derive(Clone, Debug, Default)]
+#[derive(Debug, Default)]
 pub struct AssistantSettings {
    pub enabled: bool,
    pub button: bool,
@@ -742,7 +742,7 @@ mod tests {
                AssistantSettings::get_global(cx).default_model,
                LanguageModelSelection {
                    provider: "zed.dev".into(),
-                    model: "claude-3-7-sonnet-latest".into(),
+                    model: "claude-3-5-sonnet-latest".into(),
                }
            );
        });
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -4,7 +4,7 @@ use collections::BTreeMap;
 use futures::{StreamExt, channel::mpsc};
 use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
 use language::{Anchor, Buffer, BufferEvent, DiskState, Point};
-use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
+use project::{Project, ProjectItem};
 use std::{cmp, ops::Range, sync::Arc};
 use text::{Edit, Patch, Rope};
 use util::RangeExt;
@@ -49,10 +49,6 @@ impl ActionLog {
            .tracked_buffers
            .entry(buffer.clone())
            .or_insert_with(|| {
-                let open_lsp_handle = self.project.update(cx, |project, cx| {
-                    project.register_buffer_with_language_servers(&buffer, cx)
-                });
-
                let text_snapshot = buffer.read(cx).text_snapshot();
                let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
                let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
@@ -80,7 +76,6 @@ impl ActionLog {
                    version: buffer.read(cx).version(),
                    diff,
                    diff_update: diff_update_tx,
-                    _open_lsp_handle: open_lsp_handle,
                    _maintain_diff: cx.spawn({
                        let buffer = buffer.clone();
                        async move |this, cx| {
@@ -240,7 +235,7 @@ impl ActionLog {
                    .await;

                diff.update(cx, |diff, cx| {
-                    diff.set_snapshot(diff_snapshot, &buffer_snapshot, cx)
+                    diff.set_snapshot(diff_snapshot, &buffer_snapshot, None, cx)
                })?;
            }
            this.update(cx, |this, cx| {
@@ -620,7 +615,6 @@ struct TrackedBuffer {
    diff: Entity<BufferDiff>,
    snapshot: text::BufferSnapshot,
    diff_update: mpsc::UnboundedSender<(ChangeAuthor, text::BufferSnapshot)>,
-    _open_lsp_handle: OpenLspBufferHandle,
    _maintain_diff: Task<()>,
    _subscription: Subscription,
 }
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -1,6 +1,5 @@
 mod action_log;
 mod tool_registry;
-mod tool_schema;
 mod tool_working_set;

 use std::fmt;
@@ -9,7 +8,7 @@ use std::fmt::Formatter;
 use std::sync::Arc;

 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{AnyView, App, Entity, SharedString, Task};
 use icons::IconName;
 use language_model::LanguageModelRequestMessage;
 use language_model::LanguageModelToolSchemaFormat;
@@ -17,23 +16,25 @@ use project::Project;

 pub use crate::action_log::*;
 pub use crate::tool_registry::*;
-pub use crate::tool_schema::*;
 pub use crate::tool_working_set::*;

 pub fn init(cx: &mut App) {
    ToolRegistry::default_global(cx);
 }

-/// The result of running a tool
+/// The result of running a tool, containing both the asynchronous output
+/// and an optional card view that can be rendered immediately.
 pub struct ToolResult {
    /// The asynchronous task that will eventually resolve to the tool's output
    pub output: Task<Result<String>>,
+    /// An optional view to present the output of the tool.
+    pub card: Option<AnyView>,
 }

 impl From<Task<Result<String>>> for ToolResult {
-    /// Convert from a task to a ToolResult
+    /// Convert from a task to a ToolResult with no card
    fn from(output: Task<Result<String>>) -> Self {
-        Self { output }
+        Self { output, card: None }
    }
 }

@@ -66,8 +67,8 @@ pub trait Tool: 'static + Send + Sync {
    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool;

    /// Returns the JSON schema that describes the tool's input.
-    fn input_schema(&self, _: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        Ok(serde_json::Value::Object(serde_json::Map::default()))
+    fn input_schema(&self, _: LanguageModelToolSchemaFormat) -> serde_json::Value {
+        serde_json::Value::Object(serde_json::Map::default())
    }

    /// Returns markdown to be displayed in the UI for this tool.
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -1,236 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-use crate::LanguageModelToolSchemaFormat;
-
-/// Tries to adapt a JSON schema representation to be compatible with the specified format.
-///
-/// If the json cannot be made compatible with the specified format, an error is returned.
-pub fn adapt_schema_to_format(
-    json: &mut Value,
-    format: LanguageModelToolSchemaFormat,
-) -> Result<()> {
-    match format {
-        LanguageModelToolSchemaFormat::JsonSchema => Ok(()),
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
-    }
-}
-
-/// Tries to adapt the json schema so that it is compatible with https://ai.google.dev/api/caching#Schema
-fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
-    if let Value::Object(obj) = json {
-        const UNSUPPORTED_KEYS: [&str; 4] = ["if", "then", "else", "$ref"];
-
-        for key in UNSUPPORTED_KEYS {
-            if obj.contains_key(key) {
-                return Err(anyhow::anyhow!(
-                    "Schema cannot be made compatible because it contains \"{}\" ",
-                    key
-                ));
-            }
-        }
-
-        const KEYS_TO_REMOVE: [&str; 2] = ["format", "$schema"];
-        for key in KEYS_TO_REMOVE {
-            obj.remove(key);
-        }
-
-        if let Some(default) = obj.get("default") {
-            let is_null = default.is_null();
-            // Default is not supported, so we need to remove it
-            obj.remove("default");
-            if is_null {
-                obj.insert("nullable".to_string(), Value::Bool(true));
-            }
-        }
-
-        // If a type is not specified for an input parameter, add a default type
-        if obj.contains_key("description")
-            && !obj.contains_key("type")
-            && !(obj.contains_key("anyOf")
-                || obj.contains_key("oneOf")
-                || obj.contains_key("allOf"))
-        {
-            obj.insert("type".to_string(), Value::String("string".to_string()));
-        }
-
-        // Handle oneOf -> anyOf conversion
-        if let Some(subschemas) = obj.get_mut("oneOf") {
-            if subschemas.is_array() {
-                let subschemas_clone = subschemas.clone();
-                obj.remove("oneOf");
-                obj.insert("anyOf".to_string(), subschemas_clone);
-            }
-        }
-
-        // Recursively process all nested objects and arrays
-        for (_, value) in obj.iter_mut() {
-            if let Value::Object(_) | Value::Array(_) = value {
-                adapt_to_json_schema_subset(value)?;
-            }
-        }
-    } else if let Value::Array(arr) = json {
-        for item in arr.iter_mut() {
-            adapt_to_json_schema_subset(item)?;
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn test_transform_default_null_to_nullable() {
-        let mut json = json!({
-            "description": "A test field",
-            "type": "string",
-            "default": null
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "string",
-                "nullable": true
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_adds_type_when_missing() {
-        let mut json = json!({
-            "description": "A test field without type"
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field without type",
-                "type": "string"
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_removes_format() {
-        let mut json = json!({
-            "description": "A test field",
-            "type": "integer",
-            "format": "uint32"
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "integer"
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_one_of_to_any_of() {
-        let mut json = json!({
-            "description": "A test field",
-            "oneOf": [
-                { "type": "string" },
-                { "type": "integer" }
-            ]
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "anyOf": [
-                    { "type": "string" },
-                    { "type": "integer" }
-                ]
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_nested_objects() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "nested": {
-                    "oneOf": [
-                        { "type": "string" },
-                        { "type": "null" }
-                    ],
-                    "format": "email"
-                }
-            }
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "nested": {
-                        "anyOf": [
-                            { "type": "string" },
-                            { "type": "null" }
-                        ]
-                    }
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_fails_if_unsupported_keys_exist() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "$ref": "#/definitions/User",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "if": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "then": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "else": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-    }
-}
--- a/crates/assistant_tool/src/tool_working_set.rs
+++ b/crates/assistant_tool/src/tool_working_set.rs
@@ -1,7 +1,8 @@
 use std::sync::Arc;

 use collections::{HashMap, HashSet, IndexMap};
-use gpui::{App, Context, EventEmitter};
+use gpui::App;
+use parking_lot::Mutex;

 use crate::{Tool, ToolRegistry, ToolSource};

@@ -11,6 +12,11 @@ pub struct ToolId(usize);
 /// A working set of tools for use in one instance of the Assistant Panel.
 #[derive(Default)]
 pub struct ToolWorkingSet {
+    state: Mutex<WorkingSetState>,
+}
+
+#[derive(Default)]
+struct WorkingSetState {
    context_server_tools_by_id: HashMap<ToolId, Arc<dyn Tool>>,
    context_server_tools_by_name: HashMap<String, Arc<dyn Tool>>,
    enabled_sources: HashSet<ToolSource>,
@@ -18,27 +24,99 @@ pub struct ToolWorkingSet {
    next_tool_id: ToolId,
 }

-pub enum ToolWorkingSetEvent {
-    EnabledToolsChanged,
-}
-
-impl EventEmitter<ToolWorkingSetEvent> for ToolWorkingSet {}
-
 impl ToolWorkingSet {
    pub fn tool(&self, name: &str, cx: &App) -> Option<Arc<dyn Tool>> {
-        self.context_server_tools_by_name
+        self.state
+            .lock()
+            .context_server_tools_by_name
            .get(name)
            .cloned()
            .or_else(|| ToolRegistry::global(cx).tool(name))
    }

    pub fn tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        let mut tools = ToolRegistry::global(cx).tools();
-        tools.extend(self.context_server_tools_by_id.values().cloned());
-        tools
+        self.state.lock().tools(cx)
    }

    pub fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
+        self.state.lock().tools_by_source(cx)
+    }
+
+    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+        self.state.lock().enabled_tools(cx)
+    }
+
+    pub fn disable_all_tools(&self) {
+        let mut state = self.state.lock();
+        state.disable_all_tools();
+    }
+
+    pub fn enable_source(&self, source: ToolSource, cx: &App) {
+        let mut state = self.state.lock();
+        state.enable_source(source, cx);
+    }
+
+    pub fn disable_source(&self, source: &ToolSource) {
+        let mut state = self.state.lock();
+        state.disable_source(source);
+    }
+
+    pub fn insert(&self, tool: Arc<dyn Tool>) -> ToolId {
+        let mut state = self.state.lock();
+        let tool_id = state.next_tool_id;
+        state.next_tool_id.0 += 1;
+        state
+            .context_server_tools_by_id
+            .insert(tool_id, tool.clone());
+        state.tools_changed();
+        tool_id
+    }
+
+    pub fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        self.state.lock().is_enabled(source, name)
+    }
+
+    pub fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        self.state.lock().is_disabled(source, name)
+    }
+
+    pub fn enable(&self, source: ToolSource, tools_to_enable: &[Arc<str>]) {
+        let mut state = self.state.lock();
+        state.enable(source, tools_to_enable);
+    }
+
+    pub fn disable(&self, source: ToolSource, tools_to_disable: &[Arc<str>]) {
+        let mut state = self.state.lock();
+        state.disable(source, tools_to_disable);
+    }
+
+    pub fn remove(&self, tool_ids_to_remove: &[ToolId]) {
+        let mut state = self.state.lock();
+        state
+            .context_server_tools_by_id
+            .retain(|id, _| !tool_ids_to_remove.contains(id));
+        state.tools_changed();
+    }
+}
+
+impl WorkingSetState {
+    fn tools_changed(&mut self) {
+        self.context_server_tools_by_name.clear();
+        self.context_server_tools_by_name.extend(
+            self.context_server_tools_by_id
+                .values()
+                .map(|tool| (tool.name(), tool.clone())),
+        );
+    }
+
+    fn tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+        let mut tools = ToolRegistry::global(cx).tools();
+        tools.extend(self.context_server_tools_by_id.values().cloned());
+
+        tools
+    }
+
+    fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
        let mut tools_by_source = IndexMap::default();

        for tool in self.tools(cx) {
@@ -57,7 +135,7 @@ impl ToolWorkingSet {
        tools_by_source
    }

-    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
+    fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
        let all_tools = self.tools(cx);

        all_tools
@@ -66,12 +144,31 @@ impl ToolWorkingSet {
            .collect()
    }

-    pub fn disable_all_tools(&mut self, cx: &mut Context<Self>) {
-        self.enabled_tools_by_source.clear();
-        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
+    fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        self.enabled_tools_by_source
+            .get(source)
+            .map_or(false, |enabled_tools| enabled_tools.contains(name))
    }

-    pub fn enable_source(&mut self, source: ToolSource, cx: &mut Context<Self>) {
+    fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
+        !self.is_enabled(source, name)
+    }
+
+    fn enable(&mut self, source: ToolSource, tools_to_enable: &[Arc<str>]) {
+        self.enabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .extend(tools_to_enable.into_iter().cloned());
+    }
+
+    fn disable(&mut self, source: ToolSource, tools_to_disable: &[Arc<str>]) {
+        self.enabled_tools_by_source
+            .entry(source)
+            .or_default()
+            .retain(|name| !tools_to_disable.contains(name));
+    }
+
+    fn enable_source(&mut self, source: ToolSource, cx: &App) {
        self.enabled_sources.insert(source.clone());

        let tools_by_source = self.tools_by_source(cx);
@@ -84,72 +181,14 @@ impl ToolWorkingSet {
                    .collect::<HashSet<_>>(),
            );
        }
-        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
    }

-    pub fn disable_source(&mut self, source: &ToolSource, cx: &mut Context<Self>) {
+    fn disable_source(&mut self, source: &ToolSource) {
        self.enabled_sources.remove(source);
        self.enabled_tools_by_source.remove(source);
-        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
    }

-    pub fn insert(&mut self, tool: Arc<dyn Tool>) -> ToolId {
-        let tool_id = self.next_tool_id;
-        self.next_tool_id.0 += 1;
-        self.context_server_tools_by_id
-            .insert(tool_id, tool.clone());
-        self.tools_changed();
-        tool_id
-    }
-
-    pub fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        self.enabled_tools_by_source
-            .get(source)
-            .map_or(false, |enabled_tools| enabled_tools.contains(name))
-    }
-
-    pub fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        !self.is_enabled(source, name)
-    }
-
-    pub fn enable(
-        &mut self,
-        source: ToolSource,
-        tools_to_enable: &[Arc<str>],
-        cx: &mut Context<Self>,
-    ) {
-        self.enabled_tools_by_source
-            .entry(source)
-            .or_default()
-            .extend(tools_to_enable.into_iter().cloned());
-        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
-    }
-
-    pub fn disable(
-        &mut self,
-        source: ToolSource,
-        tools_to_disable: &[Arc<str>],
-        cx: &mut Context<Self>,
-    ) {
-        self.enabled_tools_by_source
-            .entry(source)
-            .or_default()
-            .retain(|name| !tools_to_disable.contains(name));
-        cx.emit(ToolWorkingSetEvent::EnabledToolsChanged);
-    }
-
-    pub fn remove(&mut self, tool_ids_to_remove: &[ToolId]) {
-        self.context_server_tools_by_id
-            .retain(|id, _| !tool_ids_to_remove.contains(id));
-        self.tools_changed();
-    }
-
-    fn tools_changed(&mut self) {
-        self.context_server_tools_by_name.clear();
-        self.context_server_tools_by_name.extend(
-            self.context_server_tools_by_id
-                .values()
-                .map(|tool| (tool.name(), tool.clone())),
-        );
+    fn disable_all_tools(&mut self) {
+        self.enabled_tools_by_source.clear();
    }
 }
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -40,6 +40,5 @@ gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-settings = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,14 +1,13 @@
+mod bash_tool;
 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_file_tool;
 mod fetch_tool;
+mod find_replace_file_tool;
 mod list_directory_tool;
 mod move_path_tool;
 mod now_tool;
@@ -16,11 +15,9 @@ mod open_tool;
 mod path_search_tool;
 mod read_file_tool;
 mod regex_search_tool;
-mod rename_tool;
 mod replace;
 mod schema;
 mod symbol_info_tool;
-mod terminal_tool;
 mod thinking_tool;

 use std::sync::Arc;
@@ -31,90 +28,45 @@ use gpui::App;
 use http_client::HttpClientWithUrl;
 use move_path_tool::MovePathTool;

+use crate::bash_tool::BashTool;
 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_replace_file_tool::FindReplaceFileTool;
 use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
 use crate::open_tool::OpenTool;
 use crate::path_search_tool::PathSearchTool;
 use crate::read_file_tool::ReadFileTool;
 use crate::regex_search_tool::RegexSearchTool;
-use crate::rename_tool::RenameTool;
 use crate::symbol_info_tool::SymbolInfoTool;
-use crate::terminal_tool::TerminalTool;
 use crate::thinking_tool::ThinkingTool;

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

    let registry = ToolRegistry::global(cx);
-    registry.register_tool(TerminalTool);
+    registry.register_tool(BashTool);
    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(FindReplaceFileTool);
    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(CodeSymbolsTool);
-    registry.register_tool(ContentsTool);
    registry.register_tool(PathSearchTool);
    registry.register_tool(ReadFileTool);
    registry.register_tool(RegexSearchTool);
-    registry.register_tool(RenameTool);
    registry.register_tool(ThinkingTool);
    registry.register_tool(FetchTool::new(http_client));
 }
-
-#[cfg(test)]
-mod tests {
-    use http_client::FakeHttpClient;
-
-    use super::*;
-
-    #[gpui::test]
-    fn test_builtin_tool_schema_compatibility(cx: &mut App) {
-        crate::init(
-            Arc::new(http_client::HttpClientWithUrl::new(
-                FakeHttpClient::with_200_response(),
-                "https://zed.dev",
-                None,
-            )),
-            cx,
-        );
-
-        for tool in ToolRegistry::global(cx).tools() {
-            let actual_schema = tool
-                .input_schema(language_model::LanguageModelToolSchemaFormat::JsonSchemaSubset)
-                .unwrap();
-            let mut expected_schema = actual_schema.clone();
-            assistant_tool::adapt_schema_to_format(
-                &mut expected_schema,
-                language_model::LanguageModelToolSchemaFormat::JsonSchemaSubset,
-            )
-            .unwrap();
-
-            let error_message = format!(
-                "Tool schema for `{}` is not compatible with `language_model::LanguageModelToolSchemaFormat::JsonSchemaSubset` (Gemini Models).\n\
-                Are you using `schema::json_schema_for<T>(format)` to generate the schema?",
-                tool.name(),
-            );
-
-            assert_eq!(actual_schema, expected_schema, "{}", error_message)
-        }
-    }
-}
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -2,15 +2,12 @@ use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::io::BufReader;
-use futures::{AsyncBufReadExt, AsyncReadExt, FutureExt};
+use futures::{AsyncBufReadExt, AsyncReadExt};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::future;
-use util::get_system_shell;
-
 use std::path::Path;
 use std::sync::Arc;
 use ui::IconName;
@@ -18,18 +15,18 @@ use util::command::new_smol_command;
 use util::markdown::MarkdownString;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct TerminalToolInput {
-    /// The one-liner command to execute.
+pub struct BashToolInput {
+    /// The bash one-liner command to execute.
    command: String,
    /// Working directory for the command. This must be one of the root directories of the project.
    cd: String,
 }

-pub struct TerminalTool;
+pub struct BashTool;

-impl Tool for TerminalTool {
+impl Tool for BashTool {
    fn name(&self) -> String {
-        "terminal".to_string()
+        "bash".to_string()
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
@@ -37,19 +34,19 @@ impl Tool for TerminalTool {
    }

    fn description(&self) -> String {
-        include_str!("./terminal_tool/description.md").to_string()
+        include_str!("./bash_tool/description.md").to_string()
    }

    fn icon(&self) -> IconName {
        IconName::Terminal
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<TerminalToolInput>(format)
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
+        json_schema_for::<BashToolInput>(format)
    }

    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<TerminalToolInput>(input.clone()) {
+        match serde_json::from_value::<BashToolInput>(input.clone()) {
            Ok(input) => {
                let mut lines = input.command.lines();
                let first_line = lines.next().unwrap_or_default();
@@ -68,7 +65,7 @@ impl Tool for TerminalTool {
                    }
                }
            }
-            Err(_) => "Run terminal command".to_string(),
+            Err(_) => "Run bash command".to_string(),
        }
    }

@@ -80,7 +77,7 @@ impl Tool for TerminalTool {
        _action_log: Entity<ActionLog>,
        cx: &mut App,
    ) -> ToolResult {
-        let input: TerminalToolInput = match serde_json::from_value(input) {
+        let input: BashToolInput = match serde_json::from_value(input) {
            Ok(input) => input,
            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
        };
@@ -138,87 +135,67 @@ impl Tool for TerminalTool {
 const LIMIT: usize = 16 * 1024;

 async fn run_command_limited(working_dir: Arc<Path>, command: String) -> Result<String> {
-    let shell = get_system_shell();
+    // Add 2>&1 to merge stderr into stdout for proper interleaving.
+    let command = format!("({}) 2>&1", command);

-    let mut cmd = new_smol_command(&shell)
+    let mut cmd = new_smol_command("bash")
        .arg("-c")
        .arg(&command)
        .current_dir(working_dir)
        .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
        .spawn()
-        .context("Failed to execute terminal command")?;
+        .context("Failed to execute bash command")?;

-    let mut combined_buffer = String::with_capacity(LIMIT + 1);
+    // Capture stdout with a limit
+    let stdout = cmd.stdout.take().unwrap();
+    let mut reader = BufReader::new(stdout);

-    let mut out_reader = BufReader::new(cmd.stdout.take().context("Failed to get stdout")?);
-    let mut out_tmp_buffer = String::with_capacity(512);
-    let mut err_reader = BufReader::new(cmd.stderr.take().context("Failed to get stderr")?);
-    let mut err_tmp_buffer = String::with_capacity(512);
+    // Read one more byte to determine whether the output was truncated
+    let mut buffer = vec![0; LIMIT + 1];
+    let mut bytes_read = 0;

-    let mut out_line = Box::pin(
-        out_reader
-            .read_line(&mut out_tmp_buffer)
-            .left_future()
-            .fuse(),
-    );
-    let mut err_line = Box::pin(
-        err_reader
-            .read_line(&mut err_tmp_buffer)
-            .left_future()
-            .fuse(),
-    );
+    // Read until we reach the limit
+    loop {
+        let read = reader.read(&mut buffer[bytes_read..]).await?;
+        if read == 0 {
+            break;
+        }

-    let mut has_stdout = true;
-    let mut has_stderr = true;
-    while (has_stdout || has_stderr) && combined_buffer.len() < LIMIT + 1 {
-        futures::select_biased! {
-            read = out_line => {
-                drop(out_line);
-                combined_buffer.extend(out_tmp_buffer.drain(..));
-                if read? == 0 {
-                    out_line = Box::pin(future::pending().right_future().fuse());
-                    has_stdout = false;
-                } else {
-                    out_line = Box::pin(out_reader.read_line(&mut out_tmp_buffer).left_future().fuse());
-                }
-            }
-            read = err_line => {
-                drop(err_line);
-                combined_buffer.extend(err_tmp_buffer.drain(..));
-                if read? == 0 {
-                    err_line = Box::pin(future::pending().right_future().fuse());
-                    has_stderr = false;
-                } else {
-                    err_line = Box::pin(err_reader.read_line(&mut err_tmp_buffer).left_future().fuse());
-                }
-            }
-        };
+        bytes_read += read;
+        if bytes_read > LIMIT {
+            bytes_read = LIMIT + 1;
+            break;
+        }
    }

-    drop((out_line, err_line));
+    // Repeatedly fill the output reader's buffer without copying it.
+    loop {
+        let skipped_bytes = reader.fill_buf().await?;
+        if skipped_bytes.is_empty() {
+            break;
+        }
+        let skipped_bytes_len = skipped_bytes.len();
+        reader.consume_unpin(skipped_bytes_len);
+    }

-    let truncated = combined_buffer.len() > LIMIT;
-    combined_buffer.truncate(LIMIT);
-
-    consume_reader(out_reader, truncated).await?;
-    consume_reader(err_reader, truncated).await?;
+    let output_bytes = &buffer[..bytes_read.min(LIMIT)];

    let status = cmd.status().await.context("Failed to get command status")?;

-    let output_string = if truncated {
+    let output_string = if bytes_read > LIMIT {
        // Valid to find `\n` in UTF-8 since 0-127 ASCII characters are not used in
        // multi-byte characters.
-        let last_line_ix = combined_buffer.bytes().rposition(|b| b == b'\n');
-        let combined_buffer = &combined_buffer[..last_line_ix.unwrap_or(combined_buffer.len())];
+        let last_line_ix = output_bytes.iter().rposition(|b| *b == b'\n');
+        let until_last_line = &output_bytes[..last_line_ix.unwrap_or(output_bytes.len())];
+        let output_string = String::from_utf8_lossy(until_last_line);

        format!(
            "Command output too long. The first {} bytes:\n\n{}",
-            combined_buffer.len(),
-            output_block(&combined_buffer),
+            output_string.len(),
+            output_block(&output_string),
        )
    } else {
-        output_block(&combined_buffer)
+        output_block(&String::from_utf8_lossy(&output_bytes))
    };

    let output_with_status = if status.success() {
@@ -229,9 +206,8 @@ async fn run_command_limited(working_dir: Arc<Path>, command: String) -> Result<
        }
    } else {
        format!(
-            "Command failed with exit code {} (shell: {}).\n\n{}",
+            "Command failed with exit code {}\n\n{}",
            status.code().unwrap_or(-1),
-            shell,
            output_string,
        )
    };
@@ -239,24 +215,6 @@ async fn run_command_limited(working_dir: Arc<Path>, command: String) -> Result<
    Ok(output_with_status)
 }

-async fn consume_reader<T: AsyncReadExt + Unpin>(
-    mut reader: BufReader<T>,
-    truncated: bool,
-) -> Result<(), std::io::Error> {
-    loop {
-        let skipped_bytes = reader.fill_buf().await?;
-        if skipped_bytes.is_empty() {
-            break;
-        }
-        let skipped_bytes_len = skipped_bytes.len();
-        reader.consume_unpin(skipped_bytes_len);
-
-        // Should only skip if we went over the limit
-        debug_assert!(truncated);
-    }
-    Ok(())
-}
-
 fn output_block(output: &str) -> String {
    format!(
        "```\n{}{}```",
@@ -272,7 +230,7 @@ mod tests {

    use super::*;

-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
    async fn test_run_command_simple(cx: &mut TestAppContext) {
        cx.executor().allow_parking();

@@ -283,11 +241,12 @@ mod tests {
        assert_eq!(result.unwrap(), "```\nHello, World!\n```");
    }

-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
    async fn test_interleaved_stdout_stderr(cx: &mut TestAppContext) {
        cx.executor().allow_parking();

-        let command = "echo 'stdout 1' && sleep 0.01 && echo 'stderr 1' >&2 && sleep 0.01 && echo 'stdout 2' && sleep 0.01 && echo 'stderr 2' >&2";
+        let command =
+            "echo 'stdout 1' && echo 'stderr 1' >&2 && echo 'stdout 2' && echo 'stderr 2' >&2";
        let result = run_command_limited(Path::new(".").into(), command.to_string()).await;

        assert!(result.is_ok());
@@ -297,7 +256,7 @@ mod tests {
        );
    }

-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
    async fn test_multiple_output_reads(cx: &mut TestAppContext) {
        cx.executor().allow_parking();

@@ -312,11 +271,11 @@ mod tests {
        assert_eq!(result.unwrap(), "```\n1\n2\n3\n```");
    }

-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
    async fn test_output_truncation_single_line(cx: &mut TestAppContext) {
        cx.executor().allow_parking();

-        let cmd = format!("echo '{}'; sleep 0.01;", "X".repeat(LIMIT * 2));
+        let cmd = format!("echo '{}';", "X".repeat(LIMIT * 2));

        let result = run_command_limited(Path::new(".").into(), cmd).await;

@@ -331,7 +290,7 @@ mod tests {
        assert_eq!(content_length, LIMIT);
    }

-    #[gpui::test(iterations = 10)]
+    #[gpui::test]
    async fn test_output_truncation_multiline(cx: &mut TestAppContext) {
        cx.executor().allow_parking();

@@ -349,23 +308,4 @@ mod tests {

        assert!(content_length <= LIMIT);
    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_command_failure(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let result = run_command_limited(Path::new(".").into(), "exit 42".to_string()).await;
-
-        assert!(result.is_ok());
-        let output = result.unwrap();
-
-        // Extract the shell name from path for cleaner test output
-        let shell_path = std::env::var("SHELL").unwrap_or("bash".to_string());
-
-        let expected_output = format!(
-            "Command failed with exit code 42 (shell: {}).\n\n```\n\n```",
-            shell_path
-        );
-        assert_eq!(output, expected_output);
-    }
 }
--- a/crates/assistant_tools/src/bash_tool/description.md
+++ b/crates/assistant_tools/src/bash_tool/description.md
@@ -0,0 +1,7 @@
+Executes a bash one-liner and returns the combined output.
+
+This tool spawns a bash process, combines stdout and stderr into one interleaved stream as they are produced (preserving the order of writes), and captures that stream into a string which is returned.
+
+Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
+
+Remember that each invocation of this tool will spawn a new bash process, so you can't rely on any state from previous invocations.
--- a/crates/assistant_tools/src/batch_tool.rs
+++ b/crates/assistant_tools/src/batch_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult, ToolWorkingSet};
 use futures::future::join_all;
 use gpui::{App, AppContext, Entity, Task};
@@ -172,7 +172,7 @@ impl Tool for BatchTool {
        IconName::Cog
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<BatchToolInput>(format)
    }

@@ -305,7 +305,6 @@ impl Tool for BatchTool {
            }

            Ok(formatted_results.trim().to_string())
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/code_action_tool.rs
+++ b/crates/assistant_tools/src/code_action_tool.rs
@@ -1,387 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, Tool, ToolResult};
-use gpui::{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>,
-        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.buffer_read(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_action_tool/description.md
+++ b/crates/assistant_tools/src/code_action_tool/description.md
@@ -1,19 +0,0 @@
-A tool for applying code actions to specific sections of your code. It uses language servers to provide refactoring capabilities similar to what you'd find in an IDE.
-
-This tool can:
- List all available code actions for a selected text range
- Execute a specific code action on that range
- Rename symbols across your codebase. This tool is the preferred way to rename things, and you should always prefer to rename code symbols using this tool rather than using textual find/replace when both are available.
-
-Use this tool when you want to:
- Discover what code actions are available for a piece of code
- Apply automatic fixes and code transformations
- Rename variables, functions, or other symbols consistently throughout your project
- Clean up imports, implement interfaces, or perform other language-specific operations
-
- If unsure what actions are available, call the tool without specifying an action to get a list
- For common operations, you can directly specify actions like "quickfix.all" or "source.organizeImports"
- For renaming, use the special "textDocument/rename" action and provide the new name in the arguments field
- Be specific with your text range and context to ensure the tool identifies the correct code location
-
-The tool will automatically save any changes it makes to your files.
--- a/crates/assistant_tools/src/code_symbols_tool.rs
+++ b/crates/assistant_tools/src/code_symbols_tool.rs
@@ -91,7 +91,7 @@ impl Tool for CodeSymbolsTool {
        IconName::Code
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<CodeSymbolsInput>(format)
    }

@@ -149,8 +149,7 @@ impl Tool for CodeSymbolsTool {
        cx.spawn(async move |cx| match input.path {
            Some(path) => file_outline(project, path, action_log, regex, input.offset, cx).await,
            None => project_symbols(project, regex, input.offset, cx).await,
-        })
-        .into()
+        }).into()
    }
 }

@@ -180,9 +179,11 @@ pub async fn file_outline(

    // 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?;
-    }
+    while parse_status
+        .recv()
+        .await
+        .map_or(false, |status| status != ParseStatus::Idle)
+    {}

    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
    let Some(outline) = snapshot.outline(None) else {
--- a/crates/assistant_tools/src/contents_tool.rs
+++ b/crates/assistant_tools/src/contents_tool.rs
@@ -1,239 +0,0 @@
-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::{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>,
-        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.buffer_read(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.buffer_read(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, 0, 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/contents_tool/description.md
+++ b/crates/assistant_tools/src/contents_tool/description.md
@@ -1,9 +0,0 @@
-Reads the contents of a path on the filesystem.
-
-If the path is a directory, this lists all files and directories within that path.
-If the path is a file, this returns the file's contents.
-
-When reading a file, if the file is too big and no line range is specified, an outline of the file's code symbols is listed instead, which can be used to request specific line ranges in a subsequent call.
-
-Similarly, if a directory has too many entries to show at once, a subset of entries will be shown,
-and subsequent requests can use starting and ending line numbers to get other subsets.
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::LanguageModelRequestMessage;
@@ -55,7 +55,7 @@ impl Tool for CopyPathTool {
        IconName::Clipboard
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<CopyPathToolInput>(format)
    }

@@ -116,7 +116,6 @@ impl Tool for CopyPathTool {
                    err
                )),
            }
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::LanguageModelRequestMessage;
@@ -45,7 +45,7 @@ impl Tool for CreateDirectoryTool {
        IconName::Folder
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<CreateDirectoryToolInput>(format)
    }

@@ -75,9 +75,7 @@ impl Tool for CreateDirectoryTool {
        };
        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();
-            }
+            None => return Task::ready(Err(anyhow!("Path to create was outside the project"))).into(),
        };
        let destination_path: Arc<str> = input.path.as_str().into();

@@ -90,7 +88,6 @@ impl Tool for CreateDirectoryTool {
                .map_err(|err| anyhow!("Unable to create directory {destination_path}: {err}"))?;

            Ok(format!("Created directory {destination_path}"))
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/create_file_tool.rs
+++ b/crates/assistant_tools/src/create_file_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::LanguageModelRequestMessage;
@@ -52,7 +52,7 @@ impl Tool for CreateFileTool {
        IconName::FileCreate
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<CreateFileToolInput>(format)
    }

@@ -80,9 +80,7 @@ impl Tool for CreateFileTool {
        };
        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();
-            }
+            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();
@@ -107,7 +105,6 @@ impl Tool for CreateFileTool {
                .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;

            Ok(format!("Created file {destination_path}"))
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use gpui::{App, AppContext, Entity, Task};
@@ -45,7 +45,7 @@ impl Tool for DeletePathTool {
        IconName::FileDelete
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<DeletePathToolInput>(format)
    }

@@ -71,8 +71,7 @@ impl Tool for DeletePathTool {
        let Some(project_path) = project.read(cx).find_project_path(&path_str, cx) else {
            return Task::ready(Err(anyhow!(
                "Couldn't delete {path_str} because that path isn't in this project."
-            )))
-            .into();
+            ))).into();
        };

        let Some(worktree) = project
@@ -81,8 +80,7 @@ impl Tool for DeletePathTool {
        else {
            return Task::ready(Err(anyhow!(
                "Couldn't delete {path_str} because that path isn't in this project."
-            )))
-            .into();
+            ))).into();
        };

        let worktree_snapshot = worktree.read(cx).snapshot();
@@ -133,7 +131,6 @@ impl Tool for DeletePathTool {
                    "Couldn't delete {path_str} because that path isn't in this project."
                )),
            }
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -58,7 +58,7 @@ impl Tool for DiagnosticsTool {
        IconName::XCircle
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<DiagnosticsToolInput>(format)
    }

@@ -90,8 +90,7 @@ impl Tool for DiagnosticsTool {
        {
            Some(path) if !path.is_empty() => {
                let Some(project_path) = project.read(cx).find_project_path(&path, cx) else {
-                    return Task::ready(Err(anyhow!("Could not find path {path} in project",)))
-                        .into();
+                    return Task::ready(Err(anyhow!("Could not find path {path} in project",))).into();
                };

                let buffer =
@@ -125,8 +124,7 @@ impl Tool for DiagnosticsTool {
                    } else {
                        Ok(output)
                    }
-                })
-                .into()
+                }).into()
            }
            _ => {
                let project = project.read(cx);
@@ -159,8 +157,7 @@ impl Tool for DiagnosticsTool {
                if has_diagnostics {
                    Task::ready(Ok(output)).into()
                } else {
-                    Task::ready(Ok("No errors or warnings found in the project.".to_string()))
-                        .into()
+                    Task::ready(Ok("No errors or warnings found in the project.".to_string())).into()
                }
            }
        }
--- a/crates/assistant_tools/src/edit_file_tool/description.md
+++ b/crates/assistant_tools/src/edit_file_tool/description.md
@@ -1,45 +0,0 @@
-This is a tool for editing files. For moving or renaming files, you should generally use the `terminal` tool with the 'mv' command instead. For larger edits, use the `create_file` tool to overwrite files.
-
-Before using this tool:
-
-1. Use the `read_file` tool to understand the file's contents and context
-
-2. Verify the directory path is correct (only applicable when creating new files):
-   - Use the `list_directory` tool to verify the parent directory exists and is the correct location
-
-To make a file edit, provide the following:
-1. path: The full path to the file you wish to modify in the project. This path must include the root directory in the project.
-2. old_string: The text to replace (must be unique within the file, and must match the file contents exactly, including all whitespace and indentation)
-3. new_string: The edited text, which will replace the old_string in the file.
-
-The tool will replace ONE occurrence of old_string with new_string in the specified file.
-
-CRITICAL REQUIREMENTS FOR USING THIS TOOL:
-
-1. UNIQUENESS: The old_string MUST uniquely identify the specific instance you want to change. This means:
-   - Include AT LEAST 3-5 lines of context BEFORE the change point
-   - Include AT LEAST 3-5 lines of context AFTER the change point
-   - Include all whitespace, indentation, and surrounding code exactly as it appears in the file
-
-2. SINGLE INSTANCE: This tool can only change ONE instance at a time. If you need to change multiple instances:
-   - Make separate calls to this tool for each instance
-   - Each call must uniquely identify its specific instance using extensive context
-
-3. VERIFICATION: Before using this tool:
-   - Check how many instances of the target text exist in the file
-   - If multiple instances exist, gather enough context to uniquely identify each one
-   - Plan separate tool calls for each instance
-
-WARNING: If you do not follow these requirements:
-   - The tool will fail if old_string matches multiple locations
-   - The tool will fail if old_string doesn't match exactly (including whitespace)
-   - You may change the wrong instance if you don't include enough context
-
-When making edits:
-   - Ensure the edit results in idiomatic, correct code
-   - Do not leave the code in a broken state
-   - Always use fully-qualified project paths (starting with the name of one of the project's root directories)
-
-If you want to create a new file, use the `create_file` tool instead of this tool. Don't pass an empty `old_string`.
-
-Remember: when making multiple file edits in a row to the same file, you should prefer to send all edits in a single message with multiple calls to this tool, rather than multiple messages with a single call each.
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -128,7 +128,7 @@ impl Tool for FetchTool {
        IconName::Globe
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<FetchToolInput>(format)
    }

@@ -158,15 +158,13 @@ impl Tool for FetchTool {
            async move { Self::build_message(http_client, &url).await }
        });

-        cx.foreground_executor()
-            .spawn(async move {
-                let text = text.await?;
-                if text.trim().is_empty() {
-                    bail!("no textual content found");
-                }
+        cx.foreground_executor().spawn(async move {
+            let text = text.await?;
+            if text.trim().is_empty() {
+                bail!("no textual content found");
+            }

-                Ok(text)
-            })
-            .into()
+            Ok(text)
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/find_replace_file_tool.rs
+++ b/crates/assistant_tools/src/find_replace_file_tool.rs
@@ -1,5 +1,5 @@
 use crate::{replace::replace_with_flexible_indent, schema::json_schema_for};
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, AsyncApp, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -12,8 +12,8 @@ use ui::IconName;
 use crate::replace::replace_exact;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct EditFileToolInput {
-    /// The full path of the file to modify in the project.
+pub struct FindReplaceFileToolInput {
+    /// The path of the file to modify.
    ///
    /// WARNING: When specifying which file path need changing, you MUST
    /// start each path with one of the project's root directories.
@@ -40,18 +40,93 @@ pub struct EditFileToolInput {
    /// <example>Update copyright year in `page_footer`</example>
    pub display_description: String,

-    /// The text to replace.
-    pub old_string: String,
+    /// The unique string to find in the file. This string cannot be empty;
+    /// if the string is empty, the tool call will fail. Remember, do not use this tool
+    /// to create new files from scratch, or to overwrite existing files! Use a different
+    /// approach if you want to do that.
+    ///
+    /// If this string appears more than once in the file, this tool call will fail,
+    /// so it is absolutely critical that you verify ahead of time that the string
+    /// is unique. You can search within the file to verify this.
+    ///
+    /// To make the string more likely to be unique, include a minimum of 3 lines of context
+    /// before the string you actually want to find, as well as a minimum of 3 lines of
+    /// context after the string you want to find. (These lines of context should appear
+    /// in the `replace` string as well.) If 3 lines of context is not enough to obtain
+    /// a string that appears only once in the file, then double the number of context lines
+    /// until the string becomes unique. (Start with 3 lines before and 3 lines after
+    /// though, because too much context is needlessly costly.)
+    ///
+    /// Do not alter the context lines of code in any way, and make sure to preserve all
+    /// whitespace and indentation for all lines of code. This string must be exactly as
+    /// it appears in the file, because this tool will do a literal find/replace, and if
+    /// even one character in this string is different in any way from how it appears
+    /// in the file, then the tool call will fail.
+    ///
+    /// <example>
+    /// If a file contains this code:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    ///
+    /// Your find string should include at least 3 lines of context before and after the part
+    /// you want to change:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    ///
+    /// And your replace string might look like:
+    ///
+    /// ```ignore
+    /// fn check_user_permissions(user_id: &str) -> Result<bool> {
+    ///     // Check if user exists first
+    ///     let user = database.find_user(user_id)?;
+    ///
+    ///     // This is the part we want to modify
+    ///     if user.role == "admin" || user.role == "superuser" {
+    ///         return Ok(true);
+    ///     }
+    ///
+    ///     // Check other permissions
+    ///     check_custom_permissions(user_id)
+    /// }
+    /// ```
+    /// </example>
+    pub find: String,

-    /// The text to replace it with.
-    pub new_string: String,
+    /// The string to replace the one unique occurrence of the find string with.
+    pub replace: String,
 }

-pub struct EditFileTool;
+pub struct FindReplaceFileTool;

-impl Tool for EditFileTool {
+impl Tool for FindReplaceFileTool {
    fn name(&self) -> String {
-        "edit_file".into()
+        "find_replace_file".into()
    }

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
@@ -59,19 +134,19 @@ impl Tool for EditFileTool {
    }

    fn description(&self) -> String {
-        include_str!("edit_file_tool/description.md").to_string()
+        include_str!("find_replace_tool/description.md").to_string()
    }

    fn icon(&self) -> IconName {
        IconName::Pencil
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<EditFileToolInput>(format)
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
+        json_schema_for::<FindReplaceFileToolInput>(format)
    }

    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<EditFileToolInput>(input.clone()) {
+        match serde_json::from_value::<FindReplaceFileToolInput>(input.clone()) {
            Ok(input) => input.display_description,
            Err(_) => "Edit file".to_string(),
        }
@@ -85,7 +160,7 @@ impl Tool for EditFileTool {
        action_log: Entity<ActionLog>,
        cx: &mut App,
    ) -> ToolResult {
-        let input = match serde_json::from_value::<EditFileToolInput>(input) {
+        let input = match serde_json::from_value::<FindReplaceFileToolInput>(input) {
            Ok(input) => input,
            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
        };
@@ -103,21 +178,21 @@ impl Tool for EditFileTool {

            let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;

-            if input.old_string.is_empty() {
-                return Err(anyhow!("`old_string` cannot be empty. Use a different tool if you want to create a file."));
+            if input.find.is_empty() {
+                return Err(anyhow!("`find` string cannot be empty. Use a different tool if you want to create a file."));
            }

-            if input.old_string == input.new_string {
-                return Err(anyhow!("The `old_string` and `new_string` are identical, so no changes would be made."));
+            if input.find == input.replace {
+                return Err(anyhow!("The `find` and `replace` strings are identical, so no changes would be made."));
            }

            let result = cx
                .background_spawn(async move {
                    // Try to match exactly
-                    let diff = replace_exact(&input.old_string, &input.new_string, &snapshot)
+                    let diff = replace_exact(&input.find, &input.replace, &snapshot)
                    .await
                    // If that fails, try being flexible about indentation
-                    .or_else(|| replace_with_flexible_indent(&input.old_string, &input.new_string, &snapshot))?;
+                    .or_else(|| replace_with_flexible_indent(&input.find, &input.replace, &snapshot))?;

                    if diff.edits.is_empty() {
                        return None;
@@ -139,11 +214,11 @@ impl Tool for EditFileTool {
                        anyhow!("{} does not exist", input.path.display())
                    } else if buffer.is_empty() {
                        anyhow!(
-                            "{} is empty, so the provided `old_string` wasn't found.",
+                            "{} is empty, so the provided `find` string wasn't found.",
                            input.path.display()
                        )
                    } else {
-                        anyhow!("Failed to match the provided `old_string`")
+                        anyhow!("Failed to match the provided `find` string")
                    }
                })?;

--- a/crates/assistant_tools/src/find_replace_tool/description.md
+++ b/crates/assistant_tools/src/find_replace_tool/description.md
@@ -1,10 +1,8 @@
 Find one unique part of a file in the project and replace that text with new text.

-This tool is the preferred way to make edits to files *except* when making a rename. When making a rename specifically, the rename tool must always be used instead.
+This tool is the preferred way to make edits to files. If you have multiple edits to make, including edits across multiple files, then make a plan to respond with a single message containing multiple calls to this tool - one call for each find/replace operation.

-If you have multiple edits to make, including edits across multiple files, then make a plan to respond with a single message containing a batch of calls to this tool - one call for each find/replace operation.
-
-You should only use this tool when you want to edit a subset of a file's contents, but not the entire file. You should not use this tool when you want to replace the entire contents of a file with completely different contents. You also should not use this tool when you want to move or rename a file. You absolutely must NEVER use this tool to create new files from scratch. If you ever consider using this tool to create a new file from scratch, for any reason, instead you must reconsider and choose a different approach.
+You should use this tool when you want to edit a subset of a file's contents, but not the entire file. You should not use this tool when you want to replace the entire contents of a file with completely different contents. You also should not use this tool when you want to move or rename a file. You absolutely must NEVER use this tool to create new files from scratch. If you ever consider using this tool to create a new file from scratch, for any reason, instead you must reconsider and choose a different approach.

 DO NOT call this tool until the code to be edited appears in the conversation! You must use another tool to read the file's contents into the conversation, or ask the user to add it to context first.

--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -12,7 +12,7 @@ use util::markdown::MarkdownString;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ListDirectoryToolInput {
-    /// The fully-qualified path of the directory to list in the project.
+    /// The relative path of the directory to list.
    ///
    /// This path should never be absolute, and the first component
    /// of the path should always be a root directory in a project.
@@ -56,7 +56,7 @@ impl Tool for ListDirectoryTool {
        IconName::Folder
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<ListDirectoryToolInput>(format)
    }

--- a/crates/assistant_tools/src/list_directory_tool/description.md
+++ b/crates/assistant_tools/src/list_directory_tool/description.md
@@ -1 +1 @@
-Lists files and directories in a given path. Prefer the `regex_search` or `path_search` tools when searching the codebase.
+Lists files and directories in a given path.
--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -54,7 +54,7 @@ impl Tool for MovePathTool {
        IconName::ArrowRightLeft
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<MovePathToolInput>(format)
    }

@@ -127,7 +127,6 @@ impl Tool for MovePathTool {
                    err
                )),
            }
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use chrono::{Local, Utc};
 use gpui::{App, Entity, Task};
@@ -45,7 +45,7 @@ impl Tool for NowTool {
        IconName::Info
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<NowToolInput>(format)
    }

--- a/crates/assistant_tools/src/open_tool.rs
+++ b/crates/assistant_tools/src/open_tool.rs
@@ -1,5 +1,5 @@
 use crate::schema::json_schema_for;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -35,7 +35,7 @@ impl Tool for OpenTool {
        IconName::ArrowUpRight
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<OpenToolInput>(format)
    }

@@ -63,7 +63,6 @@ impl Tool for OpenTool {
            open::that(&input.path_or_url).context("Failed to open URL or file path")?;

            Ok(format!("Successfully opened {}", input.path_or_url))
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/assistant_tools/src/path_search_tool.rs
+++ b/crates/assistant_tools/src/path_search_tool.rs
@@ -1,19 +1,19 @@
 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AppContext, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::{cmp, fmt::Write as _, path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
 use ui::IconName;
 use util::paths::PathMatcher;
 use worktree::Snapshot;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct PathSearchToolInput {
-    /// The glob to match against every path in the project.
+    /// The glob to search all project paths for.
    ///
    /// <example>
    /// If the project has the following root directories:
@@ -53,7 +53,7 @@ impl Tool for PathSearchTool {
        IconName::SearchCode
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<PathSearchToolInput>(format)
    }

@@ -76,114 +76,66 @@ impl Tool for PathSearchTool {
            Ok(input) => (input.offset, input.glob),
            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
        };
-        let offset = offset as usize;
-        let task = search_paths(&glob, project, cx);
+
+        let path_matcher = match PathMatcher::new([
+            // Sometimes models try to search for "". In this case, return all paths in the project.
+            if glob.is_empty() { "*" } else { &glob },
+        ]) {
+            Ok(matcher) => matcher,
+            Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))).into(),
+        };
+        let snapshots: Vec<Snapshot> = project
+            .read(cx)
+            .worktrees(cx)
+            .map(|worktree| worktree.read(cx).snapshot())
+            .collect();
+
        cx.background_spawn(async move {
-            let matches = task.await?;
-            let paginated_matches = &matches[cmp::min(offset, matches.len())..cmp::min(offset + RESULTS_PER_PAGE, matches.len())];
-            let mut message = format!(
-                "Found {} total matches. Showing results {}-{} (provide 'offset' parameter for more results):\n",
-                matches.len(),
-                offset + 1,
-                offset as usize + paginated_matches.len(),
-            );
-            for mat in matches.into_iter().skip(offset).take(RESULTS_PER_PAGE) {
-                write!(&mut message, "\n{}", mat.display()).unwrap();
+            let mut matches = Vec::new();
+
+            for worktree in snapshots {
+                let root_name = worktree.root_name();
+
+                // Don't consider ignored entries.
+                for entry in worktree.entries(false, 0) {
+                    if path_matcher.is_match(&entry.path) {
+                        matches.push(
+                            PathBuf::from(root_name)
+                                .join(&entry.path)
+                                .to_string_lossy()
+                                .to_string(),
+                        );
+                    }
+                }
+            }
+
+            if matches.is_empty() {
+                Ok(format!("No paths in the project matched the glob {glob:?}"))
+            } else {
+                // Sort to group entries in the same directory together.
+                matches.sort();
+
+                let total_matches = matches.len();
+                let response = if total_matches > RESULTS_PER_PAGE + offset as usize {
+                let paginated_matches: Vec<_> = matches
+                      .into_iter()
+                      .skip(offset as usize)
+                      .take(RESULTS_PER_PAGE)
+                      .collect();
+
+                    format!(
+                        "Found {} total matches. Showing results {}-{} (provide 'offset' parameter for more results):\n\n{}",
+                        total_matches,
+                        offset + 1,
+                        offset as usize + paginated_matches.len(),
+                        paginated_matches.join("\n")
+                    )
+                } else {
+                    matches.join("\n")
+                };
+
+                Ok(response)
            }
-            Ok(message)
        }).into()
    }
 }
-
-fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Result<Vec<PathBuf>>> {
-    let path_matcher = match PathMatcher::new([
-        // Sometimes models try to search for "". In this case, return all paths in the project.
-        if glob.is_empty() { "*" } else { glob },
-    ]) {
-        Ok(matcher) => matcher,
-        Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))).into(),
-    };
-    let snapshots: Vec<Snapshot> = project
-        .read(cx)
-        .worktrees(cx)
-        .map(|worktree| worktree.read(cx).snapshot())
-        .collect();
-
-    cx.background_spawn(async move {
-        Ok(snapshots
-            .iter()
-            .flat_map(|snapshot| {
-                let root_name = PathBuf::from(snapshot.root_name());
-                snapshot
-                    .entries(false, 0)
-                    .map(move |entry| root_name.join(&entry.path))
-                    .filter(|path| path_matcher.is_match(&path))
-            })
-            .collect())
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use gpui::TestAppContext;
-    use project::{FakeFs, Project};
-    use settings::SettingsStore;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_path_search_tool(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            serde_json::json!({
-                "apple": {
-                    "banana": {
-                        "carrot": "1",
-                    },
-                    "bandana": {
-                        "carbonara": "2",
-                    },
-                    "endive": "3"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        let matches = cx
-            .update(|cx| search_paths("root/**/car*", project.clone(), cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            matches,
-            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
-            ]
-        );
-
-        let matches = cx
-            .update(|cx| search_paths("**/car*", project.clone(), cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            matches,
-            &[
-                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from("root/apple/bandana/carbonara")
-            ]
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-        });
-    }
-}
--- a/crates/assistant_tools/src/path_search_tool/description.md
+++ b/crates/assistant_tools/src/path_search_tool/description.md
@@ -1,7 +1,3 @@
-Fast file pattern matching tool that works with any codebase size
+Returns paths in the project which match the given glob.

- Supports glob patterns like "**/*.js" or "src/**/*.ts"
- Returns matching file paths sorted alphabetically
- Prefer the `regex_search` tool to this tool when searching for symbols unless you have specific information about paths.
- Use this tool when you need to find files by name patterns
- Results are paginated with 50 matches per page. Use the optional 'offset' parameter to request subsequent pages.
+Results are paginated with 50 matches per page. Use the optional 'offset' parameter to request subsequent pages.
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use crate::{code_symbols_tool::file_outline, schema::json_schema_for};
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use itertools::Itertools;
@@ -63,7 +63,7 @@ impl Tool for ReadFileTool {
        IconName::FileSearch
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<ReadFileToolInput>(format)
    }

--- a/crates/assistant_tools/src/regex_search_tool.rs
+++ b/crates/assistant_tools/src/regex_search_tool.rs
@@ -60,7 +60,7 @@ impl Tool for RegexSearchTool {
        IconName::Regex
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<RegexSearchToolInput>(format)
    }

@@ -117,7 +117,7 @@ impl Tool for RegexSearchTool {

        let results = project.update(cx, |project, cx| project.search(query, cx));

-        cx.spawn(async move|cx|  {
+        let output = cx.spawn(async move|cx|  {
            futures::pin_mut!(results);

            let mut output = String::new();
@@ -201,6 +201,7 @@ impl Tool for RegexSearchTool {
            } else {
                Ok(format!("Found {matches_found} matches:\n{output}"))
            }
-        }).into()
+        });
+        output.into()
    }
 }
--- a/crates/assistant_tools/src/regex_search_tool/description.md
+++ b/crates/assistant_tools/src/regex_search_tool/description.md
@@ -1,6 +1,7 @@
 Searches the entire project for the given regular expression.

- Prefer this tool when searching for files containing symbols in the project.
- Supports full regex syntax (eg. "log.*Error", "function\\s+\\w+", etc.)
- Use this tool when you need to find files containing specific patterns
- Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
+Returns a list of paths that matched the query. For each path, it returns some excerpts of the matched text.
+
+Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
+
+This tool is not aware of semantics and does not use any information from language servers, so it should only be used when no available semantic tool (e.g. one that uses language servers) could fit a particular use case instead.
--- a/crates/assistant_tools/src/rename_tool.rs
+++ b/crates/assistant_tools/src/rename_tool.rs
@@ -1,203 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, Tool, ToolResult};
-use gpui::{App, Entity, Task};
-use language::{self, Buffer, ToPointUtf16};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use ui::IconName;
-
-use crate::schema::json_schema_for;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RenameToolInput {
-    /// The relative path to the file containing the symbol to rename.
-    ///
-    /// WARNING: you MUST start this path with one of the project's root directories.
-    pub path: String,
-
-    /// The new name to give to the symbol.
-    pub new_name: String,
-
-    /// The text that comes immediately before the symbol in the file.
-    pub context_before_symbol: String,
-
-    /// The symbol to rename. This text must appear in the file right between
-    /// `context_before_symbol` and `context_after_symbol`.
-    ///
-    /// The file must contain exactly one occurrence of `context_before_symbol` followed by
-    /// `symbol` followed by `context_after_symbol`. 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 symbol, as well as a minimum of 1 line of context after the symbol.
-    /// 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 symbol: String,
-
-    /// The text that comes immediately after the symbol in the file.
-    pub context_after_symbol: String,
-}
-
-pub struct RenameTool;
-
-impl Tool for RenameTool {
-    fn name(&self) -> String {
-        "rename".into()
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./rename_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Pencil
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<RenameToolInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<RenameToolInput>(input.clone()) {
-            Ok(input) => {
-                format!("Rename '{}' to '{}'", input.symbol, input.new_name)
-            }
-            Err(_) => "Rename symbol".to_string(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input = match serde_json::from_value::<RenameToolInput>(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.buffer_read(buffer.clone(), cx);
-            })?;
-
-            let position = {
-                let Some(position) = buffer.read_with(cx, |buffer, _cx| {
-                    find_symbol_position(&buffer, &input.context_before_symbol, &input.symbol, &input.context_after_symbol)
-                })? else {
-                    return Err(anyhow!(
-                        "Failed to locate the symbol specified by context_before_symbol, symbol, and context_after_symbol. Make sure context_before_symbol and context_after_symbol each match exactly once in the file."
-                    ));
-                };
-
-                buffer.read_with(cx, |buffer, _| {
-                    position.to_point_utf16(&buffer.snapshot())
-                })?
-            };
-
-            project
-                .update(cx, |project, cx| {
-                    project.perform_rename(buffer.clone(), position, input.new_name.clone(), cx)
-                })?
-                .await?;
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                .await?;
-
-            action_log.update(cx, |log, cx| {
-                log.buffer_edited(buffer.clone(), cx)
-            })?;
-
-            Ok(format!("Renamed '{}' to '{}'", input.symbol, input.new_name))
-        }).into()
-    }
-}
-
-/// Finds the position of the symbol in the buffer, if it appears between context_before_symbol
-/// and context_after_symbol, 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_symbol and
-/// to the beginning of context_after_symbol to accommodate line-based context matching.
-fn find_symbol_position(
-    buffer: &Buffer,
-    context_before_symbol: &str,
-    symbol: &str,
-    context_after_symbol: &str,
-) -> Option<language::Anchor> {
-    let snapshot = buffer.snapshot();
-    let text = snapshot.text();
-
-    // First try with exact match
-    let search_string = format!("{context_before_symbol}{symbol}{context_after_symbol}");
-    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 symbol_start = position.0 + context_before_symbol.len();
-            let symbol_start_anchor =
-                snapshot.anchor_before(snapshot.offset_to_point(symbol_start));
-
-            return Some(symbol_start_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_symbol.ends_with('\n') {
-        context_before_symbol.to_string()
-    } else {
-        format!("{context_before_symbol}\n")
-    };
-
-    let line_based_after = if context_after_symbol.starts_with('\n') {
-        context_after_symbol.to_string()
-    } else {
-        format!("\n{context_after_symbol}")
-    };
-
-    let line_search_string = format!("{line_based_before}{symbol}{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_symbol_start = line_position.0 + line_based_before.len();
-    let line_symbol_start_anchor =
-        snapshot.anchor_before(snapshot.offset_to_point(line_symbol_start));
-
-    Some(line_symbol_start_anchor)
-}
--- a/crates/assistant_tools/src/rename_tool/description.md
+++ b/crates/assistant_tools/src/rename_tool/description.md
@@ -1,15 +0,0 @@
-Renames a symbol across your codebase using the language server's semantic knowledge.
-
-This tool performs a rename refactoring operation on a specified symbol. It uses the project's language server to analyze the code and perform the rename correctly across all files where the symbol is referenced.
-
-Unlike a simple find and replace, this tool understands the semantic meaning of the code, so it only renames the specific symbol you specify and not unrelated text that happens to have the same name.
-
-Examples of symbols you can rename:
- Variables
- Functions
- Classes/structs
- Fields/properties
- Methods
- Interfaces/traits
-
-The language server handles updating all references to the renamed symbol throughout the codebase.
--- a/crates/assistant_tools/src/schema.rs
+++ b/crates/assistant_tools/src/schema.rs
@@ -5,20 +5,23 @@ use schemars::{
    schema::{RootSchema, Schema, SchemaObject},
 };

-pub fn json_schema_for<T: JsonSchema>(
-    format: LanguageModelToolSchemaFormat,
-) -> Result<serde_json::Value> {
+pub fn json_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> serde_json::Value {
    let schema = root_schema_for::<T>(format);
-    schema_to_json(&schema, format)
+    schema_to_json(&schema, format).expect("Failed to convert tool calling schema to JSON")
 }

-fn schema_to_json(
+pub fn schema_to_json(
    schema: &RootSchema,
    format: LanguageModelToolSchemaFormat,
 ) -> Result<serde_json::Value> {
    let mut value = serde_json::to_value(schema)?;
-    assistant_tool::adapt_schema_to_format(&mut value, format)?;
-    Ok(value)
+    match format {
+        LanguageModelToolSchemaFormat::JsonSchema => Ok(value),
+        LanguageModelToolSchemaFormat::JsonSchemaSubset => {
+            transform_fields_to_json_schema_subset(&mut value);
+            Ok(value)
+        }
+    }
 }

 fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> RootSchema {
@@ -76,3 +79,42 @@ impl schemars::visit::Visitor for TransformToJsonSchemaSubsetVisitor {
        schemars::visit::visit_schema_object(self, schema)
    }
 }
+
+fn transform_fields_to_json_schema_subset(json: &mut serde_json::Value) {
+    if let serde_json::Value::Object(obj) = json {
+        if let Some(default) = obj.get("default") {
+            let is_null = default.is_null();
+            //Default is not supported, so we need to remove it.
+            obj.remove("default");
+            if is_null {
+                obj.insert("nullable".to_string(), serde_json::Value::Bool(true));
+            }
+        }
+
+        // If a type is not specified for an input parameter we need to add it.
+        if obj.contains_key("description")
+            && !obj.contains_key("type")
+            && !(obj.contains_key("anyOf")
+                || obj.contains_key("oneOf")
+                || obj.contains_key("allOf"))
+        {
+            obj.insert(
+                "type".to_string(),
+                serde_json::Value::String("string".to_string()),
+            );
+        }
+
+        //Format field is only partially supported (e.g. not uint compatibility)
+        obj.remove("format");
+
+        for (_, value) in obj.iter_mut() {
+            if let serde_json::Value::Object(_) | serde_json::Value::Array(_) = value {
+                transform_fields_to_json_schema_subset(value);
+            }
+        }
+    } else if let serde_json::Value::Array(arr) = json {
+        for item in arr.iter_mut() {
+            transform_fields_to_json_schema_subset(item);
+        }
+    }
+}
--- a/crates/assistant_tools/src/symbol_info_tool.rs
+++ b/crates/assistant_tools/src/symbol_info_tool.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Context as _, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, AsyncApp, Entity, Task};
 use language::{self, Anchor, Buffer, BufferSnapshot, Location, Point, ToPoint, ToPointUtf16};
@@ -84,7 +84,7 @@ impl Tool for SymbolInfoTool {
        IconName::Code
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<SymbolInfoToolInput>(format)
    }

--- a/crates/assistant_tools/src/terminal_tool/description.md
+++ b/crates/assistant_tools/src/terminal_tool/description.md
@@ -1,9 +0,0 @@
-Executes a shell one-liner and returns the combined output.
-
-This tool spawns a process using the user's current shell, combines stdout and stderr into one interleaved stream as they are produced (preserving the order of writes), and captures that stream into a string which is returned.
-
-Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
-
-Do not use this tool for commands that run indefinitely, such as servers (e.g., `python -m http.server`) or file watchers that don't terminate on their own.
-
-Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.
--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;

 use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
+use anyhow::anyhow;
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{App, Entity, Task};
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
@@ -36,7 +36,7 @@ impl Tool for ThinkingTool {
        IconName::LightBulb
    }

-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
+    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> serde_json::Value {
        json_schema_for::<ThinkingToolInput>(format)
    }

@@ -56,7 +56,6 @@ impl Tool for ThinkingTool {
        Task::ready(match serde_json::from_value::<ThinkingToolInput>(input) {
            Ok(_input) => Ok("Finished thinking.".to_string()),
            Err(err) => Err(anyhow!(err)),
-        })
-        .into()
+        }).into()
    }
 }
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -27,8 +27,6 @@ serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
 tempfile.workspace = true
+which.workspace = true
 workspace.workspace = true
 workspace-hack.workspace = true
-
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-which.workspace = true
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -23,6 +23,7 @@ use std::{
    sync::Arc,
    time::Duration,
 };
+use which::which;
 use workspace::Workspace;

 const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
@@ -62,7 +63,7 @@ pub struct AutoUpdater {
    pending_poll: Option<Task<Option<()>>>,
 }

-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub struct JsonRelease {
    pub version: String,
    pub url: String,
@@ -236,46 +237,6 @@ pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut App) -> Option<()> {
    None
 }

-#[cfg(not(target_os = "windows"))]
-struct InstallerDir(tempfile::TempDir);
-
-#[cfg(not(target_os = "windows"))]
-impl InstallerDir {
-    async fn new() -> Result<Self> {
-        Ok(Self(
-            tempfile::Builder::new()
-                .prefix("zed-auto-update")
-                .tempdir()?,
-        ))
-    }
-
-    fn path(&self) -> &Path {
-        self.0.path()
-    }
-}
-
-#[cfg(target_os = "windows")]
-struct InstallerDir(PathBuf);
-
-#[cfg(target_os = "windows")]
-impl InstallerDir {
-    async fn new() -> Result<Self> {
-        let installer_dir = std::env::current_exe()?
-            .parent()
-            .context("No parent dir for Zed.exe")?
-            .join("updates");
-        if smol::fs::metadata(&installer_dir).await.is_ok() {
-            smol::fs::remove_dir_all(&installer_dir).await?;
-        }
-        smol::fs::create_dir(&installer_dir).await?;
-        Ok(Self(installer_dir))
-    }
-
-    fn path(&self) -> &Path {
-        self.0.as_path()
-    }
-}
-
 impl AutoUpdater {
    pub fn get(cx: &mut App) -> Option<Entity<Self>> {
        cx.default_global::<GlobalAutoUpdate>().0.clone()
@@ -508,21 +469,22 @@ impl AutoUpdater {
            cx.notify();
        })?;

-        let installer_dir = InstallerDir::new().await?;
+        let temp_dir = tempfile::Builder::new()
+            .prefix("zed-auto-update")
+            .tempdir()?;
+
        let filename = match OS {
            "macos" => Ok("Zed.dmg"),
            "linux" => Ok("zed.tar.gz"),
-            "windows" => Ok("ZedUpdateInstaller.exe"),
            _ => Err(anyhow!("not supported: {:?}", OS)),
        }?;

-        #[cfg(not(target_os = "windows"))]
        anyhow::ensure!(
-            which::which("rsync").is_ok(),
+            which("rsync").is_ok(),
            "Aborting. Could not find rsync which is required for auto-updates."
        );

-        let downloaded_asset = installer_dir.path().join(filename);
+        let downloaded_asset = temp_dir.path().join(filename);
        download_release(&downloaded_asset, release, client, &cx).await?;

        this.update(&mut cx, |this, cx| {
@@ -531,9 +493,8 @@ impl AutoUpdater {
        })?;

        let binary_path = match OS {
-            "macos" => install_release_macos(&installer_dir, downloaded_asset, &cx).await,
-            "linux" => install_release_linux(&installer_dir, downloaded_asset, &cx).await,
-            "windows" => install_release_windows(downloaded_asset).await,
+            "macos" => install_release_macos(&temp_dir, downloaded_asset, &cx).await,
+            "linux" => install_release_linux(&temp_dir, downloaded_asset, &cx).await,
            _ => Err(anyhow!("not supported: {:?}", OS)),
        }?;

@@ -668,7 +629,7 @@ async fn download_release(
 }

 async fn install_release_linux(
-    temp_dir: &InstallerDir,
+    temp_dir: &tempfile::TempDir,
    downloaded_tar_gz: PathBuf,
    cx: &AsyncApp,
 ) -> Result<PathBuf> {
@@ -735,7 +696,7 @@ async fn install_release_linux(
 }

 async fn install_release_macos(
-    temp_dir: &InstallerDir,
+    temp_dir: &tempfile::TempDir,
    downloaded_dmg: PathBuf,
    cx: &AsyncApp,
 ) -> Result<PathBuf> {
@@ -782,41 +743,3 @@ async fn install_release_macos(

    Ok(running_app_path)
 }
-
-async fn install_release_windows(downloaded_installer: PathBuf) -> Result<PathBuf> {
-    let output = Command::new(downloaded_installer)
-        .arg("/verysilent")
-        .arg("/update=true")
-        .arg("!desktopicon")
-        .arg("!quicklaunchicon")
-        .output()
-        .await?;
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to start installer: {:?}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-    Ok(std::env::current_exe()?)
-}
-
-pub fn check_pending_installation() -> bool {
-    let Some(installer_path) = std::env::current_exe()
-        .ok()
-        .and_then(|p| p.parent().map(|p| p.join("updates")))
-    else {
-        return false;
-    };
-
-    // The installer will create a flag file after it finishes updating
-    let flag_file = installer_path.join("versions.txt");
-    if flag_file.exists() {
-        if let Some(helper) = installer_path
-            .parent()
-            .map(|p| p.join("tools\\auto_update_helper.exe"))
-        {
-            let _ = std::process::Command::new(helper).spawn();
-            return true;
-        }
-    }
-    false
-}
--- a/crates/auto_update_helper/Cargo.toml
+++ b/crates/auto_update_helper/Cargo.toml
@@ -1,29 +0,0 @@
-[package]
-name = "auto_update_helper"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "auto_update_helper"
-path = "src/auto_update_helper.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-simplelog.workspace = true
-workspace-hack.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[target.'cfg(target_os = "windows")'.build-dependencies]
-winresource = "0.1"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-pc-windows-msvc"]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Antonio Scandurra	38fcadf948	Merge remote-tracking branch 'origin/main' into custom-tool-cards	2025-04-09 16:42:30 -06:00
Antonio Scandurra	e5cbac1373	Checkpoint	2025-04-09 15:21:36 -06:00
Antonio Scandurra	53375434cf	Lay the groundwork to support rendering custom tool cards	2025-04-09 08:17:35 -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-binary-icon lucide-binary"><rect x="14" y="14" width="4" height="6" rx="2"/><rect x="6" y="4" width="4" height="6" rx="2"/><path d="M6 20h4"/><path d="M14 10h4"/><path d="M6 14h2v6"/><path d="M14 4h2v6"/></svg>`
				`@@ -0,0 +1 @@`
				`In your response, make sure to remember and follow my instructions about how to format code blocks (and don't mention that you are remembering it, just follow the instructions).`